PlzNavigate & CSP. Use the SourceLocation in violation reports.

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 171 matching lines @@
       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))
-    return NavigationThrottle::BLOCK_REQUEST;
+  if (parent->EnforceCsp(CSPDirective::FrameSrc, url, is_redirect,

[arthursonzogni, 2017/03/21 16:20:38]

While I added the SourceLocation argument to this function, I choose to change
the "IsAllowedByCsp" name, because it was not clear that this function produces
side-effects.
It is probably unrelated to this CL though, let me know what do you think.

[Mike West, 2017/03/22 08:57:38]

It seems odd to diverge from Blink's implementation. There we do something like
`policy->allowRequest(...)` and pass in an enum that governs whether or not
we're just checking the result or doing reporting. I'd suggest splitting this
change out into a separate patch so we have a chance to discuss the model in a
little more detail.

[arthursonzogni, 2017/03/22 09:38:35]

Okay, let's do this!

+                         handle->source_location())) {
+    return NavigationThrottle::PROCEED;
+  }
 
-  return NavigationThrottle::PROCEED;
+  return NavigationThrottle::BLOCK_REQUEST;
 }
 
 NavigationThrottle::ThrottleCheckResult AncestorThrottle::WillStartRequest() {
   return CheckContentSecurityPolicyFrameSrc(false);
 }
 
 NavigationThrottle::ThrottleCheckResult
 AncestorThrottle::WillRedirectRequest() {
   return CheckContentSecurityPolicyFrameSrc(true);
 }
@@ skipping 93 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