Sanitize __amp_source_origin from templates URLs #4670
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
| expect(() => resolveUrlAttr('a', 'href', | ||
| '/doc2?__amp_source_origin=https://google.com', | ||
| 'http://acme.org/doc1')) | ||
| .to.throw(/Source origin is not allowed in/); |
There was a problem hiding this comment.
nit: need to indent 4 spaces more.
|
LGTM |
| @@ -286,6 +286,9 @@ function resolveAttrValue(tagName, attrName, attrValue) { | |||
| * @private Visible for testing. | |||
| */ | |||
| export function resolveUrlAttr(tagName, attrName, attrValue, windowLocation) { | |||
| user().assert(attrValue.indexOf('__amp_source_origin') == -1, | |||
There was a problem hiding this comment.
Shall we extract a shared constant for __amp_source_origin?
There was a problem hiding this comment.
I think this is fine, the other option is to import the constant defined in another file (since this string is being used in multiple files now) which might add more to the obfuscation. Not sure, @erwinmombay?
There was a problem hiding this comment.
It's declared in url.js, how about just import from there.
added 2 commits
August 23, 2016 14:33
| @@ -38,7 +38,7 @@ let cache; | |||
| const AMP_JS_PARAMS_REGEX = /[?&]amp_js[^&]*/; | |||
|
|
|||
| /** @private @const {string} */ | |||
|
LGTM. |
|
Does this work when one or more characters of __amp_source_origin are percent encoded? |
ariangibson
pushed a commit
to Mixpo/amphtml
that referenced
this pull request
Sep 7, 2016
mityaha
pushed a commit
to ooyala/amphtml
that referenced
this pull request
Nov 30, 2016
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.
Closes #4661
ITI: #3343