Move PlzNavigate frame-src CSP check to NavigationRequest

content/browser/frame_host/ancestor_throttle.cc

 // 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/metrics/histogram_macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 157 matching lines @@
       return NavigationThrottle::PROCEED;
   }
   NOTREACHED();
   return NavigationThrottle::BLOCK_RESPONSE;
 }
 
 const char* AncestorThrottle::GetNameForLogging() {
   return "AncestorThrottle";
 }
 
-NavigationThrottle::ThrottleCheckResult
-AncestorThrottle::CheckContentSecurityPolicyFrameSrc(bool is_redirect) {
-  // If PlzNavigate is enabled, "frame-src" is enforced on the browser side,
-  // else on the renderer side.
-  if (!IsBrowserSideNavigationEnabled())
-    return NavigationThrottle::PROCEED;
-
-  const GURL& url = navigation_handle()->GetURL();
-  if (url.SchemeIs(url::kAboutScheme))
-    return NavigationThrottle::PROCEED;
-
-  NavigationHandleImpl* handle =
-      static_cast<NavigationHandleImpl*>(navigation_handle());
-
-  if (handle->should_check_main_world_csp() == CSPDisposition::DO_NOT_CHECK)
-    return NavigationThrottle::PROCEED;
-
-  FrameTreeNode* parent_ftn = handle->frame_tree_node()->parent();
-  DCHECK(parent_ftn);
-  RenderFrameHostImpl* parent = parent_ftn->current_frame_host();
-  DCHECK(parent);
-
-  if (parent->IsAllowedByCsp(CSPDirective::FrameSrc, url, is_redirect,
-                             handle->source_location())) {
-    return NavigationThrottle::PROCEED;
-  }
-
-  return NavigationThrottle::BLOCK_REQUEST;
-}
-
-NavigationThrottle::ThrottleCheckResult AncestorThrottle::WillStartRequest() {
-  return CheckContentSecurityPolicyFrameSrc(false);
-}
-
-NavigationThrottle::ThrottleCheckResult
-AncestorThrottle::WillRedirectRequest() {
-  return CheckContentSecurityPolicyFrameSrc(true);
-}
-
 AncestorThrottle::AncestorThrottle(NavigationHandle* handle)
     : NavigationThrottle(handle) {}
 
 void AncestorThrottle::ParseError(const std::string& value,
                                   HeaderDisposition disposition) {
   DCHECK(disposition == HeaderDisposition::CONFLICT ||
          disposition == HeaderDisposition::INVALID);
   if (!navigation_handle()->GetRenderFrameHost())
     return;  // Some responses won't have a RFH (i.e. 204/205s or downloads).
 
@@ skipping 82 matching lines @@
       HeadersContainFrameAncestorsCSP(headers)) {
     // 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
     return HeaderDisposition::BYPASS;
   }
   return result;
 }
 
 }  // namespace content