feat: allow wildcards in allowedOrigins
#2458
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2458 +/- ##
=======================================
Coverage 94.32% 94.33%
=======================================
Files 438 438
Lines 9021 9032 +11
Branches 1382 1383 +1
=======================================
+ Hits 8509 8520 +11
Misses 512 512 ☔ View full report in Codecov by Sentry. |
Mrtenz
requested changes
Jun 4, 2024
Mrtenz
reviewed
Jun 4, 2024
| allowedOrigins: ['https://*', 'npm:*'], | ||
| }; | ||
|
|
||
| expect( |
There was a problem hiding this comment.
These tests are maybe a bit more readable with it.each.
There was a problem hiding this comment.
I don't find it.each that readable personally tbh 😅
Mrtenz
reviewed
Jun 4, 2024
Mrtenz
reviewed
Jun 4, 2024
packages/snaps-utils/src/json-rpc.ts
Outdated
Comment on lines
132
to
134
| origins.allowedOrigins | ||
| ?.map(createOriginRegExp) | ||
| .some((regex) => regex.test(origin)) |
There was a problem hiding this comment.
To avoid creating regex unnecessarily, what do you think of
function checkOrigin(origin: string, originSpecifier: string) {
if (originSpecifier === '*') {
return true;
}
// Create regex and test.
}
// ...
origins.allowedOrigins?.some((specifier) => checkOrigin(origin, specifier))There was a problem hiding this comment.
Yeah, I added one more optimization to this
Mrtenz
approved these changes
Jun 4, 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.
Allow wildcards in
allowedOriginsby generating a RegExp based on each allowed origin and testing the origin against it.Closes #2457