Import room key bundles received after invite. #5080
Merged
+187
−6
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
t3chguy
approved these changes
Nov 27, 2025
richvdh
requested changes
Nov 28, 2025
Member
richvdh
left a comment
richvdh
left a comment
There was a problem hiding this comment.
A few comments, generally looks good
- Remove `onReceiveToDeviceEvent` from `CryptoBackend`. - Copy old room key bundle importing logic to `preprocessToDeviceEvents`.
richvdh
requested changes
Dec 4, 2025
richvdh
approved these changes
Dec 8, 2025
Member
richvdh
left a comment
richvdh
left a comment
There was a problem hiding this comment.
LGTM otherwise. Feel free to merge, after addressing the comments
src/common-crypto/CryptoBackend.ts
Outdated
| * the inviter's ID. | ||
| * | ||
| * @param roomId - The room we were invited to, for which we did not receive a key bundle before accepting the invite. | ||
| * @param inviterId - The user who invited us to the room and is expected to have sent the room key bundle. |
Member
There was a problem hiding this comment.
Suggested change
| * @param inviterId - The user who invited us to the room and is expected to have sent the room key bundle. | |
| * @param inviterId - The user who invited us to the room and is expected to send the room key bundle. |
src/rust-crypto/rust-crypto.ts
Outdated
|
|
||
| /** mapping of room ID -> inviter ID for rooms pending MSC4268 key bundles */ | ||
| private roomsPendingKeyBundles: Set<string> = new Set(); | ||
| private readonly roomsPendingKeyBundles: Record<string, string> = {}; |
Member
There was a problem hiding this comment.
generally we try to use Map rather than Record, to avoid any danger of prototype pollution
| } | ||
| }, | ||
| (err) => { | ||
| this.logger.error(err); |
Member
There was a problem hiding this comment.
suggest giving a bit more context here, so that the logs are more useful: error attempting to download key bundle for room ${roomId} or so
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.
Partially fixes element-hq/element-web#30740. This currently does not work over a session reload, which I intend to introduce in a different PR.
Checklist
public/exportedsymbols have accurate TSDoc documentation.