Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 2404373003: Experimental Feature: Allow-CSP-From header (Closed)
Patch Set: Better format of ContentSecurityPolicyTest.ShouldEnforceEmbeddersPolicy Created 4 years, 2 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
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index 7f689758f73ce58cb90169608e096f5f9c89130e..f2f9b3fea73a415e44e8d23727a046901b35eb61 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -448,6 +448,29 @@ void DocumentLoader::responseReceived(
}
}
+ if (RuntimeEnabledFeatures::embedderCSPEnforcementEnabled() &&
+ !frameLoader()->requiredCSP().isEmpty()) {
+ SecurityOrigin* parentSecurityOrigin =
+ frame()->tree().parent()->securityContext()->getSecurityOrigin();
+ if (ContentSecurityPolicy::shouldEnforceEmbeddersPolicy(
+ response, parentSecurityOrigin)) {
+ m_contentSecurityPolicy->addPolicyFromHeaderValue(
+ frameLoader()->requiredCSP(), ContentSecurityPolicyHeaderTypeEnforce,
+ ContentSecurityPolicyHeaderSourceHTTP);
+ } else {
+ String message = "Refused to display '" + response.url().elidedString() +
+ "' because it has not opted-into the following policy "
+ "required by its embedder: '" +
+ frameLoader()->requiredCSP() + "'.";
+ ConsoleMessage* consoleMessage = ConsoleMessage::createForRequest(
+ SecurityMessageSource, ErrorMessageLevel, message, response.url(),
+ mainResourceIdentifier());
+ frame()->document()->addConsoleMessage(consoleMessage);
+ cancelLoadAfterXFrameOptionsOrCSPDenied(response);
+ return;
+ }
+ }
+
DCHECK(!m_frame->page()->defersLoading());
m_response = response;

Powered by Google App Engine
This is Rietveld 408576698