normalize domains with trailing slashes #477
Open
+31
−1
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
CSP3 more explicitly calls this out: > If path A consists of one character that is equal to the U+002F > SOLIDUS character (/) and path B is empty, return "Matches". A URL like `example.com/foo` will match a connect-src of `example.com`, as well as `example.com/`, so having two connect-srcs listed like this is redundant.
vcsjones
requested changes
Apr 1, 2022
| source_list.map do |source| | ||
| # Normalize domains ending in a single / as without omitting the slash accomplisheg the same. | ||
| # https://www.w3.org/TR/CSP3/#match-paths § 6.6.2.10 Step 2 | ||
| if source.chomp("/").include?("/") |
There was a problem hiding this comment.
One thing this might not be normalizing is a CSP directive like https://www.example.com/ since the protocol includes /.
The quoted spec is about matching on the path-part, not the entire URL that is in the directive.
It would be good to address this, with unit tests as well.
There was a problem hiding this comment.
I've added a test and some code to fix this. The code doesn't feel great, I'd welcome more elegant solutions here!
Co-authored-by: Dusty Greif <dgreif@users.noreply.github.com>
|
@keithamus @vcsjones anything I can do to help get this PR ready to ship? |
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.
All PRs:
Adding a new header
Generally, adding a new header is always OK.
Adding a new CSP directive
This PR normalises CSP source expressions to exclude trailing slashes from the Domain if there is no other information in the path.
CSP3 more explicitly calls this out in the path match algorithm:
Also a URL like
example.com/foowill match a source expression ofexample.com, as well asexample.com/, so having two source expressions listed like this is redundant.