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-3640] don't clear key needed for bio/auto migration in pin migration #2721

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

jlf0dev
Copy link
Member

@jlf0dev jlf0dev commented Aug 25, 2023

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

When migrating the pin, we were clearing the old encryption key. Unfortunately, this key is needed for the bio/auto migration that could still happen later.

This fix checks for the existence of an old encrypted master key inside the pin migration, indicating that the bio/auto migration is still needed, and doesn't clear the old encryption key if so. I have also added a null check to the bio/auto migration.

This will need to be picked to rc

Code changes

  • file.ext: Description of what was changed and why

Screenshots

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

@bitwarden-bot
Copy link

Logo
Checkmarx One – Scan Summary & Details1b2dc868-b62e-406c-8535-abcf2b6095b5

No New Or Fixed Issues Found

@jlf0dev jlf0dev requested review from fedemkr and andrebispo5 August 25, 2023 01:17
Copy link
Contributor

@andrebispo5 andrebispo5 left a comment

Choose a reason for hiding this comment

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

LGTM

@trmartin4 trmartin4 merged commit 819aabb into master Aug 25, 2023
@trmartin4 trmartin4 deleted the migration-null-check branch August 25, 2023 13:47
trmartin4 pushed a commit that referenced this pull request Aug 25, 2023
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.

4 participants