fix: properly decrypt legacy state blobs #2472
Merged
Conversation
This file contains 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
Mrtenz
previously approved these changes
Jun 10, 2024
Mrtenz
requested changes
Jun 10, 2024
| @@ -454,6 +454,13 @@ export const DEFAULT_ENCRYPTION_KEY_DERIVATION_OPTIONS = { | |||
| }, | |||
| }; | |||
|
|
|||
| export const LEGACY_ENCRYPTION_KEY_DERIVATION_OPTIONS = { | |||
There was a problem hiding this comment.
Maybe move this to the Snap controller file (or a constants file) and use it as the fallback, to remove some duplication?
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2472 +/- ##
=======================================
Coverage 94.34% 94.34%
=======================================
Files 438 438
Lines 9052 9053 +1
Branches 1391 1392 +1
=======================================
+ Hits 8540 8541 +1
Misses 512 512 ☔ View full report in Codecov by Sentry. |
Mrtenz
approved these changes
Jun 10, 2024
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 a problem where encrypted state blobs produced before
keyMetadatawas added would fail to decrypt.The encryptor would attempt to use the latest key derivation parameters when no
keyMetadatawas passed in, causing a failure to decrypt: https://github.com/MetaMask/metamask-extension/blob/ed5ec2d28f7e118803c6fdc74abe90db4e00f480/app/scripts/lib/encryptor-factory.ts#L78-L82This PR simply falls back to the legacy key derivation parameters whenever
keyMetadataisn't present strictly for decryption purposes. The default key derivation parameters are still in use for all encryption.