fix(ui): Decrypt TimelineEventKind::UnableToDecrypt coming from the event cache
#4794
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4794 +/- ##
==========================================
+ Coverage 86.36% 86.38% +0.02%
==========================================
Files 291 291
Lines 34379 34374 -5
==========================================
+ Hits 29691 29695 +4
+ Misses 4688 4679 -9 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This was referenced Mar 12, 2025
…needs a `&Room`. This patch removes the room `&Room` argument of `TimelineController::retry_event_decryption`. The `TimelineController` already has the room with its `room(&self) -> &Room` method. This method was always used to fetch the room, let's expect `retry_event_decryption` to do that by itself. It also prevents passing the “wrong” room. This is more robust this way.
This patch fixes a bug where events coming from the event cache might be encrypted, see matrix-org#4762 to learn more. This patch updates the `room_event_cache_updates_task` to call `TimelineController::retry_event_decryption` if the origin is `Cache`.
Hywan
force-pushed
the
fix-ui-timeline-decrypt-utd-from-event-cache
branch
from
3bada45 to
ddc9345
Compare
Hywan
requested review from
andybalaam and
poljar
and removed request for
a team and
andybalaam
Hywan
changed the title
m.room.encrypted coming from the event cacheTimelineEventKind::UnableToDecrypt coming from the event cache
poljar
approved these changes
Mar 14, 2025
This patch adds two tests, ensuring UTD stored in the event cache are decrypted, whether they come from the initial items or paginated items.
Hywan
force-pushed
the
fix-ui-timeline-decrypt-utd-from-event-cache
branch
from
75043d4 to
b86b497
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.
The fix is 3 LOC, the test is 345 LOC, oh yeah.
So, currently, it is possible to store an
TimelineEventKind::UnableToDecrypt(UTD) event inside the event cache. When received by theTimeline, prior this patch, such event wasn't decrypted. The fix is actually quite small: everything that comes from the cache (EventsOrigin::Cache) and that contains a UTD, triggers a redecryption. Hoping that the keys are in theOlmMachineof course.This patch tests two situations where it can happen: when the UTD is part of the initial items, and when the UTD is part of a pagination. The former was already working, but not tested via the event cache as far as I know, and the latter wasn't tested at all (because it wasn't implemented).