PlzNavigate: Enforce 'frame-src' CSP on the browser.

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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/navigation_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 386 matching lines @@
   if (!begin_params_.client_side_redirect_url.is_empty())
     redirect_chain.push_back(begin_params_.client_side_redirect_url);
   redirect_chain.push_back(common_params_.url);
 
   std::unique_ptr<NavigationHandleImpl> navigation_handle =
       NavigationHandleImpl::Create(
           common_params_.url, redirect_chain, frame_tree_node_,
           !browser_initiated_, FrameMsg_Navigate_Type::IsSameDocument(
                                    common_params_.navigation_type),
           common_params_.navigation_start, pending_nav_entry_id,
-          false);  // started_in_context_menu
+          false,  // started_in_context_menu
+          common_params_.should_bypass_main_world_csp);
 
   if (!frame_tree_node->navigation_request()) {
     // A callback could have cancelled this request synchronously in which case
     // |this| is deleted.
     return;
   }
 
   navigation_handle_ = std::move(navigation_handle);
 
   if (!begin_params_.searchable_form_url.is_empty()) {
@@ skipping 268 matching lines @@
   if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
       result == NavigationThrottle::CANCEL) {
     // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
     OnRequestFailed(false, net::ERR_ABORTED);
 
     // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
     // destroyed the NavigationRequest.
     return;
   }
 
+  if (result == NavigationThrottle::BLOCK_REQUEST) {
+    OnRequestFailed(false, net::ERR_BLOCKED_BY_CLIENT);
+    // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
+    // destroyed the NavigationRequest.
+    return;
+  }

[nasko, 2017/02/15 21:28:44]

I think this code along with the necessary changes to NavigationHandleImpl
should land separately, as it is just a bug. It will also include unit tests to
ensure it works properly and not pollute this CL.

[arthursonzogni, 2017/02/16 17:32:41]

Acknowledged. Please see:
https://codereview.chromium.org/2698623006/

+
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnWillProcessResponseChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(result != NavigationThrottle::DEFER);
 
   // Abort the request if needed. This includes requests that were blocked by
   // NavigationThrottles and requests that should not commit (e.g. downloads,
   // 204/205s). This will destroy the NavigationRequest.
@@ skipping 41 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content