WIP

Author: mdimjasevic

services/galley/test/integration/API/MLS.hs

@@ -113,6 +113,12 @@ tests s =
           test s "admin removes user from a conversation" testAdminRemovesUserFromConv,
           test s "admin removes user from a conversation but doesn't list all clients" testRemoveClientsIncomplete
         ],
+      testGroup
+        "External commit"
+        [ test s "attempt to join a conversation a user is not part of" testExternalCommitOtherConversation,
+          test s "join a conversation with the same client" testExternalCommitSameClient,
+          test s "join a conversation with a new client" (pure ())
+        ],
       testGroup
         "Application Message"
         [ testGroup
@@ -983,6 +989,24 @@ testLocalToRemoteNonMember = do
             const (Just "no-conversation-member")
               === fmap Wai.label . responseJsonError
 
+testExternalCommitOtherConversation :: TestM ()
+testExternalCommitOtherConversation = pure ()
+
+testExternalCommitSameClient :: TestM ()
+testExternalCommitSameClient = do
+  [alice, bob] <- createAndConnectUsers (replicate 2 Nothing)
+
+  runMLSTest $ do
+    [alice1, bob1] <- traverse createMLSClient [alice, bob]
+    void $ uploadNewKeyPackage bob1
+    (_, qcnv) <- setupMLSGroup alice1
+    void $ createAddCommit alice1 [bob] >>= sendAndConsumeCommit
+
+    _events <- createExternalCommit alice1 qcnv >>= sendAndConsumeCommitBundle
+    pure ()
+
+-- the list of members should be [alice1, bob1]
+
 testAppMessage :: TestM ()
 testAppMessage = do
   users@(alice : _) <- createAndConnectUsers (replicate 4 Nothing)

services/galley/test/integration/API/MLS/Util.hs

@@ -35,6 +35,7 @@ import qualified Data.ByteArray as BA
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Base64.URL as B64U
 import Data.ByteString.Conversion
+import qualified Data.ByteString.Lazy as LBS
 import Data.Domain
 import Data.Hex
 import Data.Id
@@ -510,6 +511,46 @@ createAddCommit cid users = do
   kps <- concat <$> traverse (bundleKeyPackages <=< claimKeyPackages cid) users
   createAddCommitWithKeyPackages cid kps
 
+createExternalCommit ::
+  HasCallStack =>
+  ClientIdentity ->
+  Qualified ConvId ->
+  MLSTest MessagePackage
+createExternalCommit qcid qcnv = do
+  bd <- State.gets mlsBaseDir
+  gNew <- nextGroupFile qcid
+  -- welcomeFile <- liftIO $ emptyTempFile bd "welcome"
+  pgsFile <- liftIO $ emptyTempFile bd "pgs"
+  pgs <-
+    LBS.toStrict . fromJust . responseBody
+      <$> getGroupInfo (ciUser qcid) qcnv
+  commit <-
+    mlscli
+      qcid
+      [ "external-commit",
+        "--group-state-in",
+        "-",
+        "--group-state-out",
+        pgsFile,
+        "--group-out",
+        gNew
+      ]
+      (Just pgs)
+
+  State.modify $ \mls ->
+    mls
+      { mlsNewMembers = Set.singleton qcid
+      }
+
+  newPgs <- liftIO $ BS.readFile pgsFile
+  pure $
+    MessagePackage
+      { mpSender = qcid,
+        mpMessage = commit,
+        mpWelcome = Nothing,
+        mpPublicGroupState = Just newPgs
+      }
+
 createAddProposals :: HasCallStack => ClientIdentity -> [Qualified UserId] -> MLSTest [MessagePackage]
 createAddProposals cid users = do
   kps <- concat <$> traverse (bundleKeyPackages <=< claimKeyPackages cid) users