This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
fix path issue preventing u2f support from working on mac #13345
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 #13344
The cryptotoken extension (used for u2f support) is bundled into
electron_resources.pak
as part of the muon build. There is muon code which attempts to fetch extension resources from the pak if the path passed during extension load is a subdirectory ofchrome::DIR_RESOURCES
. Currently we useprocess.resourcesPath
on the browser-laptop side to get the path to thechome::DIR_RESOURCES
directory.There's an issue with this on mac though, in that
process.resourcesPath
returnsBrave.app/Contents/Resources
while inside muonchome::DIR_RESOURCES
actually refers toBrave.app/Contents/Frameworks/Brave Framework.framework/Resources
.This PR adds a helper function to retrieve the correct path for all platforms.
I've tested this PR on mac in dev mode as well as with a packaged build and also on linux to ensure u2f support is still working there.
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test plan
Reviewer Checklist:
Tests