Source/core/dom/ScriptElement.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/dom/ScriptElement.cpp

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

Patch Set: Minor fixes based on Adam's comments 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

« no previous file with comments | « LayoutTests/http/tests/security/contentSecurityPolicy/resources/alert-pass.js ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/ScriptElement.cpp

diff --git a/Source/core/dom/ScriptElement.cpp b/Source/core/dom/ScriptElement.cpp

index 6b5873893dd4efd1916cd66ccff94a1ac14bf5ad..10e78d425962a086c07a88a724d21b2fda3b1a37 100644

--- a/Source/core/dom/ScriptElement.cpp

+++ b/Source/core/dom/ScriptElement.cpp

@@ -254,8 +254,6 @@ bool ScriptElement::requestScript(const String& sourceUrl)

return false;

if (!m_element->inDocument() || m_element->document() != originalDocument)

return false;

- if (!m_element->document()->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr), m_element->document()->url(), m_startLineNumber, m_element->document()->completeURL(sourceUrl)))

- return false;

ASSERT(!m_cachedScript);

if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {

@@ -270,6 +268,10 @@ bool ScriptElement::requestScript(const String& sourceUrl)

request.setCharset(scriptCharset());

request.setInitiator(element());

+ bool isValidScriptNonce = m_element->document()->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr));

+ if (isValidScriptNonce)

+ request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);

m_cachedScript = m_element->document()->cachedResourceLoader()->requestScript(request);

m_isExternalScript = true;

}

@@ -292,9 +294,7 @@ void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)

RefPtr<Document> document = m_element->document();

Frame* frame = document->frame();

- bool shouldBypassMainWorldContentSecurityPolicy = (frame && frame->script()->shouldBypassMainWorldContentSecurityPolicy());

- if (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr), document->url(), m_startLineNumber))

- return;

+ bool shouldBypassMainWorldContentSecurityPolicy = (frame && frame->script()->shouldBypassMainWorldContentSecurityPolicy()) || document->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr));

if (!m_isExternalScript && (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowInlineScript(document->url(), m_startLineNumber)))

abarth-chromium 2013/05/16 22:01:20 I actually just meant !shouldBypassMainWorldConte

return;