Allow NaCl for non web store apps if their top level URL is whitelisted.

chrome/renderer/chrome_content_renderer_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/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 387 matching lines @@
         if (is_nacl_plugin) {
           is_nacl_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kEnableNaCl);
         } else {
           // If this is an external plugin that handles NaCl mime type,
           // we want to allow Native Client, because it's how
           // NaCl tests for the plugin work.
           is_nacl_enabled = true;
         }
         if (is_nacl_plugin || is_nacl_mime_type) {
-          if (!IsNaClAllowed(plugin,
+          if (!IsNaClAllowed(frame,
+                             plugin,
                              url,
                              actual_mime_type,
                              is_nacl_mime_type,
                              is_nacl_enabled,
                              params)) {
             frame->addMessageToConsole(
                 WebConsoleMessage(
                     WebConsoleMessage::LevelError,
                     "Only unpacked extensions and apps installed from the "
                     "Chrome Web Store can load NaCl modules without enabling "
@@ skipping 58 matching lines @@
         RenderThread::Get()->RecordUserMetrics("Plugin_Blocked");
         observer->DidBlockContentType(content_type, group->identifier());
         break;
       }
     }
   }
   placeholder->SetStatus(status);
   return placeholder->plugin();
 }
 
 bool ChromeContentRendererClient::IsNaClAllowed(

[Mihai Parparita -not on Chrome, 2012/02/10 23:03:33]

This is complex enough that a unit tests would be good to have (you might need
to change some of the parameters to make this more testable, e.g. pass in the
top frame URL directly).

+    WebFrame* frame,
     const webkit::WebPluginInfo& plugin,
     const GURL& url,
     const std::string& actual_mime_type,
     bool is_nacl_mime_type,
     bool enable_nacl,
     WebKit::WebPluginParams& params) {
   GURL manifest_url;
   if (is_nacl_mime_type) {
     manifest_url = url;  // Normal embedded NaCl plugin.
   } else {
@@ skipping 10 matching lines @@
           if (content_type.additional_param_names[i] == nacl_attr) {
             manifest_url = GURL(content_type.additional_param_values[i]);
             break;
           }
         }
         break;
       }
     }
   }
 
-  // Determine if the manifest URL is part of an extension.
+  // Determine if the manifest is part of an extension.
   const Extension* extension =
       extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
           ExtensionURLInfo(manifest_url));
-  // Only component, unpacked, and Chrome Web Store extensions are allowed.
+  // Only allow component, unpacked, and Chrome Web Store extensions.
   bool allowed_extension = extension &&
       (extension->from_webstore() ||
       extension->location() == Extension::COMPONENT ||
       extension->location() == Extension::LOAD);
 
-  // Block any other use of NaCl plugin, unless --enable-nacl is set.
-  if (!allowed_extension && !enable_nacl)
+  // Check if this NaCl app's top level URL is whitelisted.
+  bool whitelisted_url = false;
+  GURL top_url = frame->top()->document().url();
+  if (top_url.SchemeIs("http") || top_url.SchemeIs("https")) {

[Mihai Parparita -not on Chrome, 2012/02/10 23:03:33]

Nit: why not merge this into the whilelisted_url boolean expression (i.e.
whitelisted_url = (top_url.SchemeIs("http") || top_url.SchemeIs("https")) && ...

+    whitelisted_url = ((top_url.host() == "plus.google.com" ||
+                        top_url.host() == "plus.sandbox.google.com") &&
+                        top_url.path().find("/games") == 0);
+  }
+
+  if (!allowed_extension && !whitelisted_url && !enable_nacl)
     return false;
 
-  // Allow dev interfaces for non-extension apps.
+  // Block dev interfaces for production apps. These are packaged apps from
+  // the Chrome Web Store and apps inside whitelisted URLs.
   bool allow_dev_interfaces = true;
   if (allowed_extension) {
-    // Allow dev interfaces for component and unpacked extensions.
     if (extension->location() != Extension::COMPONENT &&
         extension->location() != Extension::LOAD) {
-      // Whitelist all other allowed extensions.
+      // Don't block whitelisted apps.
       allow_dev_interfaces =
           // PDF Viewer plugin
-          (manifest_url.scheme() == "chrome-extension" &&
+          (manifest_url.SchemeIs("chrome-extension") &&
           manifest_url.host() == "acadkphlmlegjaadjagenfimbpphcgnh");
     }
+  } else if (whitelisted_url) {
+    allow_dev_interfaces = false;
   }
 
   WebString dev_attribute = WebString::fromUTF8("@dev");
   if (allow_dev_interfaces) {
     std::vector<string16> param_names;
     std::vector<string16> param_values;
     param_names.push_back(dev_attribute);
     param_values.push_back(WebString());
     AppendParams(
         param_names,
@@ skipping 306 matching lines @@
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) {
   return allowed_socket_origins_.find(url.host()) !=
       allowed_socket_origins_.end();
 }
 
 }  // namespace chrome