| Index: content/browser/frame_host/navigation_request.cc
|
| diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
|
| index c13a7e7f346df429cfd58896da678a198019f258..327b4a5efef1f364cc33b83fa48ea06cbb5ce1ee 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <utility>
|
|
|
| +#include "content/browser/child_process_security_policy_impl.h"
|
| #include "content/browser/devtools/render_frame_devtools_agent_host.h"
|
| #include "content/browser/frame_host/frame_tree.h"
|
| #include "content/browser/frame_host/frame_tree_node.h"
|
| @@ -15,6 +16,7 @@
|
| #include "content/browser/frame_host/navigator.h"
|
| #include "content/browser/frame_host/navigator_impl.h"
|
| #include "content/browser/loader/navigation_url_loader.h"
|
| +#include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/service_worker/service_worker_context_wrapper.h"
|
| #include "content/browser/service_worker/service_worker_navigation_handle.h"
|
| #include "content/browser/site_instance_impl.h"
|
| @@ -29,6 +31,7 @@
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/request_context_type.h"
|
| #include "content/public/common/resource_response.h"
|
| +#include "content/public/common/url_constants.h"
|
| #include "net/base/load_flags.h"
|
| #include "net/base/url_util.h"
|
| #include "net/http/http_request_headers.h"
|
| @@ -332,8 +335,19 @@ void NavigationRequest::OnRequestRedirected(
|
| common_params_.method = redirect_info.new_method;
|
| common_params_.referrer.url = GURL(redirect_info.new_referrer);
|
|
|
| - // TODO(clamy): Have CSP + security upgrade checks here.
|
| + // For non browser initiated navigations we need to check if the source has
|
| + // access to the URL. We always allow browser initiated requests.
|
| // TODO(clamy): Kill the renderer if FilterURL fails?
|
| + GURL url = common_params_.url;
|
| + if (!browser_initiated_ && source_site_instance()) {
|
| + source_site_instance()->GetProcess()->FilterURL(false, &url);
|
| + // FilterURL sets the URL to about:blank if the CSP checks prevent the
|
| + // renderer from accessing it.
|
| + if ((url == url::kAboutBlankURL) && (url != common_params_.url)) {
|
| + frame_tree_node_->ResetNavigationRequest(false);
|
| + return;
|
| + }
|
| + }
|
|
|
| // It's safe to use base::Unretained because this NavigationRequest owns the
|
| // NavigationHandle where the callback will be stored.
|
|
|