Skip to content

Welcome messages should not be sent to creator #3392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elland merged 2 commits into from
Jul 27, 2023
Merged

Welcome messages should not be sent to creator #3392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8141de
Do not send welcome message to sender
pcapriotti Jul 4, 2023
720e7b2
Add CHANGELOG entry
pcapriotti Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/sender-welcome
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Welcome messages are not sent anymore to the creator of an MLS group on the first commit
7 changes: 3 additions & 4 deletions integration/test/Test/MLS.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,12 @@ testMixedProtocolAddUsers secondDomain = do

traverse_ uploadNewKeyPackage [bob1]

withWebSockets [alice, bob] $ \wss -> do
withWebSocket bob $ \ws -> do
mp <- createAddCommit alice1 [bob]
welcome <- assertJust "should have welcome" mp.welcome
void $ sendAndConsumeCommitBundle mp
for_ wss $ \ws -> do
n <- awaitMatch 3 (\n -> nPayload n %. "type" `isEqual` "conversation.mls-welcome") ws
nPayload n %. "data" `shouldMatch` T.decodeUtf8 (Base64.encode welcome)
n <- awaitMatch 3 (\n -> nPayload n %. "type" `isEqual` "conversation.mls-welcome") ws
nPayload n %. "data" `shouldMatch` T.decodeUtf8 (Base64.encode welcome)

testMixedProtocolUserLeaves :: HasCallStack => Domain -> App ()
testMixedProtocolUserLeaves secondDomain = do
Expand Down
5 changes: 4 additions & 1 deletion services/galley/src/Galley/API/MLS/Message.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ postMLSCommitBundleToLocalConv qusr c conn bundle ctype lConvOrSubId = do
bundle.epoch
action
bundle.commit.value
pure (events, cmIdentities (paAdd action))
-- the sender client is included in the Add action on the first commit,
-- but it doesn't need to get a welcome message, so we filter it out here
let newClients = filter ((/=) senderIdentity) (cmIdentities (paAdd action))
pure (events, newClients)
SenderExternal _ -> throw (mlsProtocolError "Unexpected sender")
SenderNewMemberProposal -> throw (mlsProtocolError "Unexpected sender")
SenderNewMemberCommit -> do
Expand Down