Flag and whitelist to allow crxfs api in NaCl

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
-#include "base/sha1.h"
 #include "base/string_number_conversions.h"
-#include "base/strings/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
+#include "chrome/browser/pepper_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugins/plugin_info_message_filter.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_message_filter.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/printing_message_filter.h"
 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 392 matching lines @@
   effective_url = effective_url.ReplaceComponents(replacements);
   return effective_url;
 }
 #endif
 
 void SetApplicationLocaleOnIOThread(const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   g_io_thread_application_locale.Get() = locale;
 }
 
-std::string HashHost(const std::string& host) {
-  const std::string id_hash = base::SHA1HashString(host);
-  DCHECK(id_hash.length() == base::kSHA1Length);
-  return base::HexEncode(id_hash.c_str(), id_hash.length());
-}
-
-bool HostIsInSet(const std::string& host, const std::set<std::string>& set) {
-  return set.count(host) > 0 || set.count(HashHost(host)) > 0;
-}
-
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient() {
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
 }
 
 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ skipping 1640 matching lines @@
     return false;
 
   return extension->HasAPIPermission(APIPermission::kWebView) ||
          extension->HasAPIPermission(APIPermission::kAdView);
 }
 
 bool ChromeContentBrowserClient::AllowPepperSocketAPI(
     content::BrowserContext* browser_context,
     const GURL& url,
     const content::SocketPermissionRequest& params) {
-  if (!url.is_valid())
-    return false;
 
-  std::string host = url.host();
-  if (url.SchemeIs(extensions::kExtensionScheme) &&
-      HostIsInSet(host, allowed_socket_origins_)) {
-    return true;
-  }
-
-  Profile* profile = Profile::FromBrowserContext(browser_context);
-  const Extension* extension = NULL;
-  ExtensionService* extension_service = !profile ? NULL :
-      extensions::ExtensionSystem::Get(profile)->extension_service();
-  if (extension_service) {
-    extension = extension_service->extensions()->
-        GetExtensionOrAppByURL(ExtensionURLInfo(url));
-  }
-
-  // Check the modules that are imported by this extension to see if any of them
-  // is whitelisted.
-  if (extension) {
-    const std::vector<extensions::SharedModuleInfo::ImportInfo>& imports =
-        extensions::SharedModuleInfo::GetImports(extension);
-    std::vector<extensions::SharedModuleInfo::ImportInfo>::const_iterator it;
-    for (it = imports.begin(); it != imports.end(); ++it) {
-      const Extension* imported_extension = extension_service->
-          GetExtensionById(it->extension_id, false);
-      if (imported_extension &&
-          extensions::SharedModuleInfo::IsSharedModule(imported_extension) &&
-          HostIsInSet(it->extension_id, allowed_socket_origins_)) {
-        return true;
-      }
-    }
-  }
-
-  // Need to check this now and not on construction because otherwise it won't
-  // work with browser_tests.
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  std::string allowed_list =
-      command_line.GetSwitchValueASCII(switches::kAllowNaClSocketAPI);
-  if (allowed_list == "*") {
-    // The wildcard allows socket API only for packaged and platform apps.
-    return extension &&
-        (extension->GetType() == Manifest::TYPE_LEGACY_PACKAGED_APP ||
-         extension->GetType() == Manifest::TYPE_PLATFORM_APP);
-  } else if (!allowed_list.empty()) {
-    base::StringTokenizer t(allowed_list, ",");
-    while (t.GetNext()) {
-      if (t.token() == host)
-        return true;
-    }
-  }
-
-  return false;
+  return IsExtensionOrSharedModuleWhitelisted(
+      Profile::FromBrowserContext(browser_context),
+      url,
+      allowed_socket_origins_,
+      switches::kAllowNaClSocketAPI);
 }
 
 base::FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() {
   base::FilePath directory;
   PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory);
   return directory.Append(FILE_PATH_LITERAL("Hyphen"));
 }
 
 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
     WebContents* web_contents) {
@@ skipping 117 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome