fix: Pass URLs to PhishingController#2835
Merged
FrederikBolding merged 2 commits intomainfrom Oct 14, 2024
Merged
Conversation
Mrtenz
previously approved these changes
Oct 14, 2024
Mrtenz
approved these changes
Oct 14, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2835 +/- ##
=======================================
Coverage 94.46% 94.46%
=======================================
Files 484 484
Lines 10343 10345 +2
Branches 1576 1576
=======================================
+ Hits 9770 9772 +2
Misses 573 573 ☔ View full report in Codecov by Sentry. |
github-merge-queue bot
pushed a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 14, 2024
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Fixes two problems with Snaps usage of `PhishingController`. Following #25839 the PhishingController expects full URLs instead of hostnames as the input to `testOrigin`. In that PR, the argument of `isOnPhishingList` was incorrectly changed. This PR also patches in some changes from the `snaps` repo that are currently blocked by a release: MetaMask/snaps#2835, MetaMask/snaps#2750 [](https://codespaces.new/MetaMask/metamask-extension/pull/27817?quickstart=1) ## **Manual testing steps** 1. Create a Snap that links to an URL blocked with `eth-phishing-detect` 2. See that triggering the Snap is disallowed if the user has phishing detection enabled
FrederikBolding
added a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 14, 2024
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> Fixes two problems with Snaps usage of `PhishingController`. Following #25839 the PhishingController expects full URLs instead of hostnames as the input to `testOrigin`. In that PR, the argument of `isOnPhishingList` was incorrectly changed. This PR also patches in some changes from the `snaps` repo that are currently blocked by a release: MetaMask/snaps#2835, MetaMask/snaps#2750 [](https://codespaces.new/MetaMask/metamask-extension/pull/27817?quickstart=1) 1. Create a Snap that links to an URL blocked with `eth-phishing-detect` 2. See that triggering the Snap is disallowed if the user has phishing detection enabled
danjm
pushed a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 15, 2024
## **Description** <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> Fixes two problems with Snaps usage of `PhishingController`. Following #25839 the PhishingController expects full URLs instead of hostnames as the input to `testOrigin`. In that PR, the argument of `isOnPhishingList` was incorrectly changed. This PR also patches in some changes from the `snaps` repo that are currently blocked by a release: MetaMask/snaps#2835, MetaMask/snaps#2750 This PR cherry-picks a commit from `develop` that fixes this: 1f1e142 [](https://codespaces.new/MetaMask/metamask-extension/pull/27833?quickstart=1) ## **Manual testing steps** 1. Create a Snap that links to an URL blocked with `eth-phishing-detect` 2. See that triggering the Snap is disallowed if the user has phishing detection enabled
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Following MetaMask/metamask-extension#25839 full URLs are required as the argument for
PhishingController:testOrigin. This PR makes sure that our calls toisOnPhishingListpass strictly full URLs.