[PM-39455] Let the organization rotate the account recovery key - #8174
Open
mzieniukbw wants to merge 1 commit into
Open
[PM-39455] Let the organization rotate the account recovery key#8174mzieniukbw wants to merge 1 commit into
mzieniukbw wants to merge 1 commit into
Conversation
mzieniukbw
requested review from
BTreston and
eligrubb
and removed request for
a team
August 8, 2026 16:05
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #8174 +/- ##
=======================================
Coverage 68.56% 68.57%
=======================================
Files 2381 2383 +2
Lines 103902 103918 +16
Branches 9405 9408 +3
=======================================
+ Hits 71245 71260 +15
- Misses 30310 30311 +1
Partials 2347 2347 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
eligrubb
previously approved these changes
Aug 13, 2026
Base automatically changed from
km/pm-39455-set-upgrade-tokens-for-organizations
to
main
August 14, 2026 15:32
mzieniukbw
dismissed stale reviews from eligrubb and BTreston
August 14, 2026 15:32
The base branch was changed.
The organization holds the existing account recovery key and its own private key, so it can derive the new one from the V2 upgrade token without the member's client involved. Sending a new account recovery key during user key rotation would expose it, so the server leaves the stored value in place for the organization to replace. (cherry picked from commit 4c3cf74)
mzieniukbw
force-pushed
the
km/pm-39455-account-recovery-skip-upgrade-tokens-for-organizations
branch
from
August 14, 2026 22:31
4c3cf74 to
c2f615f
Compare
mzieniukbw
requested review from
BTreston and
eligrubb
and removed request for
a team
August 14, 2026 22:32
eligrubb
approved these changes
Aug 14, 2026
eliykat
approved these changes
Aug 14, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-39455
Depends on #8158
📔 Objective
The organization holds the existing account recovery key and its own private key, so it can derive the new one from the V2 upgrade token without the member's client involved (covered in later PRs). Sending a new account recovery key during user key rotation would expose it, so the server leaves the stored value in place for the organization to replace.
(Since malicious server could send public key of it's own choice to the user.)
📸 Screenshots