OLD | NEW |
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" | 23 #include "extensions/common/constants.h" |
| 24 #include "extensions/common/permissions/api_permission.h" |
24 #include "net/url_request/url_request.h" | 25 #include "net/url_request/url_request.h" |
25 | 26 |
26 using content::BrowserThread; | 27 using content::BrowserThread; |
27 using content::ResourceRequestInfo; | 28 using content::ResourceRequestInfo; |
28 using extensions::ExtensionWebRequestEventRouter; | 29 using extensions::ExtensionWebRequestEventRouter; |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
32 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; | 33 enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; |
33 | 34 |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 GURL* new_url) { | 163 GURL* new_url) { |
163 const content::ResourceRequestInfo* info = | 164 const content::ResourceRequestInfo* info = |
164 content::ResourceRequestInfo::ForRequest(request); | 165 content::ResourceRequestInfo::ForRequest(request); |
165 GURL url(request->url()); | 166 GURL url(request->url()); |
166 | 167 |
167 // Block top-level navigations to blob: or filesystem: URLs with extension | 168 // Block top-level navigations to blob: or filesystem: URLs with extension |
168 // origin from non-extension processes. See https://crbug.com/645028. | 169 // origin from non-extension processes. See https://crbug.com/645028. |
169 bool is_nested_url = url.SchemeIsFileSystem() || url.SchemeIsBlob(); | 170 bool is_nested_url = url.SchemeIsFileSystem() || url.SchemeIsBlob(); |
170 bool is_navigation = | 171 bool is_navigation = |
171 info && content::IsResourceTypeFrame(info->GetResourceType()); | 172 info && content::IsResourceTypeFrame(info->GetResourceType()); |
| 173 url::Origin origin(url); |
172 if (is_nested_url && is_navigation && info->IsMainFrame() && | 174 if (is_nested_url && is_navigation && info->IsMainFrame() && |
173 url::Origin(url).scheme() == extensions::kExtensionScheme && | 175 origin.scheme() == extensions::kExtensionScheme && |
174 !extension_info_map_->process_map().Contains(info->GetChildID())) { | 176 !extension_info_map_->process_map().Contains(info->GetChildID())) { |
175 return net::ERR_ABORTED; | 177 // Relax this restriction for apps that use <webview>. See |
| 178 // https://crbug.com/652077. |
| 179 const extensions::Extension* extension = |
| 180 extension_info_map_->extensions().GetByID(origin.host()); |
| 181 bool has_webview_permission = |
| 182 extension && |
| 183 extension->permissions_data()->HasAPIPermission( |
| 184 extensions::APIPermission::kWebView); |
| 185 if (!has_webview_permission) |
| 186 return net::ERR_ABORTED; |
176 } | 187 } |
177 | 188 |
178 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | 189 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( |
179 profile_, extension_info_map_.get(), request, callback, new_url); | 190 profile_, extension_info_map_.get(), request, callback, new_url); |
180 } | 191 } |
181 | 192 |
182 int ChromeExtensionsNetworkDelegateImpl::OnBeforeStartTransaction( | 193 int ChromeExtensionsNetworkDelegateImpl::OnBeforeStartTransaction( |
183 net::URLRequest* request, | 194 net::URLRequest* request, |
184 const net::CompletionCallback& callback, | 195 const net::CompletionCallback& callback, |
185 net::HttpRequestHeaders* headers) { | 196 net::HttpRequestHeaders* headers) { |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 } | 375 } |
365 | 376 |
366 net::NetworkDelegate::AuthRequiredResponse | 377 net::NetworkDelegate::AuthRequiredResponse |
367 ChromeExtensionsNetworkDelegate::OnAuthRequired( | 378 ChromeExtensionsNetworkDelegate::OnAuthRequired( |
368 net::URLRequest* request, | 379 net::URLRequest* request, |
369 const net::AuthChallengeInfo& auth_info, | 380 const net::AuthChallengeInfo& auth_info, |
370 const AuthCallback& callback, | 381 const AuthCallback& callback, |
371 net::AuthCredentials* credentials) { | 382 net::AuthCredentials* credentials) { |
372 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; | 383 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; |
373 } | 384 } |
OLD | NEW |