Fix enabling key backup not working if there is an untrusted key backup #30707
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
…up on the server.
Half-Shot
requested review from
a team and
richvdh
and removed request for
a team
Half-Shot
changed the title
richvdh
approved these changes
Sep 11, 2025
src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts
Outdated
Show resolved
Hide resolved
src/components/viewmodels/settings/encryption/KeyStoragePanelViewModel.ts
Outdated
Show resolved
Hide resolved
| currentKeyBackup.trustInfo, | ||
| ); | ||
| // Check if the current key backup can be used. Either of these properties causes the key backup to be used. | ||
| if (currentKeyBackup.trustInfo.trusted || currentKeyBackup.trustInfo.matchesDecryptionKey) { |
There was a problem hiding this comment.
really feels like this ought to be exposed more explicitly by checkKeyBackupAndEnable (a result field, maybe?) rather than something you have to reverse-engineer, but I'll not insist on that change.
…iewModel.ts Co-authored-by: Richard van der Hoff <[email protected]>
…iewModel.ts Co-authored-by: Richard van der Hoff <[email protected]>
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
Fixes #30706Possibly fixes #29856, and certainly improves logging of it.
This a proposed fix for the linked issue, albeit this is mostly working off my debugging assumptions and needs crypto scrutiny here.
The summary of #30706 is users may have untrusted key backups on their account that are unusable by Element Web, and in those cases we should proceed to resetting and creating a new backup rather than flaking out. I've also added abundant logging to this section as it's important to understand the state of the user's account for future debugging.
Checklist
public/exportedsymbols have accurate TSDoc documentation.