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

Unified Diff: content/browser/frame_host/ancestor_throttle.cc

Issue 1617043002: Introduce AncestorThrottle, which will process 'X-Frame-Options' headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@block-response
Patch Set: Drop XFO from Blink. Created 4 years, 8 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: content/browser/frame_host/ancestor_throttle.cc
diff --git a/content/browser/frame_host/ancestor_throttle.cc b/content/browser/frame_host/ancestor_throttle.cc
new file mode 100644
index 0000000000000000000000000000000000000000..048e0b2d57826d179cd48c5d0ca39af37a64ab0b
--- /dev/null
+++ b/content/browser/frame_host/ancestor_throttle.cc
@@ -0,0 +1,179 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/frame_host/ancestor_throttle.h"
+
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
+#include "content/browser/frame_host/frame_tree.h"
+#include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/navigation_handle_impl.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/navigation_throttle.h"
+#include "content/public/common/console_message_level.h"
+#include "net/http/http_response_headers.h"
+#include "url/origin.h"
+
+namespace content {
+
+// static
+std::unique_ptr<NavigationThrottle> AncestorThrottle::MaybeCreateThrottleFor(
+ NavigationHandle* handle) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+ if (handle->IsInMainFrame())
+ return nullptr;
+
+ return std::unique_ptr<NavigationThrottle>(new AncestorThrottle(handle));
+}
+
+AncestorThrottle::AncestorThrottle(NavigationHandle* handle)
+ : NavigationThrottle(handle) {}
+
+AncestorThrottle::~AncestorThrottle() {}
+
+NavigationThrottle::ThrottleCheckResult
+AncestorThrottle::WillProcessResponse() {
+ DCHECK(!navigation_handle()->IsInMainFrame());
+
+ NavigationHandleImpl* handle =
+ static_cast<NavigationHandleImpl*>(navigation_handle());
+
+ std::string header_value;
+ HeaderDisposition disposition =
+ ParseHeader(handle->GetResponseHeaders(), &header_value);
+ switch (disposition) {
+ case CONFLICT:
+ ParseError(header_value, disposition);
+ return NavigationThrottle::BLOCK_RESPONSE;
+
+ case INVALID:
+ ParseError(header_value, disposition);
+ // TODO(mkwst): Consider failing here.
+ return NavigationThrottle::PROCEED;
+
+ case DENY:
+ ConsoleError(disposition);
+ return NavigationThrottle::BLOCK_RESPONSE;
+
+ case SAMEORIGIN: {
+ url::Origin current_origin(navigation_handle()->GetURL());
+ url::Origin top_origin =
+ handle->frame_tree_node()->frame_tree()->root()->current_origin();
+ if (top_origin.IsSameOriginWith(current_origin))
+ return NavigationThrottle::PROCEED;
+ ConsoleError(disposition);
+ return NavigationThrottle::BLOCK_RESPONSE;
+ }
+
+ case NONE:
+ case IGNORE:
+ case ALLOWALL:
+ return NavigationThrottle::PROCEED;
+ }
+ NOTREACHED();
+ return NavigationThrottle::BLOCK_RESPONSE;
+}
+
+void AncestorThrottle::ParseError(const std::string& value,
+ HeaderDisposition disposition) {
+ DCHECK(disposition == CONFLICT || disposition == INVALID);
+
+ std::string message;
+ if (disposition == CONFLICT) {
+ message = base::StringPrintf(
+ "Refused to display '%s' in a frame because it set multiple "
+ "'X-Frame-Options' headers with conflicting values "
+ "('%s'). Falling back to 'deny'.",
+ navigation_handle()->GetURL().spec().c_str(), value.c_str());
+ } else {
+ message = base::StringPrintf(
+ "Invalid 'X-Frame-Options' header encountered when loading '%s': "
+ "'%s' is not a recognized directive. The header will be ignored.",
+ navigation_handle()->GetURL().spec().c_str(), value.c_str());
+ }
+
+ // Log a console error in the parent of the current RenderFrameHost (as
+ // the current RenderFrameHost itself doesn't yet have a document).
+ navigation_handle()->GetRenderFrameHost()->GetParent()->AddMessageToConsole(
nasko 2016/04/29 18:56:02 As it is, this can result in a crash, since we reg
Mike West 2016/05/02 09:37:52 We don't register the throttle for main frames, as
+ CONSOLE_MESSAGE_LEVEL_ERROR, message);
+}
+
+void AncestorThrottle::ConsoleError(HeaderDisposition disposition) {
+ DCHECK(disposition == DENY || disposition == SAMEORIGIN);
+ std::string message = base::StringPrintf(
+ "Refused to display '%s' in a frame because it set 'X-Frame-Options' "
+ "to '%s'.",
+ navigation_handle()->GetURL().spec().c_str(),
+ disposition == DENY ? "deny" : "sameorigin");
+
+ // Log a console error in the parent of the current RenderFrameHost (as
+ // the current RenderFrameHost itself doesn't yet have a document).
+ navigation_handle()->GetRenderFrameHost()->GetParent()->AddMessageToConsole(
+ CONSOLE_MESSAGE_LEVEL_ERROR, message);
+}
+
+AncestorThrottle::HeaderDisposition AncestorThrottle::ParseHeader(
+ const net::HttpResponseHeaders* headers,
+ std::string* header_value) {
+ DCHECK(header_value);
+ if (!headers)
+ return NONE;
+
+
+ HeaderDisposition result = NONE;
+ size_t iter = 0;
+ std::string value;
+ while (headers->EnumerateHeader(&iter, "x-frame-options", &value)) {
+ HeaderDisposition current = INVALID;
+
+ base::StringPiece trimmed =
+ base::TrimWhitespaceASCII(value, base::TRIM_ALL);
+ if (!header_value->empty())
+ header_value->append(", ");
+ header_value->append(trimmed.as_string());
+
+ if (base::LowerCaseEqualsASCII(trimmed, "deny"))
+ current = DENY;
+ else if (base::LowerCaseEqualsASCII(trimmed, "allowall"))
+ current = ALLOWALL;
+ else if (base::LowerCaseEqualsASCII(trimmed, "sameorigin"))
+ current = SAMEORIGIN;
+ else
+ current = INVALID;
+
+ if (result == NONE)
+ result = current;
+ else if (result != current)
+ result = CONFLICT;
+ }
+
+ // If 'X-Frame-Options' would potentially block the response, check whether
+ // the 'frame-ancestors' CSP directive should take effect instead. See
+ // https://www.w3.org/TR/CSP/#frame-ancestors-and-frame-options
+ if (result != NONE && result != ALLOWALL) {
+ iter = 0;
+ value = std::string();
+ while (headers->EnumerateHeader(&iter, "content-security-policy", &value)) {
+ // TODO(mkwst): 'frame-ancestors' is currently handled in Blink. We should
+ // handle it here instead. Until then, don't block the request, and let
+ // Blink handle it. https://crbug.com/555418
+ std::vector<std::string> tokens = base::SplitString(
+ value, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+ if (std::count_if(tokens.begin(), tokens.end(), [](std::string token) {
+ // The trailing " " is intentional; we'd otherwise match
+ // "frame-ancestors-is-not-this-directive".
+ return base::StartsWith(token, "frame-ancestors ",
+ base::CompareCase::INSENSITIVE_ASCII);
+ })) {
+ return IGNORE;
+ }
+ }
+ }
+ return result;
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698