crypto: withhold outgoing messages to unsigned dehydrated devices #4551
Conversation
This file contains 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
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
from
001dcf6 to
cac1067
Compare
richvdh
commented
Jan 17, 2025
Comment on lines
164
to
216
| // We only need the user identity if `only_allow_trusted_devices` or | ||
| // `error_on_verified_user_problem` is set. | ||
| let device_owner_identity = | ||
| if only_allow_trusted_devices || error_on_verified_user_problem { | ||
| store.get_user_identity(user_id).await? | ||
| } else { | ||
| None | ||
| }; | ||
| let device_owner_identity = store.get_user_identity(user_id).await?; |
There was a problem hiding this comment.
We now also need the identity if the user has a dehydrated device. Trying to optimise away this call in the cases where we weren't going to need the identity was getting too complicated, so let's just do it every time.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4551 +/- ##
==========================================
+ Coverage 85.39% 85.40% +0.01%
==========================================
Files 286 286
Lines 32258 32275 +17
==========================================
+ Hits 27546 27564 +18
+ Misses 4712 4711 -1 ☔ View full report in Codecov by Sentry. |
|
I need to update this in view of #4313 (comment) |
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
2 times, most recently
from
aa82b96 to
919f073
Compare
(Now done) |
poljar
requested changes
Jan 22, 2025
crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs
Outdated
Show resolved
Hide resolved
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
3 times, most recently
from
ecab4b1 to
c38feeb
Compare
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
from
c38feeb to
54eda15
Compare
|
Now rebased on #4586, which fixes the failing test. |
Split the existing `set_up_test_machine` into two parts, so we can set up the test OlmMachine without importing data for other users
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
from
54eda15 to
051f595
Compare
poljar
approved these changes
Jan 29, 2025
| @@ -966,6 +966,11 @@ impl DeviceData { | |||
| pub fn first_time_seen_ts(&self) -> MilliSecondsSinceUnixEpoch { | |||
| self.first_time_seen_ts | |||
| } | |||
|
|
|||
| /// True if this device is an MSC3814 dehydrated device. | |||
There was a problem hiding this comment.
If we mention an MSC it would be nice to link to it.
Per #4313, we should not send outgoing messages to dehydrated devices that are not signed by the current pinned/verified identity.
richvdh
force-pushed
the
rav/withheld_to_unverified_dehydrated
branch
from
051f595 to
13cc4bc
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.
Per #4313, we should not send outgoing messages to dehydrated devices that are not signed by the user's identity
Fixes #4313