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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 933093002: Ensure streams aren't intercepted unless their associated plugin is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 8bf559c1a6eece3df09a3c6062f8c809270b2f32..715ddcc62053273747a7998fc15493a582518051 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/download/download_resource_throttle.h"
#include "chrome/browser/net/resource_prefetch_predictor_observer.h"
+#include "chrome/browser/plugins/plugin_prefs.h"
#include "chrome/browser/prefetch/prefetch.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_manager_factory.h"
@@ -37,6 +38,8 @@
#include "components/variations/net/variations_http_header_provider.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
+#include "content/public/browser/plugin_service.h"
+#include "content/public/browser/plugin_service_filter.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_context.h"
@@ -207,6 +210,36 @@ void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamInfo> stream,
extension_id, web_contents, stream.Pass(), view_id, expected_content_size,
embedded, render_process_id, render_frame_id);
}
+
+// TODO(raymes): This won't return the right result if plugins haven't been
+// loaded yet. Fixing this properly really requires fixing crbug.com/443466.
+bool IsPluginEnabledForExtension(const Extension* extension,
+ const ResourceRequestInfo* info,
+ const std::string& mime_type,
+ const GURL& url) {
+ content::PluginService* service = content::PluginService::GetInstance();
+ std::vector<content::WebPluginInfo> plugins;
+ service->GetPluginInfoArray(url, mime_type, true, &plugins, nullptr);
+ content::PluginServiceFilter* filter = service->GetFilter();
+
+ for (auto& plugin : plugins) {
+ // Check that the plugin is running the extension.
+ if (plugin.path !=
+ base::FilePath::FromUTF8Unsafe(extension->url().spec())) {
+ continue;
+ }
+ // Check that the plugin is actually enabled.
+ if (!filter || filter->IsPluginAvailable(info->GetChildID(),
+ info->GetRenderFrameID(),
+ info->GetContext(),
+ url,
+ GURL(),
+ &plugin)) {
+ return true;
+ }
+ }
+ return false;
+}
#endif // !defined(ENABLE_EXTENSIONS)
#if !defined(OS_ANDROID)
@@ -627,6 +660,13 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
*origin = Extension::GetBaseURLFromExtensionId(extension_id);
target_info.extension_id = extension_id;
if (!handler->handler_url().empty()) {
+ // This is reached in the case of MimeHandlerViews. If the
+ // MimeHandlerView plugin is disabled, then we shouldn't intercept the
+ // stream.
+ if (!IsPluginEnabledForExtension(extension, info, mime_type,
+ request->url())) {
+ continue;
+ }
target_info.view_id = base::GenerateGUID();
*payload = target_info.view_id;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698