Make ActiveScriptController use Active Tab-style permissions

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

 // Copyright 2013 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/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permission_message_util.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "grit/generated_resources.h"
-#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 typedef std::set<PermissionMessage> PermissionMsgSet;
 
-bool ShouldWarnAllHosts(const PermissionSet* permissions) {
-  if (permissions->HasEffectiveAccessToAllHosts())
-    return true;
-
-  const URLPatternSet& effective_hosts = permissions->effective_hosts();
-  for (URLPatternSet::const_iterator iter = effective_hosts.begin();
-       iter != effective_hosts.end();
-       ++iter) {
-    // If this doesn't even match subdomains, it can't possibly imply all hosts.
-    if (!iter->match_subdomains())
-      continue;
-
-    // If iter->host() is a recognized TLD, this will be 0. We don't include
-    // private TLDs, so that, e.g., *.appspot.com does not imply all hosts.
-    size_t registry_length =
-        net::registry_controlled_domains::GetRegistryLength(
-            iter->host(),
-            net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-            net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-    // If there was more than just a TLD in the host (e.g., *.foobar.com), it
-    // doesn't imply all hosts.
-    if (registry_length > 0)
-      continue;
-
-    // At this point the host could either be just a TLD ("com") or some unknown
-    // TLD-like string ("notatld"). To disambiguate between them construct a
-    // fake URL, and check the registry. This returns 0 if the TLD is
-    // unrecognized, or the length of the recognized TLD.
-    registry_length = net::registry_controlled_domains::GetRegistryLength(
-        base::StringPrintf("foo.%s", iter->host().c_str()),
-        net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-    // If we recognized this TLD, then this is a pattern like *.com, and it
-    // should imply all hosts.
-    if (registry_length > 0)
-      return true;
-  }
-
-  return false;
-}
-
 template<typename T>
 typename T::iterator FindMessageByID(T& messages, int id) {
   for (typename T::iterator it = messages.begin();
        it != messages.end(); ++it) {
     if (it->id() == id)
       return it;
   }
   return messages.end();
 }
 
@@ skipping 183 matching lines @@
   // kFileSystemDirectory as the write directory message implies it.
   // TODO(sammc): Remove this. See http://crbug.com/284849.
   SuppressMessage(messages,
                   PermissionMessage::kFileSystemWriteDirectory,
                   PermissionMessage::kFileSystemDirectory);
   // A special hack: The warning message for declarativeWebRequest
   // permissions speaks about blocking parts of pages, which is a
   // subset of what the "<all_urls>" access allows. Therefore we
   // display only the "<all_urls>" warning message if both permissions
   // are required.
-  if (ShouldWarnAllHosts(permissions)) {
+  if (permissions->ShouldWarnAllHosts()) {
     messages.erase(
         PermissionMessage(
             PermissionMessage::kDeclarativeWebRequest, base::string16()));
   }
   return messages;
 }
 
 std::set<PermissionMessage>
 ChromePermissionMessageProvider::GetManifestPermissionMessages(
     const PermissionSet* permissions) const {
@@ skipping 15 matching lines @@
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
   PermissionMsgSet messages;
   // Since platform apps always use isolated storage, they can't (silently)
   // access user data on other domains, so there's no need to prompt.
   // Note: this must remain consistent with IsHostPrivilegeIncrease.
   // See crbug.com/255229.
   if (extension_type == Manifest::TYPE_PLATFORM_APP)
     return messages;
 
-  if (ShouldWarnAllHosts(permissions)) {
+  if (permissions->ShouldWarnAllHosts()) {
     messages.insert(PermissionMessage(
         PermissionMessage::kHostsAll,
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS)));
   } else {
     URLPatternSet regular_hosts;
     ExtensionsClient::Get()->FilterHostPermissions(
         permissions->effective_hosts(), &regular_hosts, &messages);
 
     std::set<std::string> hosts =
         permission_message_util::GetDistinctHosts(regular_hosts, true, true);
@@ skipping 74 matching lines @@
   std::set<std::string> old_hosts_set(
       permission_message_util::GetDistinctHosts(old_list, false, false));
   std::set<std::string> new_hosts_only =
       base::STLSetDifference<std::set<std::string> >(new_hosts_set,
                                                      old_hosts_set);
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions