third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp - Issue 2213593002: OOPIF support for 'plugin-types' Content Security Policy.

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: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

Issue 2213593002: OOPIF support for 'plugin-types' Content Security Policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@csp-reporting-ipcs

Patch Set: Accounting for lack of https://crrev.com/2190183002 (i.e. no CSP reports from remote frames). Created 4 years, 4 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 | « third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-cross-site-child-disallowed-expected.txt ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

index 2df252450035ef6b9a2f5743622acb5fed441688..c36b95b8b11a44b1f06f88ca660803e9a5f14916 100644

--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

@@ -541,8 +541,9 @@ bool ContentSecurityPolicy::allowPluginTypeForDocument(const Document& document,

// FIXME: The plugin-types directive should be pushed down into the

// current document instead of reaching up to the parent for it here.

LocalFrame* frame = document.frame();

- if (frame && frame->tree().parent() && frame->tree().parent()->isLocalFrame() && document.isPluginDocument()) {

- ContentSecurityPolicy* parentCSP = toLocalFrame(frame->tree().parent())->document()->contentSecurityPolicy();

+ if (frame && frame->tree().parent() && document.isPluginDocument()) {

+ ContentSecurityPolicy* parentCSP =

+ frame->tree().parent()->securityContext()->contentSecurityPolicy();

if (parentCSP && !parentCSP->allowPluginType(type, typeAttribute, url))

return false;

}

@@ -847,7 +848,8 @@ void ContentSecurityPolicy::reportViolation(const String& directiveText, const S

// https://crbug.com/376522).

if (!m_executionContext && !contextFrame) {

DCHECK(equalIgnoringCase(effectiveDirective, ContentSecurityPolicy::ChildSrc)

- || equalIgnoringCase(effectiveDirective, ContentSecurityPolicy::FrameSrc));

+ || equalIgnoringCase(effectiveDirective, ContentSecurityPolicy::FrameSrc)

+ || equalIgnoringCase(effectiveDirective, ContentSecurityPolicy::PluginTypes));

return;

}