-
Notifications
You must be signed in to change notification settings - Fork 557
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
feat(snaps-utils): Allow overriding allowed protocols in validateLink #2411
Open
legobeat
wants to merge
8
commits into
MetaMask:main
Choose a base branch
from
legobeat:configurable-protocols
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e52d59c
feat(snaps-utils): Allow overriding allowed protocols in validateLink
legobeat cb451de
add test
legobeat eb9420c
lint:fix
legobeat 55072df
add coverage update
legobeat 59fd2be
chore: reorder test
legobeat 79af980
feat(rpc-methods): expose allowedProtocols for link validation
legobeat 2e0748a
lint:fix
legobeat d066a8c
fix: allowedProtocols optional in notify getImplementation
legobeat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -111,15 +111,19 @@ export const notifyBuilder = Object.freeze({ | |
* @param hooks.showInAppNotification - A function that shows a notification in the MetaMask UI. | ||
* @param hooks.isOnPhishingList - A function that checks for links against the phishing list. | ||
* @param hooks.maybeUpdatePhishingList - A function that updates the phishing list if needed. | ||
* @param allowedProtocols - Allowed protocols for links (example: ['https:']). | ||
* @returns The method implementation which returns `null` on success. | ||
* @throws If the params are invalid. | ||
*/ | ||
export function getImplementation({ | ||
showNativeNotification, | ||
showInAppNotification, | ||
isOnPhishingList, | ||
maybeUpdatePhishingList, | ||
}: NotifyMethodHooks) { | ||
export function getImplementation( | ||
{ | ||
showNativeNotification, | ||
showInAppNotification, | ||
isOnPhishingList, | ||
maybeUpdatePhishingList, | ||
}: NotifyMethodHooks, | ||
allowedProtocols?: string[], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does the PermissionController support this? |
||
) { | ||
return async function implementation( | ||
args: RestrictedMethodOptions<NotifyParams>, | ||
): Promise<NotifyResult> { | ||
|
@@ -132,7 +136,11 @@ export function getImplementation({ | |
|
||
await maybeUpdatePhishingList(); | ||
|
||
validateTextLinks(validatedParams.message, isOnPhishingList); | ||
validateTextLinks( | ||
validatedParams.message, | ||
isOnPhishingList, | ||
allowedProtocols, | ||
); | ||
|
||
switch (validatedParams.type) { | ||
case NotificationType.Native: | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"branches": 96.7, | ||
"branches": 96.72, | ||
"functions": 98.72, | ||
"lines": 98.81, | ||
"statements": 94.79 | ||
|
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
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
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.
This change isn't very impactful until this is done, since all UI is converted to JSX as of recently.