Source/core/frame/csp/CSPDirectiveList.cpp - Issue 568583003: Allow CSP checkNonce and checkHash to pass with 'unsafe-inline' only.

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/frame/csp/CSPDirectiveList.cpp

Issue 568583003: Allow CSP checkNonce and checkHash to pass with 'unsafe-inline' only. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed broken tests Created 6 years, 3 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/1.1/scriptnonce-multiple-policies-with-unsafe-inline-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/frame/csp/CSPDirectiveList.cpp

diff --git a/Source/core/frame/csp/CSPDirectiveList.cpp b/Source/core/frame/csp/CSPDirectiveList.cpp

index 792472dede5bc17eeba85e09c26d7cd8ba36f8c0..a858d1e7755fb70ac09e81f3baa1b13af2b27b25 100644

--- a/Source/core/frame/csp/CSPDirectiveList.cpp

+++ b/Source/core/frame/csp/CSPDirectiveList.cpp

@@ -78,12 +78,12 @@ bool CSPDirectiveList::checkInline(SourceListDirective* directive) const

bool CSPDirectiveList::checkNonce(SourceListDirective* directive, const String& nonce) const

{

- return !directive || directive->allowNonce(nonce);

+ return !directive || directive->allowNonce(nonce) || checkInline(directive);

}

bool CSPDirectiveList::checkHash(SourceListDirective* directive, const CSPHashValue& hashValue) const

{

- return !directive || directive->allowHash(hashValue);

+ return !directive || directive->allowHash(hashValue) || checkInline(directive);

}

bool CSPDirectiveList::checkSource(SourceListDirective* directive, const KURL& url) const