fix: add support for log file using split state format #88
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,9 @@ const passworder = require('@metamask/browser-passworder') | |
| function dedupe (arr) { | ||
| const result = [] | ||
| arr?.forEach(x => { | ||
| if (x == null) { | ||
| return | ||
| } | ||
| if (!result.find(y => Object.keys(x).length === Object.keys(y).length && Object.entries(x).every(([k,ex]) => y[k] === ex ))) { | ||
| result.push(x) | ||
| } | ||
|
|
@@ -116,27 +119,55 @@ function extractVaultFromFile (data) { | |
| } | ||
| } | ||
|
|
||
| { | ||
| // attempt 6: chromium 000005.ldb on windows | ||
| const matchRegex = /Keyring[0-9][^\}]*(\{[^\{\}]*\\"\})/gu | ||
| const captureRegex = /Keyring[0-9][^\}]*(\{[^\{\}]*\\"\})/u | ||
| const ivRegex = /\\"iv.{1,4}[^A-Za-z0-9+\/]{1,10}([A-Za-z0-9+\/]{10,40}=*)/u | ||
| const dataRegex = /\\"[^":,is]*\\":\\"([A-Za-z0-9+\/]*=*)/u | ||
| const saltRegex = /,\\"salt.{1,4}[^A-Za-z0-9+\/]{1,10}([A-Za-z0-9+\/]{10,100}=*)/u | ||
| const vaults = dedupe(data.match(matchRegex)?.map(m => m.match(captureRegex)[1]) | ||
| .map(s => [dataRegex, ivRegex, saltRegex].map(r => s.match(r))) | ||
| .filter(([d,i,s]) => d&&d.length>1 && i&&i.length>1 && s&&s.length>1) | ||
| .map(([d,i,s]) => ({ | ||
| data: d[1], | ||
| iv: i[1], | ||
| salt: s[1], | ||
| }))) | ||
| if (vaults.length) { | ||
| /* istanbul ignore next */ | ||
| if (vaults.length > 1) { | ||
| console.log('Found multiple vaults!', vaults) | ||
| } | ||
| return vaults[0] | ||
| } | ||
|
Comment on lines
+122
to
+143
Contributor
Author
There was a problem hiding this comment. this hasn't changed, other than putting it in its own lexical block now, and it doesn't
Contributor
There was a problem hiding this comment. Hide whitespace changes removes this from the diff |
||
| } | ||
| { | ||
| // attempt 7: log file using split state format, chromium 000004.log on windows-2 | ||
| const vaultRegex = /KeyringController[\s\S]*?"vault":"((?:[^"\\]|\\.)*)"/g | ||
|
Contributor
Author
There was a problem hiding this comment. the vault is stored as a top-level key now, and the top-level keys aren't JSON serialized, so they aren't wrapped with quotes. |
||
| const vaults = [] | ||
| let match | ||
|
|
||
| while ((match = vaultRegex.exec(data)) !== null) { | ||
| try { | ||
| const vaultString = JSON.parse(`"${match[1]}"`) | ||
| const json = JSON.parse(vaultString) | ||
| vaults.push(json) | ||
| } catch (err) { | ||
| // Not valid JSON: continue | ||
| } | ||
| } | ||
|
|
||
| const dedupedVaults = dedupe(vaults) | ||
| if (dedupedVaults.length) { | ||
| /* istanbul ignore next */ | ||
| if (dedupedVaults.length > 1) { | ||
| console.log('Found multiple vaults!', dedupedVaults) | ||
| } | ||
| return dedupedVaults[0] | ||
| } | ||
| } | ||
| return null | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -176,5 +207,3 @@ module.exports = { | |
| extractVaultFromFile, | ||
| isVaultValid, | ||
| } | ||
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
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
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
Binary file not shown.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AI review caught this bug that could cause dedupe to throw.