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

Side by Side Diff: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Issue 2222723002: Avoid calling into the ContentBrowserClient interface from ResourceDispatcherHostImpl to determine … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile failures Created 4 years, 4 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
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/extensions/chrome_content_browser_client_extensions_par t.h" 5 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_web_ui.h" 14 #include "chrome/browser/extensions/extension_web_ui.h"
15 #include "chrome/browser/extensions/extension_webkit_preferences.h" 15 #include "chrome/browser/extensions/extension_webkit_preferences.h"
16 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" 16 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/profiles/profile_io_data.h" 18 #include "chrome/browser/profiles/profile_io_data.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h" 20 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
21 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" 21 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
22 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/extensions/extension_process_policy.h" 24 #include "chrome/common/extensions/extension_process_policy.h"
25 #include "components/guest_view/browser/guest_view_message_filter.h" 25 #include "components/guest_view/browser/guest_view_message_filter.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/browser_url_handler.h" 27 #include "content/public/browser/browser_url_handler.h"
28 #include "content/public/browser/render_process_host.h" 28 #include "content/public/browser/render_process_host.h"
29 #include "content/public/browser/render_view_host.h" 29 #include "content/public/browser/render_view_host.h"
30 #include "content/public/browser/resource_dispatcher_host.h"
31 #include "content/public/browser/resource_dispatcher_host_interceptor.h"
30 #include "content/public/browser/site_instance.h" 32 #include "content/public/browser/site_instance.h"
31 #include "content/public/browser/vpn_service_proxy.h" 33 #include "content/public/browser/vpn_service_proxy.h"
32 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
33 #include "content/public/common/content_switches.h" 35 #include "content/public/common/content_switches.h"
34 #include "extensions/browser/api/web_request/web_request_api.h" 36 #include "extensions/browser/api/web_request/web_request_api.h"
35 #include "extensions/browser/api/web_request/web_request_api_helpers.h" 37 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
38 #include "extensions/browser/bad_message.h"
36 #include "extensions/browser/extension_host.h" 39 #include "extensions/browser/extension_host.h"
37 #include "extensions/browser/extension_message_filter.h" 40 #include "extensions/browser/extension_message_filter.h"
38 #include "extensions/browser/extension_registry.h" 41 #include "extensions/browser/extension_registry.h"
39 #include "extensions/browser/extension_service_worker_message_filter.h" 42 #include "extensions/browser/extension_service_worker_message_filter.h"
40 #include "extensions/browser/extension_system.h" 43 #include "extensions/browser/extension_system.h"
41 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h" 44 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h"
42 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 45 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
43 #include "extensions/browser/info_map.h" 46 #include "extensions/browser/info_map.h"
44 #include "extensions/browser/io_thread_extension_message_filter.h" 47 #include "extensions/browser/io_thread_extension_message_filter.h"
45 #include "extensions/browser/view_type_utils.h" 48 #include "extensions/browser/view_type_utils.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 return PRIV_ISOLATED; 123 return PRIV_ISOLATED;
121 if (extension && extension->is_hosted_app()) 124 if (extension && extension->is_hosted_app())
122 return PRIV_HOSTED; 125 return PRIV_HOSTED;
123 } 126 }
124 127
125 return PRIV_EXTENSION; 128 return PRIV_EXTENSION;
126 } 129 }
127 130
128 } // namespace 131 } // namespace
129 132
133 // Registers a HTTP origin header interceptor on the ResourceDispatcherHost
134 // for the chrome extension scheme. On getting invoked it invokes the
135 // |callback in the OnHttpHeaderReceived function with success or failure
136 // based on whether the extension origin is valid. For more information on
137 // how we determine whether the origins are valid, please see the
138 // ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin() function.
139 class ChromeExtensionOriginInterceptor
140 : public content::ResourceDispatcherHostInterceptor {
141 public:
142 ChromeExtensionOriginInterceptor() {
143 content::ResourceDispatcherHost::Get()->RegisterInterceptor(
144 "Origin", kExtensionScheme, this);
145 }
146
147 ~ChromeExtensionOriginInterceptor() override {
148 content::ResourceDispatcherHost::Get()->UnregisterInterceptor(
149 "Origin", this);
150 }
151
152 void OnHttpHeaderReceived(const std::string& header,
153 const std::string& value,
154 int child_id,
155 content::ResourceContext* resource_context,
156 OnHeaderProcessedCallback callback) override {
157 DCHECK_CURRENTLY_ON(BrowserThread::IO);
158
159 GURL origin(value);
160 DCHECK(origin.SchemeIs(extensions::kExtensionScheme));
161
162 if (ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin(
163 resource_context, child_id, origin)) {
164 callback.Run(false, bad_message::INVALID_ORIGIN);
165 } else {
166 callback.Run(true, 0);
167 }
168 }
169 };
170
130 ChromeContentBrowserClientExtensionsPart:: 171 ChromeContentBrowserClientExtensionsPart::
131 ChromeContentBrowserClientExtensionsPart() { 172 ChromeContentBrowserClientExtensionsPart() {
132 } 173 }
133 174
134 ChromeContentBrowserClientExtensionsPart:: 175 ChromeContentBrowserClientExtensionsPart::
135 ~ChromeContentBrowserClientExtensionsPart() { 176 ~ChromeContentBrowserClientExtensionsPart() {
136 } 177 }
137 178
138 // static 179 // static
139 GURL ChromeContentBrowserClientExtensionsPart::GetEffectiveURL( 180 GURL ChromeContentBrowserClientExtensionsPart::GetEffectiveURL(
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 ->Contains(new_extension->id(), process_host->GetID())) { 310 ->Contains(new_extension->id(), process_host->GetID())) {
270 return false; 311 return false;
271 } 312 }
272 return true; 313 return true;
273 } 314 }
274 315
275 bool ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin( 316 bool ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin(
276 content::ResourceContext* resource_context, 317 content::ResourceContext* resource_context,
277 int child_process_id, 318 int child_process_id,
278 const GURL& origin) { 319 const GURL& origin) {
279 DCHECK_CURRENTLY_ON(BrowserThread::IO); 320 DCHECK_CURRENTLY_ON(BrowserThread::IO);
jam 2016/08/09 01:36:24 no need to have this method anymore in this class,
ananta 2016/08/09 05:47:47 Done.
280 321
281 // Consider non-extension URLs safe; they will be checked elsewhere. 322 // Consider non-extension URLs safe; they will be checked elsewhere.
282 if (!origin.SchemeIs(kExtensionScheme)) 323 if (!origin.SchemeIs(kExtensionScheme))
283 return false; 324 return false;
284 325
285 // If there is no extension installed for the URL, it couldn't have committed. 326 // If there is no extension installed for the URL, it couldn't have committed.
286 // (If the extension was recently uninstalled, the tab would have closed.) 327 // (If the extension was recently uninstalled, the tab would have closed.)
287 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 328 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
288 InfoMap* extension_info_map = io_data->GetExtensionInfoMap(); 329 InfoMap* extension_info_map = io_data->GetExtensionInfoMap();
289 const Extension* extension = 330 const Extension* extension =
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 #if defined(ENABLE_WEBRTC) 696 #if defined(ENABLE_WEBRTC)
656 command_line->AppendSwitch(::switches::kEnableWebRtcHWH264Encoding); 697 command_line->AppendSwitch(::switches::kEnableWebRtcHWH264Encoding);
657 #endif 698 #endif
658 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 699 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
659 switches::kEnableMojoSerialService)) { 700 switches::kEnableMojoSerialService)) {
660 command_line->AppendSwitch(switches::kEnableMojoSerialService); 701 command_line->AppendSwitch(switches::kEnableMojoSerialService);
661 } 702 }
662 } 703 }
663 } 704 }
664 705
706 void ChromeContentBrowserClientExtensionsPart::
707 ResourceDispatcherHostCreated() {
708 extension_origin_interceptor_.reset(new ChromeExtensionOriginInterceptor);
709 }
710
665 } // namespace extensions 711 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698