MLS conversation limits

changelog.d/2-features/mls-conv-limits

@@ -0,0 +1 @@
+Remove conversation size limit for MLS conversations

hack/python/wire/mlscli.py

@@ -40,10 +40,12 @@ def mlscli(state, client_identity, args, stdin=None):
         else:
             args_substd.append(arg)
 
+    basedir = os.path.join(cdir, cid2str(state.client_identity) )
+    os.makedirs(basedir, exist_ok=True)
     all_args = [
         "mls-test-cli",
         "--store",
-        os.path.join(cdir, cid2str(state.client_identity), "store"),
+        os.path.join(basedir, "store"),
     ] + args_substd
 
     # TODO: maybe add cwd=cdir, not sure if necessary
@@ -154,6 +156,9 @@ def restore_backup_into(client_dir):
         os.system(f'cp -r /tmp/client_state_backup {client_dir}')
         return ClientState.load(client_dir)
 
+    def __repr__(self):
+        values = ', '.join(f'{k}={str(getattr(self, k))}' for k in self.saveable_attrs.keys())
+        return f'{self.__class__.__name__}({values})'
 
 def key_package_file(state, ref):
     return os.path.join(state.client_dir, cid2str(state.client_identity), ref.hex())

libs/wire-api/src/Wire/API/Team/Member.hs

@@ -271,8 +271,7 @@ instance ToSchema (TeamMember' tag) => ToSchema (TeamMemberList' tag) where
         <*> _teamMemberListType
           .= fieldWithDocModifier "hasMore" (description ?~ "true if 'members' doesn't contain all team members") schema
 
--- TODO: Revert this to 2000 before mergin 'mls' to the develop branch
-type HardTruncationLimit = (100000 :: Nat)
+type HardTruncationLimit = (2000 :: Nat)
 
 hardTruncationLimit :: Integral a => a
 hardTruncationLimit = fromIntegral $ natVal (Proxy @HardTruncationLimit)

services/galley/src/Galley/API/Action.hs

@@ -64,7 +64,7 @@ import Galley.API.Teams.Features.Get
 import Galley.API.Util
 import Galley.Data.Conversation
 import qualified Galley.Data.Conversation as Data
-import Galley.Data.Conversation.Types (mlsMetadata)
+import Galley.Data.Conversation.Types
 import Galley.Data.Scope (Scope (ReusableCode))
 import Galley.Data.Services
 import Galley.Effects
@@ -455,7 +455,7 @@ performConversationJoin qusr lconv (ConversationJoin invited role) = do
   let newMembers = ulNewMembers lconv conv . toUserList lconv $ invited
 
   lusr <- ensureLocal lconv qusr
-  ensureMemberLimit (toList (convLocalMembers conv)) newMembers
+  ensureMemberLimit (convProtocolTag conv) (toList (convLocalMembers conv)) newMembers
   ensureAccess conv InviteAccess
   checkLocals lusr (convTeam conv) (ulLocals newMembers)
   checkRemotes lusr (ulRemotes newMembers)

services/galley/src/Galley/API/Update.hs

@@ -92,6 +92,7 @@ import qualified Galley.API.Query as Query
 import Galley.API.Util
 import Galley.App
 import qualified Galley.Data.Conversation as Data
+import qualified Galley.Data.Conversation.Types as Data
 import Galley.Data.Services as Data
 import Galley.Data.Types hiding (Conversation)
 import Galley.Effects
@@ -804,7 +805,7 @@ joinConversation lusr zcon conv access = do
   ensureConversationAccess (tUnqualified lusr) conv access
   ensureGroupConversation conv
   -- FUTUREWORK: remote users?
-  ensureMemberLimit (toList $ Data.convLocalMembers conv) [tUnqualified lusr]
+  ensureMemberLimit (Data.convProtocolTag conv) (toList $ Data.convLocalMembers conv) [tUnqualified lusr]
   getUpdateResult $ do
     -- NOTE: When joining conversations, all users become members
     -- as this is our desired behavior for these types of conversations
@@ -1597,7 +1598,7 @@ addBot lusr zcon b = do
       ensureActionAllowed SAddConversationMember self
       unless (any ((== b ^. addBotId) . botMemId) bots) $ do
         let botId = qualifyAs lusr (botUserId (b ^. addBotId))
-        ensureMemberLimit (toList $ Data.convLocalMembers c) [tUntagged botId]
+        ensureMemberLimit (Data.convProtocolTag c) (toList $ Data.convLocalMembers c) [tUntagged botId]
       pure (bots, users)
 
 rmBotH ::

services/galley/src/Galley/API/Util.hs

@@ -54,7 +54,7 @@ import Galley.Effects.MemberStore
 import Galley.Effects.TeamStore
 import Galley.Intra.Push
 import Galley.Options
-import Galley.Types.Conversations.Members (LocalMember (..), RemoteMember (..), localMemberToOther, remoteMemberQualify, remoteMemberToOther)
+import Galley.Types.Conversations.Members
 import Galley.Types.Conversations.Roles
 import Galley.Types.Teams
 import Galley.Types.UserList
@@ -84,8 +84,7 @@ import Wire.API.Routes.Public.Galley.Conversation
 import Wire.API.Routes.Public.Util
 import Wire.API.Team.Member
 import Wire.API.Team.Role
-import Wire.API.User (VerificationAction)
-import qualified Wire.API.User as User
+import Wire.API.User hiding (userId)
 import Wire.API.User.Auth.ReAuth
 
 type JSON = Media "application" "json"
@@ -107,7 +106,7 @@ ensureAccessRole roles users = do
     activated <- lookupActivatedUsers (fst <$> users)
     let guestsExist = length activated /= length users
     unless (not guestsExist || GuestAccessRole `Set.member` roles) $ throwS @'ConvAccessDenied
-    let botsExist = any (isJust . User.userService) activated
+    let botsExist = any (isJust . userService) activated
     unless (not botsExist || ServiceAccessRole `Set.member` roles) $ throwS @'ConvAccessDenied
 
 -- | Check that the given user is either part of the same team as the other
@@ -995,10 +994,12 @@ ensureMemberLimit ::
       Member (Input Opts) r
     )
   ) =>
+  ProtocolTag ->
   [LocalMember] ->
   f a ->
   Sem r ()
-ensureMemberLimit old new = do
+ensureMemberLimit ProtocolMLSTag _ _ = pure ()
+ensureMemberLimit _ old new = do
   o <- input
   let maxSize = fromIntegral (o ^. optSettings . setMaxConvSize)
   when (length old + length new > maxSize) $

services/galley/src/Galley/Data/Conversation/Types.hs

@@ -39,6 +39,9 @@ data Conversation = Conversation
   }
   deriving (Show)
 
+convProtocolTag :: Conversation -> ProtocolTag
+convProtocolTag = protocolTag . convProtocol
+
 data NewConversation = NewConversation
   { ncMetadata :: ConversationMetadata,
     ncUsers :: UserList (UserId, RoleName),