crypto: Merge inbound Megolm sessions #5865
Merged
Conversation
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
In order to correctly merge sessions, we need more granular comparisons between two sessions than just "Better" or "Worse", so factor out a method that *just* looks at the ratchet states.
richvdh
force-pushed
the
rav/history_sharing/merge_sessions
branch
from
e3c6044 to
5c442d3
Compare
CodSpeed Performance ReportMerging #5865 will not alter performanceComparing Summary
|
andybalaam
approved these changes
Nov 13, 2025
Member
andybalaam
left a comment
andybalaam
left a comment
There was a problem hiding this comment.
Looks great. Very excited about this feature.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5865 +/- ##
==========================================
+ Coverage 88.58% 88.59% +0.01%
==========================================
Files 363 363
Lines 102782 102888 +106
Branches 102782 102888 +106
==========================================
+ Hits 91048 91157 +109
+ Misses 7495 7489 -6
- Partials 4239 4242 +3 ☔ View full report in Codecov by Sentry. |
Add a method which can be used to merge a received `InboundGroupSession` into whatever we find in the store.
... with `merge_received_group_session`. `merge_received_group_session` expands the logic of `compare_group_session` to handle the fact that there is more than one axis of "better" or "worse" and we may need to take the best bits of two copies of the session.
Add an integration test that checks that, when we receive a copy of a megolm session directly after having previously received it via history sharing, we get the best bits of both.
richvdh
force-pushed
the
rav/history_sharing/merge_sessions
branch
from
f72c06b to
60072b3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When we receive two copies of the same inbound Megolm session from two sources, merge them together intelligently.
Fixes: #5108, #4698