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

Side by Side Diff: chrome/browser/net/chrome_extensions_network_delegate.cc

Issue 2391643004: Revert of Block top-level navigations to nested URLs with extension origins from non-extension procs (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/extensions/process_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/chrome_extensions_network_delegate.h" 5 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
11 11
12 #if defined(ENABLE_EXTENSIONS) 12 #if defined(ENABLE_EXTENSIONS)
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 14 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
15 #include "chrome/browser/extensions/event_router_forwarder.h" 15 #include "chrome/browser/extensions/event_router_forwarder.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "content/public/browser/render_frame_host.h" 18 #include "content/public/browser/render_frame_host.h"
19 #include "content/public/browser/resource_request_info.h" 19 #include "content/public/browser/resource_request_info.h"
20 #include "extensions/browser/api/web_request/web_request_api.h" 20 #include "extensions/browser/api/web_request/web_request_api.h"
21 #include "extensions/browser/info_map.h" 21 #include "extensions/browser/info_map.h"
22 #include "extensions/browser/process_manager.h" 22 #include "extensions/browser/process_manager.h"
23 #include "extensions/common/constants.h"
24 #include "net/url_request/url_request.h" 23 #include "net/url_request/url_request.h"
25 24
26 using content::BrowserThread; 25 using content::BrowserThread;
27 using content::ResourceRequestInfo; 26 using content::ResourceRequestInfo;
28 using extensions::ExtensionWebRequestEventRouter; 27 using extensions::ExtensionWebRequestEventRouter;
29 28
30 namespace { 29 namespace {
31 30
32 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; 31 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE };
33 32
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 152
154 void ChromeExtensionsNetworkDelegateImpl::ForwardDoneRequestStatus( 153 void ChromeExtensionsNetworkDelegateImpl::ForwardDoneRequestStatus(
155 net::URLRequest* request) { 154 net::URLRequest* request) {
156 ForwardRequestStatus(REQUEST_DONE, request, profile_); 155 ForwardRequestStatus(REQUEST_DONE, request, profile_);
157 } 156 }
158 157
159 int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest( 158 int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest(
160 net::URLRequest* request, 159 net::URLRequest* request,
161 const net::CompletionCallback& callback, 160 const net::CompletionCallback& callback,
162 GURL* new_url) { 161 GURL* new_url) {
163 const content::ResourceRequestInfo* info =
164 content::ResourceRequestInfo::ForRequest(request);
165 GURL url(request->url());
166
167 // Block top-level navigations to blob: or filesystem: URLs with extension
168 // origin from non-extension processes. See https://crbug.com/645028.
169 bool is_nested_url = url.SchemeIsFileSystem() || url.SchemeIsBlob();
170 bool is_navigation =
171 info && content::IsResourceTypeFrame(info->GetResourceType());
172 if (is_nested_url && is_navigation && info->IsMainFrame() &&
173 url::Origin(url).scheme() == extensions::kExtensionScheme &&
174 !extension_info_map_->process_map().Contains(info->GetChildID())) {
175 return net::ERR_ABORTED;
176 }
177
178 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 162 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
179 profile_, extension_info_map_.get(), request, callback, new_url); 163 profile_, extension_info_map_.get(), request, callback, new_url);
180 } 164 }
181 165
182 int ChromeExtensionsNetworkDelegateImpl::OnBeforeStartTransaction( 166 int ChromeExtensionsNetworkDelegateImpl::OnBeforeStartTransaction(
183 net::URLRequest* request, 167 net::URLRequest* request,
184 const net::CompletionCallback& callback, 168 const net::CompletionCallback& callback,
185 net::HttpRequestHeaders* headers) { 169 net::HttpRequestHeaders* headers) {
186 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 170 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
187 profile_, extension_info_map_.get(), request, callback, headers); 171 profile_, extension_info_map_.get(), request, callback, headers);
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 } 348 }
365 349
366 net::NetworkDelegate::AuthRequiredResponse 350 net::NetworkDelegate::AuthRequiredResponse
367 ChromeExtensionsNetworkDelegate::OnAuthRequired( 351 ChromeExtensionsNetworkDelegate::OnAuthRequired(
368 net::URLRequest* request, 352 net::URLRequest* request,
369 const net::AuthChallengeInfo& auth_info, 353 const net::AuthChallengeInfo& auth_info,
370 const AuthCallback& callback, 354 const AuthCallback& callback,
371 net::AuthCredentials* credentials) { 355 net::AuthCredentials* credentials) {
372 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; 356 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
373 } 357 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/process_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698