More tests for OTR messages using protobuf (#1095)

wireapp · May 15, 2020 · 62fcb81 · 62fcb81
1 parent 800cd74
commit 62fcb81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/services/galley/test/integration/API.hs b/services/galley/test/integration/API.hs
@@ -326,6 +326,7 @@ postCryptoMessage5 = do
   conv <- decodeConvId <$> postConv alice [bob, eve] (Just "gossip") [] Nothing Nothing
   -- Missing eve
   let m = [(bob, bc, "hello bob")]
+  let m' = otrRecipients [(bob, [(bc, encodeCiphertext "hello bob")])]
   -- These three are equivalent (i.e. report all missing clients)
   postOtrMessage id alice ac conv m
     !!! const 412 === statusCode
@@ -341,8 +342,18 @@ postCryptoMessage5 = do
   -- Report missing clients of a specific user only
   postOtrMessage (queryItem "report_missing" (toByteString' bob)) alice ac conv m
     !!! const 201 === statusCode
+  -- Let's make sure that the same logic using protobuf in the body works too
+  postProtoOtrMessage' Nothing (queryItem "report_missing" (toByteString' bob)) alice ac conv m'
+    !!! const 201 === statusCode
+  -- Body takes precedence
   postOtrMessage' (Just [makeIdOpaque bob]) (queryItem "report_missing" (toByteString' eve)) alice ac conv m
     !!! const 201 === statusCode
+  -- Set it only in the body of the message
+  postOtrMessage' (Just [makeIdOpaque bob]) id alice ac conv m
+    !!! const 201 === statusCode
+  -- Let's make sure that protobuf works too, when specified in the body only
+  postProtoOtrMessage' (Just [makeIdOpaque bob]) id alice ac conv m'
+    !!! const 201 === statusCode
   _rs <-
     postOtrMessage (queryItem "report_missing" (toByteString' eve)) alice ac conv []
       <!! const 412 === statusCode

diff --git a/services/galley/test/integration/API/Util.hs b/services/galley/test/integration/API/Util.hs
@@ -553,11 +553,15 @@ mkOtrMessage (usr, clt, m) = (fn usr, HashMap.singleton (fn clt) m)
     fn = fromJust . fromByteString . toByteString'
 
 postProtoOtrMessage :: UserId -> ClientId -> ConvId -> OtrRecipients -> TestM ResponseLBS
-postProtoOtrMessage u d c rec = do
+postProtoOtrMessage = postProtoOtrMessage' Nothing id
+
+postProtoOtrMessage' :: Maybe [OpaqueUserId] -> (Request -> Request) -> UserId -> ClientId -> ConvId -> OtrRecipients -> TestM ResponseLBS
+postProtoOtrMessage' reportMissing modif u d c rec = do
   g <- view tsGalley
-  let m = runPut (encodeMessage $ mkOtrProtoMessage d rec Nothing)
+  let m = runPut (encodeMessage $ mkOtrProtoMessage d rec reportMissing)
    in post $
         g
+          . modif
           . paths ["conversations", toByteString' c, "otr", "messages"]
           . zUser u
           . zConn "conn"