feat(crypto): Add support for encrypted state events to matrix-sdk-crypto
#5519
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
kaylendog
force-pushed
the
kaylendog/msc3414/crypto
branch
2 times, most recently
from
4a93d4a to
ac72e92
Compare
CodSpeed Performance ReportMerging #5519 will not alter performanceComparing Summary
|
kaylendog
force-pushed
the
kaylendog/msc3414/crypto
branch
from
ac72e92 to
0e56b6d
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5519 +/- ##
==========================================
+ Coverage 88.57% 88.59% +0.02%
==========================================
Files 340 340
Lines 93690 93701 +11
Branches 93690 93701 +11
==========================================
+ Hits 82982 83012 +30
+ Misses 6575 6556 -19
Partials 4133 4133 ☔ View full report in Codecov by Sentry. |
kaylendog
force-pushed
the
kaylendog/msc3414/crypto
branch
4 times, most recently
from
dc09c52 to
0504cf0
Compare
kaylendog
commented
Aug 14, 2025
Comment on lines
+137
to
+141
| /// The outer state key could not be verified against the inner encrypted | ||
| /// state key and type. | ||
| #[cfg(feature = "experimental-encrypted-state-events")] | ||
| #[error("decryption failed because the state key failed to validate")] | ||
| StateKeyVerificationFailed, |
There was a problem hiding this comment.
This could be split into a larger variety of cases:
MalformedStateKey- when the outer encrypted event state key is not formatted asstr:str.MismatchBodyType- when the decrypted ciphertext is not a state event but the outer event is.EventTypeMismatch- when the outer event type does not match the inner.StateKeyMismatch- when the outer state key does not match the inner.
These may not be worth implementing?
kaylendog
commented
Aug 14, 2025
Comment on lines
+1001
to
+1005
|
|
||
| /// The outer state key could not be verified against the inner encrypted | ||
| /// state key and type. | ||
| #[cfg(feature = "experimental-encrypted-state-events")] | ||
| StateKeyVerificationFailed, |
There was a problem hiding this comment.
kaylendog
force-pushed
the
kaylendog/msc3414/crypto
branch
2 times, most recently
from
4edd1a2 to
dc93006
Compare
kaylendog
requested review from
stefanceriu and
richvdh
and removed request for
a team and
stefanceriu
This commit also refactors out what would be common code between ::encrypt and ::encrypt_state to a helper ::encrypt_inner. Signed-off-by: Skye Elliot <[email protected]>
Signed-off-by: Skye Elliot <[email protected]>
Signed-off-by: Skye Elliot <[email protected]>
Modifies `OlmMachine::decrypt_room_event_inner` to call a new method `OlmMachine::verify_packed_state_key` which, if the event is a state event, verifies that the original event's state key, when unpacked, matches the state key and event type in the decrypted event content. Introduces MegolmError::StateKeyVerificationFailed and UnableToDecryptReason::StateKeyVerificationFailed which are thrown when the verification fails. Signed-off-by: Skye Elliot <[email protected]>
kaylendog
force-pushed
the
kaylendog/msc3414/crypto
branch
from
dc93006 to
17818dd
Compare
|
Closing in favour of a branch local to this repository for branch-matching. |
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.
Depends on #5511, #5512 and #5523.
OutboundGroupSession::encrypt_state.GroupSessionManager::encrypt_stateand a private helper function::encrypt_inner.OlmMachine::encrypt_state_eventand::encrypt_state_event_raw.OlmMachine::decrypt_room_event_inner.