Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-16603] Implement userkey rotation v2 #12646

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

quexten
Copy link
Contributor

@quexten quexten commented Jan 1, 2025

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-16603
Server PR: bitwarden/server#5204

📔 Objective

Userkey rotation previously consisted of two steps: Update masterpassword first, then update the userkey. Between these two, the clients relied on the local state to track the updated masterkey, but also to track kdf settings. If any of these were wrong, the userkey rotation request could corrupt vault data.

This combines both into one request, such that the kdf parameters are also always sent together with the userkey rotation request so that the corruption cannot occur. Further, this makes it so that cancelling during key rotation, does not force logout the user (where previously it had to, since the masterpassword was changed, and thus the security stamp was changed).

The old key rotation is still kept around for migration of legacy users.

📸 Screenshots

Screen.Recording.2025-01-03.at.13.51.35.mov

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

Copy link
Contributor

github-actions bot commented Jan 1, 2025

Logo
Checkmarx One – Scan Summary & Detailsfa1baa0b-1a4f-4dc6-bc40-4f4e9b05d489

New Issues (4)

Checkmarx found the following issues in this Pull Request

Severity Issue Source File / Package Checkmarx Insight
MEDIUM Client_Privacy_Violation /apps/web/src/app/auth/settings/change-password.component.html: 121
detailsMethod change_password_component at line 121 of /apps/web/src/app/auth/settings/change-password.component.html sends user information outside the a...
Attack Vector
MEDIUM Client_Privacy_Violation /apps/web/src/app/auth/settings/change-password.component.html: 68
detailsMethod change_password_component at line 68 of /apps/web/src/app/auth/settings/change-password.component.html sends user information outside the ap...
Attack Vector
MEDIUM Client_Privacy_Violation /apps/web/src/app/auth/settings/change-password.component.html: 26
detailsMethod change_password_component at line 26 of /apps/web/src/app/auth/settings/change-password.component.html sends user information outside the ap...
Attack Vector
MEDIUM Client_Privacy_Violation /apps/web/src/app/auth/settings/change-password.component.html: 42
detailsMethod change_password_component at line 42 of /apps/web/src/app/auth/settings/change-password.component.html sends user information outside the ap...
Attack Vector

Copy link

codecov bot commented Jan 3, 2025

Codecov Report

Attention: Patch coverage is 59.68992% with 52 lines in your changes missing coverage. Please review.

Project coverage is 35.33%. Comparing base (582beaf) to head (d4caf6f).

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...src/app/auth/settings/change-password.component.ts 6.06% 30 Missing and 1 partial ⚠️
...nagement/key-rotation/user-key-rotation.service.ts 83.92% 3 Missing and 6 partials ⚠️
libs/key-management/src/key.service.ts 0.00% 6 Missing ⚠️
...ion/request/master-password-unlock-data.request.ts 75.00% 3 Missing ⚠️
...-encryption/migrate-legacy-encryption.component.ts 0.00% 2 Missing ⚠️
...ment/key-rotation/user-key-rotation-api.service.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #12646      +/-   ##
==========================================
+ Coverage   35.29%   35.33%   +0.04%     
==========================================
  Files        2997     3002       +5     
  Lines       90882    90984     +102     
  Branches    16969    16982      +13     
==========================================
+ Hits        32080    32153      +73     
- Misses      56314    56335      +21     
- Partials     2488     2496       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@quexten quexten changed the title Implement userkey rotation v2 [PM-16603] Implement userkey rotation v2 Jan 3, 2025
@quexten quexten marked this pull request as ready for review January 3, 2025 13:04
@quexten quexten requested review from a team as code owners January 3, 2025 13:04
@quexten quexten requested a review from rr-bw January 3, 2025 13:04
@quexten quexten marked this pull request as draft January 8, 2025 18:16
@quexten quexten marked this pull request as ready for review January 9, 2025 14:50
@quexten quexten marked this pull request as draft January 14, 2025 14:46
@quexten quexten removed the request for review from rr-bw January 14, 2025 15:00
@quexten quexten marked this pull request as ready for review January 15, 2025 10:12
Copy link
Contributor

@JaredSnider-Bitwarden JaredSnider-Bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! After a quick pass through, I've got a few questions / comments below:

Copy link
Contributor

@JaredSnider-Bitwarden JaredSnider-Bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

mzieniukbw
mzieniukbw previously approved these changes Jan 22, 2025
@@ -31,7 +31,7 @@ export enum FeatureFlag {
AccountDeprovisioning = "pm-10308-account-deprovisioning",
SSHKeyVaultItem = "ssh-key-vault-item",
SSHAgent = "ssh-agent",
UserKeyRotation = "userkey-rotation-refactor",
UserKeyRotationV2 = "userkey-rotation-refactor",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we rename the feature flag to userkey-rotation-v2 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, makes sense, this is the flag we had in launchdarkly, but i'll get that changed, because it does not match the actual change that is not a refactor.

@quexten quexten marked this pull request as draft January 28, 2025 11:32
@quexten quexten force-pushed the km/userkey-rotation-v2 branch from 294fa4e to d4caf6f Compare January 28, 2025 14:26
@quexten
Copy link
Contributor Author

quexten commented Jan 28, 2025

Cleaned up the userkey rotation v2 api in the server PR and subsequently adjusted this PR to match.

Added some more tests aswell.

@quexten quexten marked this pull request as ready for review January 28, 2025 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants