Refresh pending proposals

Author: mdimjasevic

services/galley/src/Galley/API/MLS/Message.hs

@@ -710,15 +710,17 @@ processCommitWithAction qusr senderClient con lconv cm epoch groupId action send
           (_, Nothing) -> pure $ pure () -- ignore commits without update path
           _ -> throw (mlsProtocolError "Unexpected sender")
 
-    -- check all pending proposals are referenced in the commit
-    allPendingProposals <- getAllPendingProposals groupId epoch
-    let referencedProposals = Set.fromList $ mapMaybe (\x -> preview Proposal._Ref x) (cProposals commit)
-    unless (all (`Set.member` referencedProposals) allPendingProposals) $
-      throwS @'MLSCommitMissingReferences
-
-    -- check if an external commit
-    when (sender == NewMemberSender) $
-      validateExternalCommit qusr action
+    if sender == NewMemberSender
+      then -- check if an external commit
+        validateExternalCommit qusr action
+      else do
+        -- check all pending proposals are referenced in the commit
+        allPendingProposals <- getAllPendingProposals groupId epoch
+        let referencedProposals =
+              Set.fromList $
+                mapMaybe (\x -> preview Proposal._Ref x) (cProposals commit)
+        unless (all (`Set.member` referencedProposals) allPendingProposals) $
+          throwS @'MLSCommitMissingReferences
 
     -- process and execute proposals
     updates <- executeProposalAction qusr con lconv cm action
@@ -733,6 +735,9 @@ processCommitWithAction qusr senderClient con lconv cm epoch groupId action send
         . toOpaquePublicGroupState
         . gipGroupState
 
+    when (sender == NewMemberSender) $
+      refreshPendingProposals groupId epoch
+
     pure updates
 
 validateExternalCommit ::

services/galley/src/Galley/Cassandra/Proposal.hs

@@ -47,7 +47,8 @@ interpretProposalStoreToCassandra =
       GetProposal groupId epoch ref ->
         runIdentity <$$> retry x1 (query1 getQuery (params LocalQuorum (groupId, epoch, ref)))
       GetAllPendingProposals groupId epoch ->
-        runIdentity <$$> retry x1 (query getAllPending (params LocalQuorum (groupId, epoch)))
+        fst <$$> retry x1 (query getAllPending (params LocalQuorum (groupId, epoch)))
+      RefreshPendingProposals groupId epoch -> refreshProposals groupId epoch
 
 storeQuery :: Timeout -> PrepQuery W (GroupId, Epoch, ProposalRef, RawMLS Proposal) ()
 storeQuery ttl =
@@ -59,5 +60,22 @@ storeQuery ttl =
 getQuery :: PrepQuery R (GroupId, Epoch, ProposalRef) (Identity (RawMLS Proposal))
 getQuery = "select proposal from mls_proposal_refs where group_id = ? and epoch = ? and ref = ?"
 
-getAllPending :: PrepQuery R (GroupId, Epoch) (Identity ProposalRef)
-getAllPending = "select ref from mls_proposal_refs where group_id = ? and epoch = ?"
+getAllPending :: PrepQuery R (GroupId, Epoch) (ProposalRef, RawMLS Proposal)
+getAllPending = "select ref, proposal from mls_proposal_refs where group_id = ? and epoch = ?"
+
+refreshProposals :: GroupId -> Epoch -> Client ()
+refreshProposals groupId epoch = do
+  props <- retry x1 (query getAllPending (params LocalQuorum (groupId, epoch)))
+  retry x5 . batch $ do
+    setType BatchLogged
+    setConsistency LocalQuorum
+    -- insert each proposal with a bumped epoch
+    for_ props $ \p ->
+      addPrepQuery
+        (storeQuery defaultTTL)
+        (groupId, succ epoch, fst p, snd p)
+    -- remove old proposals
+    addPrepQuery removeOld (groupId, epoch)
+  where
+    removeOld :: PrepQuery W (GroupId, Epoch) ()
+    removeOld = "delete from mls_proposal_refs where group_id = ? and epoch = ?"

services/galley/src/Galley/Effects/ProposalStore.hs

@@ -42,5 +42,12 @@ data ProposalStore m a where
     GroupId ->
     Epoch ->
     ProposalStore m [ProposalRef]
+  -- | Update pending proposals by increasing the epoch number by one. This is
+  -- used for external commits because an external committer has no up-to-date
+  -- view of pending proposals.
+  RefreshPendingProposals ::
+    GroupId ->
+    Epoch ->
+    ProposalStore m ()
 
 makeSem ''ProposalStore