Source/core/page/ContentSecurityPolicy.h - 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/page/ContentSecurityPolicy.h

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

Patch Set: Fixes from comments and nits from Adam and Mike. 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/loader/cache/CachedResourceLoader.cpp ('K') | « Source/core/loader/cache/CachedResourceLoader.cpp ('k') | Source/core/page/ContentSecurityPolicy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/ContentSecurityPolicy.h

diff --git a/Source/core/page/ContentSecurityPolicy.h b/Source/core/page/ContentSecurityPolicy.h

index aa76d5e729e7dc46b12b0b8f3fa57820f069c945..08e228ab33fa7b60e716bf9f904177cf33df3406 100644

--- a/Source/core/page/ContentSecurityPolicy.h

+++ b/Source/core/page/ContentSecurityPolicy.h

@@ -89,13 +89,12 @@ public:

bool allowJavaScriptURLs(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;

bool allowInlineEventHandlers(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;

- bool allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;

+ bool allowInlineScript(const String& nonce, const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;

bool allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, ReportingStatus = SendReport) const;

bool allowEval(ScriptState* = 0, ReportingStatus = SendReport) const;

- bool allowScriptNonce(const String& nonce, const String& contextURL, const WTF::OrdinalNumber& contextLine, const KURL& = KURL()) const;

bool allowPluginType(const String& type, const String& typeAttribute, const KURL&, ReportingStatus = SendReport) const;

- bool allowScriptFromSource(const KURL&, ReportingStatus = SendReport) const;

+ bool allowScriptFromSource(const KURL&, const String& nonce, ReportingStatus = SendReport) const;

bool allowObjectFromSource(const KURL&, ReportingStatus = SendReport) const;

bool allowChildFrameFromSource(const KURL&, ReportingStatus = SendReport) const;

bool allowImageFromSource(const KURL&, ReportingStatus = SendReport) const;