Skip to content

Simplify and cleanup MLS message handling #2844

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
pcapriotti merged 7 commits into from
Nov 15, 2022
Merged

Simplify and cleanup MLS message handling #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19c5d80
Store group info outside commit processing
pcapriotti Nov 1, 2022
f31c5c7
Extract external commit logic
pcapriotti Nov 1, 2022
7370d9d
Avoid multiple pattern matches on sender
pcapriotti Nov 1, 2022
05f66bd
Remove redundand epoch check
pcapriotti Nov 1, 2022
5bcd59e
Add ClientId to MLS messaging API
pcapriotti Nov 8, 2022
36d3f6f
Add CHANGELOG entry
pcapriotti Nov 15, 2022
3b8f49d
Store group info bundle after processing commit
pcapriotti Nov 15, 2022
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/5-internal/refactor-mls-message
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Refactor and simplify MLS message handling logic
3 changes: 3 additions & 0 deletions libs/wire-api/src/Wire/API/Routes/Public.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module Wire.API.Routes.Public
ZLocalUser,
ZConn,
ZOptUser,
ZOptClient,
ZOptConn,
ZBot,
ZConversation,
Expand Down Expand Up @@ -179,6 +180,8 @@ type ZProvider = ZAuthServant 'ZAuthProvider InternalAuthDefOpts

type ZOptUser = ZAuthServant 'ZAuthUser '[Servant.Optional, Servant.Strict]

type ZOptClient = ZAuthServant 'ZAuthClient '[Servant.Optional, Servant.Strict]

type ZOptConn = ZAuthServant 'ZAuthConn '[Servant.Optional, Servant.Strict]

instance HasSwagger api => HasSwagger (ZAuthServant 'ZAuthUser _opts :> api) where
Expand Down
3 changes: 3 additions & 0 deletions libs/wire-api/src/Wire/API/Routes/Public/Galley/MLS.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ type MLSMessagingAPI =
:> CanThrow 'MissingLegalholdConsent
:> CanThrow MLSProposalFailure
:> "messages"
:> ZOptClient
:> ZConn
:> ReqBody '[MLS] (RawMLS SomeMessage)
:> MultiVerb1 'POST '[JSON] (Respond 201 "Message sent" [Event])
Expand All @@ -91,6 +92,7 @@ type MLSMessagingAPI =
:> CanThrow 'MissingLegalholdConsent
:> CanThrow MLSProposalFailure
:> "messages"
:> ZOptClient
:> ZConn
:> ReqBody '[MLS] (RawMLS SomeMessage)
:> MultiVerb1 'POST '[JSON] (Respond 201 "Message sent" MLSMessageSendingStatus)
Expand Down Expand Up @@ -118,6 +120,7 @@ type MLSMessagingAPI =
:> CanThrow 'MissingLegalholdConsent
:> CanThrow MLSProposalFailure
:> "commit-bundles"
:> ZOptClient
:> ZConn
:> ReqBody '[CommitBundleMimeType] CommitBundle
:> MultiVerb1 'POST '[JSON] (Respond 201 "Commit accepted and forwarded" MLSMessageSendingStatus)
Expand Down
4 changes: 2 additions & 2 deletions services/galley/src/Galley/API/Federation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ sendMLSCommitBundle remoteDomain msr =
qcnv <- E.getConversationIdByGroupId (msgGroupId msg) >>= noteS @'ConvNotFound
when (qUnqualified qcnv /= F.msrConvId msr) $ throwS @'MLSGroupConversationMismatch
F.MLSMessageResponseUpdates . map lcuUpdate
<$> postMLSCommitBundle loc (qUntagged sender) qcnv Nothing bundle
<$> postMLSCommitBundle loc (qUntagged sender) Nothing qcnv Nothing bundle

sendMLSMessage ::
( Members
Expand Down Expand Up @@ -680,7 +680,7 @@ sendMLSMessage remoteDomain msr =
qcnv <- E.getConversationIdByGroupId (msgGroupId msg) >>= noteS @'ConvNotFound
when (qUnqualified qcnv /= F.msrConvId msr) $ throwS @'MLSGroupConversationMismatch
F.MLSMessageResponseUpdates . map lcuUpdate
<$> postMLSMessage loc (qUntagged sender) qcnv Nothing raw
<$> postMLSMessage loc (qUntagged sender) Nothing qcnv Nothing raw

class ToGalleyRuntimeError (effs :: EffectRow) r where
mapToGalleyError ::
Expand Down
Loading