fix(core): defer MLS pending-proposals rehydration until LIVE [WPB-24348]#21265
Open
thisisamir98 wants to merge 6 commits intodevfrom
Open
fix(core): defer MLS pending-proposals rehydration until LIVE [WPB-24348]#21265thisisamir98 wants to merge 6 commits intodevfrom
thisisamir98 wants to merge 6 commits intodevfrom
Conversation
Stop calling initialisePendingProposalsTasks() from initClient. Persisted TaskScheduler tasks often have firing dates in the past, so they run on the next tick while the client is still draining the notification catch-up. That can advance the local MLS epoch ahead of queued application traffic and surface Wrong Epoch / MessageEpochTooOld during decryption. Rehydrate those timers only when we transition to ConnectionState.LIVE: before resumeProposalProcessing in handleSynchronizationNotification (async marker path) and in the legacy notification stream processor (same ordering). Add regression tests that drive createLegacyNotificationStreamProcessor directly: one checks that rehydration runs once and before LIVE is emitted; the other checks it is skipped when MLS is disabled.
thisisamir98
requested review from
arjita-mitra,
e-maad,
otto-the-bot,
screendriver and
zskhan
as code owners
Contributor
|
🔗 Download Full Report Artifact 🧪 Playwright Test Summary
|
typfel
reviewed
May 8, 2026
typfel
requested changes
May 8, 2026
screendriver
requested changes
May 11, 2026
| */ | ||
| private readonly rehydrateMlsPendingProposalsTasksOnLiveTransition = async (): Promise<void> => { | ||
| if (this.hasMLSDevice && this.service?.mls) { | ||
| await this.service.mls.initialisePendingProposalsTasks(); |
Member
There was a problem hiding this comment.
What is the failure policy if initialisePendingProposalsTasks() rejects here? A rejection can block the hand-off path
Collaborator
Author
There was a problem hiding this comment.
errors are absorbed inside initialisePendingProposalsTasks, so this line should not reject.
see: https://github.com/wireapp/wire-webapp/blob/dev/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts#L1133-L1162
| * if the marker ID matches the current marker ID. | ||
| */ | ||
| if (markerId === currentMarkerId) { | ||
| await this.rehydrateMlsPendingProposalsTasksOnLiveTransition(); |
Member
There was a problem hiding this comment.
Can this path run multiple times across reconnect/LIVE transitions? If yes, please confirm rehydration is idempotent (or guard it) to avoid duplicate pending-proposal timers.
| void this.notificationProcessingQueue | ||
| .push(async () => { | ||
| this.logger.info(`Resuming message sending. ${getQueueLength()} messages to be sent`); | ||
| await this.rehydrateMlsPendingProposalsTasksOnLiveTransition(); |
Member
There was a problem hiding this comment.
Same idempotency concern as line 976
Co-authored-by: Christian Rackerseder <git@echooff.de>
…up-done' of github.com:wireapp/wire-webapp into fix/mls-defer-pending-proposals-rehydration-until-catchup-done
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stop calling initialisePendingProposalsTasks() from initClient. Persisted TaskScheduler tasks often have firing dates in the past, so they run on the next tick while the client is still draining the notification catch-up. That can advance the local MLS epoch ahead of queued application traffic and surface Wrong Epoch / MessageEpochTooOld during decryption.
Rehydrate those timers only when we transition to ConnectionState.LIVE: before resumeProposalProcessing in handleSynchronizationNotification (async marker path) and in the legacy notification stream processor (same ordering).
Add regression tests that drive createLegacyNotificationStreamProcessor directly: one checks that rehydration runs once and before LIVE is emitted; the other checks it is skipped when MLS is disabled.