Source/core/frame/csp/CSPDirectiveList.h - Issue 553423002: CSP: Use a specified frame for reporting 'frame-ancestors' violations.

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.h

Issue 553423002: CSP: Use a specified frame for reporting 'frame-ancestors' violations. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Feedback, tests, and rebase. 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/frame-ancestors/frame-ancestors-url-block-expected.txt ('k') | Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 37d8fce3b1dc52f8a1c9afe2be6559bece56bf10..8ba6b8d54b07befd4c61bc3118112eb9eb86459c 100644

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

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

@@ -49,7 +49,7 @@ public:

bool allowConnectToSource(const KURL&, ContentSecurityPolicy::ReportingStatus) const;

bool allowFormAction(const KURL&, ContentSecurityPolicy::ReportingStatus) const;

bool allowBaseURI(const KURL&, ContentSecurityPolicy::ReportingStatus) const;

- bool allowAncestors(LocalFrame*, ContentSecurityPolicy::ReportingStatus) const;

+ bool allowAncestors(LocalFrame*, const KURL&, ContentSecurityPolicy::ReportingStatus) const;

bool allowChildContextFromSource(const KURL&, ContentSecurityPolicy::ReportingStatus) const;

bool allowScriptNonce(const String&) const;

bool allowStyleNonce(const String&) const;

@@ -80,6 +80,7 @@ private:

SourceListDirective* operativeDirective(SourceListDirective*) const;

SourceListDirective* operativeDirective(SourceListDirective*, SourceListDirective* override) const;

void reportViolation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL) const;

+ void reportViolationWithFrame(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, LocalFrame*) const;

void reportViolationWithLocation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const String& contextURL, const WTF::OrdinalNumber& contextLine) const;

void reportViolationWithState(const String& directiveText, const String& effectiveDirective, const String& message, const KURL& blockedURL, ScriptState*) const;

@@ -98,7 +99,7 @@ private:

bool checkSourceAndReportViolation(SourceListDirective*, const KURL&, const String& effectiveDirective) const;

bool checkMediaTypeAndReportViolation(MediaListDirective*, const String& type, const String& typeAttribute, const String& consoleMessage) const;

- bool checkAncestorsAndReportViolation(SourceListDirective*, LocalFrame*) const;

+ bool checkAncestorsAndReportViolation(SourceListDirective*, LocalFrame*, const KURL&) const;

bool denyIfEnforcingPolicy() const { return m_reportOnly; }