Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/external_ipc_fuzzer.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/renderer/automation/automation_renderer_helper.h"
@@ skipping 304 matching lines @@
 
   if (status.value == ChromeViewHostMsg_GetPluginInfo_Status::kDisabled) {
     return CreatePluginPlaceholder(
         render_view, frame, plugin, original_params, group.get(),
         IDR_DISABLED_PLUGIN_HTML, IDS_PLUGIN_DISABLED, false, false);
   }
 
   ContentSettingsType content_type = CONTENT_SETTINGS_TYPE_PLUGINS;
   ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
   std::string resource = group->identifier();
+  ContentSettingsPattern primary_pattern;
+  ContentSettingsPattern secondary_pattern;
   render_view->Send(new ChromeViewHostMsg_GetPluginContentSetting(
-      frame->top()->document().url(), resource, &plugin_setting));
+      frame->top()->document().url(), resource,
+      &plugin_setting, &primary_pattern, &secondary_pattern));
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
   WebPluginParams params(original_params);
   for (size_t i = 0; i < plugin.mime_types.size(); ++i) {
     if (plugin.mime_types[i].mime_type == actual_mime_type) {
       AppendParams(plugin.mime_types[i].additional_param_names,
                    plugin.mime_types[i].additional_param_values,
                    &params.attributeNames,
                    &params.attributeValues);
       break;
@@ skipping 21 matching lines @@
       return CreatePluginPlaceholder(
           render_view, frame, plugin, params, group.get(),
           IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_OUTDATED, false,
           outdated_policy == CONTENT_SETTING_ASK);
     } else {
       DCHECK(outdated_policy == CONTENT_SETTING_ALLOW);
     }
   }
 
   ContentSettingsObserver* observer = ContentSettingsObserver::Get(render_view);
-  ContentSetting host_setting =
-      observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
+  ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
 
   if (group->RequiresAuthorization(plugin) &&
       authorize_policy == CONTENT_SETTING_ASK &&
-      (plugin_setting == CONTENT_SETTING_ALLOW ||
-       plugin_setting == CONTENT_SETTING_ASK) &&
-      host_setting == CONTENT_SETTING_DEFAULT) {
+      plugin_setting != CONTENT_SETTING_BLOCK &&
+      primary_pattern == wildcard &&
+      secondary_pattern == wildcard &&
+      !observer->plugins_temporarily_allowed()) {
     render_view->Send(new ChromeViewHostMsg_BlockedOutdatedPlugin(
         render_view->GetRoutingId(), group->GetGroupName(), GURL()));
     return CreatePluginPlaceholder(
         render_view, frame, plugin, params, group.get(),
         IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_NOT_AUTHORIZED, false, true);
   }
 
   // Treat Native Client invocations like Javascript.
   bool is_nacl_plugin = plugin.name ==
                         ASCIIToUTF16(ChromeContentClient::kNaClPluginName);
   if (is_nacl_plugin) {
     content_type = CONTENT_SETTINGS_TYPE_JAVASCRIPT;
     plugin_setting =
         observer->GetContentSetting(content_type);
   }
 
   if (plugin_setting == CONTENT_SETTING_ALLOW ||
-      host_setting == CONTENT_SETTING_ALLOW ||
+      observer->plugins_temporarily_allowed() ||
       plugin.path.value() == webkit::npapi::kDefaultPluginLibraryName) {
     // Delay loading plugins if prerendering.
     if (prerender::PrerenderHelper::IsPrerendering(render_view)) {
       return CreatePluginPlaceholder(
           render_view, frame, plugin, params, group.get(),
           IDR_CLICK_TO_PLAY_PLUGIN_HTML, IDS_PLUGIN_LOAD, true, true);
     }
 
     if (is_nacl_plugin &&
         !IsNaClAllowed(plugin,
@@ skipping 434 matching lines @@
        it != extensions.end(); ++it) {
     if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) &&
         it->second->name().find("Adblock") != std::string::npos &&
         it->second->name().find("Plus") != std::string::npos)
       return true;
   }
   return false;
 }
 
 }  // namespace chrome