Source/core/loader/FrameLoader.cpp - Issue 559503002: CSP: Move policy parsing out of Document.

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/loader/FrameLoader.cpp

Issue 559503002: CSP: Move policy parsing out of Document. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: 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

« Source/core/frame/csp/ContentSecurityPolicy.h ('K') | « Source/core/frame/csp/ContentSecurityPolicy.cpp ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('j') | Source/core/workers/WorkerGlobalScope.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index f079d040b25872e1cbbc989bfa23f5bc7c052b2e..05796949ff95a2d8ab539c521fa8b89b6a4a001f 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -380,7 +380,11 @@ void FrameLoader::didBeginDocument(bool dispatch)

if (dispatch)

dispatchDidClearDocumentOfWindowObject();

- m_frame->document()->initContentSecurityPolicy(m_documentLoader ? ContentSecurityPolicyResponseHeaders(m_documentLoader->response()) : ContentSecurityPolicyResponseHeaders());

+ // FIXME: Move this to DocumentLoader::responseReceived, next to the X-Frame-Options checks.

+ RefPtr<ContentSecurityPolicy> csp = ContentSecurityPolicy::create();

+ if (m_documentLoader)

+ csp->didReceiveHeaders(ContentSecurityPolicyResponseHeaders(m_documentLoader->response()));

+ m_frame->document()->initContentSecurityPolicy(csp);

if (!m_frame->document()->contentSecurityPolicy()->allowAncestors(m_frame)) {

didFailContentSecurityPolicyCheck(this);