Do not XHR intercept first party (1P) CDN resources #16650
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
alabiaga
changed the title
src/service/xhr-impl.js
Outdated
| @@ -185,7 +187,8 @@ export class Xhr { | |||
| } | |||
| const viewer = Services.viewerForDoc(this.ampdocSingle_); | |||
| const whenFirstVisible = viewer.whenFirstVisible(); | |||
| if (!viewer.hasCapability('xhrInterceptor')) { | |||
| const firstPartyResource = urls.cdnProxyRegex.test(new URL(input).origin); | |||
There was a problem hiding this comment.
URL is not supported everywhere. Use our helper functions in url.js.
jridgewell
requested changes
Jul 10, 2018
src/service/xhr-impl.js
Outdated
| @@ -185,7 +187,9 @@ export class Xhr { | |||
| } | |||
| const viewer = Services.viewerForDoc(this.ampdocSingle_); | |||
| const whenFirstVisible = viewer.whenFirstVisible(); | |||
| if (!viewer.hasCapability('xhrInterceptor')) { | |||
| const firstPartyResource = | |||
| urls.cdnProxyRegex.test(parseUrlDeprecated(input).origin); | |||
There was a problem hiding this comment.
Use isProxyOrigin from src/url.js.
jridgewell
reviewed
Jul 10, 2018
src/service/xhr-impl.js
Outdated
| @@ -21,7 +21,7 @@ import {fromIterator} from '../utils/array'; | |||
| import { | |||
| getCorsUrl, | |||
| getSourceOrigin, | |||
| getWinOrigin, | |||
There was a problem hiding this comment.
argh. was not intended. reverted.
Codecov Report
@@ Coverage Diff @@
## master #16650 +/- ##
==========================================
- Coverage 78.13% 78.12% -0.01%
==========================================
Files 553 553
Lines 40318 40318
==========================================
- Hits 31503 31500 -3
- Misses 8815 8818 +3
Continue to review full report at Codecov.
|
jridgewell
approved these changes
Jul 11, 2018
|
THANKS! |
This was referenced Jul 16, 2018
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.
fixes #16601