Convert app_bindings.js to the schema_generated_bindings.js infrastructure.

chrome/renderer/extensions/extension_dispatcher.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/extensions/extension_dispatcher.h"
 
 #include "base/command_line.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/extension_api.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
-#include "chrome/renderer/extensions/app_bindings.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/custom_bindings_util.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_groups.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 #include "chrome/renderer/extensions/schema_generated_bindings.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "chrome/renderer/extensions/webstore_bindings.h"
 #include "content/public/renderer/render_thread.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 
 namespace {
 
 static const int64 kInitialExtensionIdleHandlerDelayMs = 5*1000;
 static const int64 kMaxExtensionIdleHandlerDelayMs = 5*60*1000;
 
-ChromeV8Context::ContextType ExtensionGroupToContextType(int extension_group) {
-  if (extension_group == EXTENSION_GROUP_CONTENT_SCRIPTS)
-    return ChromeV8Context::CONTENT_SCRIPT;
-  return ChromeV8Context::OTHER;
-}
-
 }
 
 using namespace extensions;
 
 using WebKit::WebDataSource;
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebVector;
@@ skipping 45 matching lines @@
 
 void ExtensionDispatcher::WebKitInitialized() {
   // For extensions, we want to ensure we call the IdleHandler every so often,
   // even if the extension keeps up activity.
   if (is_extension_process_) {
     forced_idle_timer_.Start(FROM_HERE,
         base::TimeDelta::FromMilliseconds(kMaxExtensionIdleHandlerDelayMs),
         RenderThread::Get(), &RenderThread::IdleHandler);
   }
 
-  RegisterExtension(new AppBindings(this), false);
+  // Unrestricted extension-related v8-extensions.
+  RegisterExtension(EventBindings::Get(this), false);
+  RegisterExtension(SchemaGeneratedBindings::Get(this), false);
+  RegisterExtension(new ChromeV8Extension(
+      "extensions/json_schema.js", IDR_JSON_SCHEMA_JS, NULL), false);
+  // TODO(kalman): move this to the custom_bindings infrastructure.
   RegisterExtension(new WebstoreBindings(this), false);
 
-  // Add v8 extensions related to chrome extensions.
-  RegisterExtension(new ChromeV8Extension(
-      "extensions/json_schema.js", IDR_JSON_SCHEMA_JS, NULL), true);
-  RegisterExtension(EventBindings::Get(this), true);
+  // Permissions-checked extension-related v8-extensions.
   RegisterExtension(MiscellaneousBindings::Get(this), true);
-  RegisterExtension(SchemaGeneratedBindings::Get(this), true);
   RegisterExtension(new ChromeV8Extension(
       "extensions/apitest.js", IDR_EXTENSION_APITEST_JS, NULL), true);
 
   std::vector<v8::Extension*> custom_bindings =
       custom_bindings_util::GetAll(this);
   for (std::vector<v8::Extension*>::iterator it = custom_bindings.begin();
       it != custom_bindings.end(); ++it) {
     RegisterExtension(*it, true);
   }
 
@@ skipping 172 matching lines @@
     return true;
 
   // If we don't know about it, it was added by WebCore, so we should allow it.
   if (!RenderThread::Get()->IsRegisteredExtension(v8_extension_name))
     return true;
 
   // If the V8 extension is not restricted, allow it to run anywhere.
   if (!restricted_v8_extensions_.count(v8_extension_name))
     return true;
 
-  // Extension-only bindings should be restricted to content scripts and
-  // extension-blessed URLs.
   ChromeV8Context::ContextType context_type =
-      ExtensionGroupToContextType(extension_group);
+      GetContextType(extension_group, frame);
 
-  if (context_type == ChromeV8Context::CONTENT_SCRIPT ||
-      extensions_.ExtensionBindingsAllowed(ExtensionURLInfo(
-          frame->document().securityOrigin(),
-          UserScriptSlave::GetDataSourceURLForFrame(frame)))) {
-    // If the extension is a custom API binding, only allow if the extension
-    // has permission to use the API.
-    std::string custom_binding_api_name =
-        custom_bindings_util::GetAPIName(v8_extension_name);
-    if (!custom_binding_api_name.empty()) {
+  std::string custom_binding_api_name =
+      custom_bindings_util::GetAPIName(v8_extension_name);
+  if (!custom_binding_api_name.empty()) {
+    // Extension is a custom API binding, so do API-based permissions checking.
+    if (context_type == ChromeV8Context::UNPRIVILEGED) {
+      GURL frame_url = UserScriptSlave::GetDataSourceURLForFrame(frame);
+      return ExtensionAPI::GetInstance()->MatchesURL(
+          custom_binding_api_name, frame_url);
+    } else {
       std::string extension_id = GetExtensionID(frame, world_id);
       const Extension* extension = extensions_.GetByID(extension_id);
       if (!extension) {
         // This can happen when a resource is blocked due to CSP; a valid
         // chrome-extension:// URL is navigated to, so it passes the initial
         // checks, but the URL gets changed to "chrome-extension://invalid"
         // afterwards (see chrome_content_renderer_client.cc). An extension
         // page still gets loaded, just for the extension with ID "invalid",
         // which of course isn't found so GetById extension will be NULL.
         //
         // Reference: http://crbug.com/111614.
         CHECK_EQ("invalid", extension_id);
         return false;
       }
       return custom_bindings_util::AllowAPIInjection(
           custom_binding_api_name, *extension, this);
     }
-
-    return true;
   }
 
-  return false;
+  // Extension-only bindings should be restricted to content scripts and
+  // extension-blessed URLs.
+  return context_type != ChromeV8Context::UNPRIVILEGED;

[koz (OOO until 15th September), 2012/02/27 03:04:11]

Invert this conditional and remove this comment?

[not at google - send to devlin, 2012/02/27 04:44:24]

Right. Good point.

 }
 
 void ExtensionDispatcher::DidCreateScriptContext(
     WebFrame* frame, v8::Handle<v8::Context> v8_context, int world_id) {
   ChromeV8Context* context =
       new ChromeV8Context(
           v8_context,
           frame,
           GetExtensionID(frame, world_id),
-          ExtensionGroupToContextType(
-              hack_DidCreateScriptContext_extension_group));
+          GetContextType(hack_DidCreateScriptContext_extension_group, frame));
   v8_context_set_.Add(context);
 
   const Extension* extension = extensions_.GetByID(context->extension_id());
   int manifest_version = 1;
   if (extension)
     manifest_version = extension->manifest_version();
 
   context->DispatchOnLoadEvent(
       is_extension_process_,
       ChromeRenderProcessObserver::is_incognito_process(),
@@ skipping 161 matching lines @@
 
   RenderThread::Get()->RegisterExtension(extension);
 }
 
 void ExtensionDispatcher::OnUsingWebRequestAPI(
     bool adblock, bool adblock_plus, bool other) {
   webrequest_adblock_ = adblock;
   webrequest_adblock_plus_ = adblock_plus;
   webrequest_other_ = other;
 }
+
+ChromeV8Context::ContextType ExtensionDispatcher::GetContextType(
+    int extension_group, WebFrame* frame) {
+  if (extension_group == EXTENSION_GROUP_CONTENT_SCRIPTS)
+    return ChromeV8Context::CONTENT_SCRIPT;
+
+  if (extensions_.ExtensionBindingsAllowed(ExtensionURLInfo(
+          frame->document().securityOrigin(),
+          UserScriptSlave::GetDataSourceURLForFrame(frame)))) {
+    return ChromeV8Context::BLESSED;

[koz (OOO until 15th September), 2012/02/27 03:04:11]

Nice.

[not at google - send to devlin, 2012/02/27 04:44:24]

Cheers.

+  }
+
+  return ChromeV8Context::UNPRIVILEGED;
+}