Source/core/loader/ResourceLoader.cpp - Issue 14949017: Implementation of W3C compliant CSP script-src nonce.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/loader/ResourceLoader.cpp

Issue 14949017: Implementation of W3C compliant CSP script-src nonce. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Factored script nonce checks to point of resource request creation, plus nits from Adam Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/core/dom/ScriptElement.cpp ('K') | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/ResourceLoaderOptions.h » ('j') | Source/core/loader/ResourceLoaderOptions.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/ResourceLoader.cpp

diff --git a/Source/core/loader/ResourceLoader.cpp b/Source/core/loader/ResourceLoader.cpp

index 34bff2a4ebd354df7bc95cbd6803a1bc057546ff..1387a738e70630e71658bbfca0ec70fa93969324 100644

--- a/Source/core/loader/ResourceLoader.cpp

+++ b/Source/core/loader/ResourceLoader.cpp

@@ -307,7 +307,7 @@ void ResourceLoader::willSendRequest(ResourceHandle*, ResourceRequest& request,

ASSERT(!request.isNull());

if (!redirectResponse.isNull()) {

- if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->type(), request.url())) {

+ if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->type(), request.url(), m_options.cspCheck)) {

cancel();

return;

}

« Source/core/dom/ScriptElement.cpp ('K') | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/ResourceLoaderOptions.h » ('j') | Source/core/loader/ResourceLoaderOptions.h » ('J')