Fix for WebView accessible resources.

chrome/renderer/extensions/resource_request_policy.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/resource_request_policy.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
+#include "extensions/common/manifest_handlers/webview_info.h"
+#include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/renderer_extension_registry.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
+ResourceRequestPolicy::ResourceRequestPolicy(Dispatcher* dispatcher)
+    : dispatcher_(dispatcher) {}
+
 // This method does a security check whether chrome-extension:// URLs can be
 // requested by the renderer. Since this is in an untrusted process, the browser
 // has a similar check to enforce the policy, in case this process is exploited.
 // If you are changing this function, ensure equivalent checks are added to
 // extension_protocols.cc's AllowExtensionResourceLoad.
-
-// static
 bool ResourceRequestPolicy::CanRequestResource(
     const GURL& resource_url,
     blink::WebFrame* frame,
     ui::PageTransition transition_type) {
-  CHECK(resource_url.SchemeIs(extensions::kExtensionScheme));
+  CHECK(resource_url.SchemeIs(kExtensionScheme));
 
   const Extension* extension =
       RendererExtensionRegistry::Get()->GetExtensionOrAppByURL(resource_url);
   if (!extension) {
     // Allow the load in the case of a non-existent extension. We'll just get a
     // 404 from the browser process.
     return true;
   }
 
   // Disallow loading of packaged resources for hosted apps. We don't allow
   // hybrid hosted/packaged apps. The one exception is access to icons, since
   // some extensions want to be able to do things like create their own
   // launchers.
   std::string resource_root_relative_path =
       resource_url.path().empty() ? std::string()
                                   : resource_url.path().substr(1);
   if (extension->is_hosted_app() &&
       !IconsInfo::GetIcons(extension)
           .ContainsPath(resource_root_relative_path)) {
     LOG(ERROR) << "Denying load of " << resource_url.spec() << " from "
                << "hosted app.";
     return false;
   }
 
   // Disallow loading of extension resources which are not explicitly listed
-  // as web accessible if the manifest version is 2 or greater.
+  // as web or WebView accessible if the manifest version is 2 or greater.
+  const WebviewInfo* webview_info = WebviewInfo::Get(extension);
   if (!WebAccessibleResourcesInfo::IsResourceWebAccessible(
-          extension, resource_url.path())) {
+          extension, resource_url.path()) &&
+      !(webview_info &&
+        webview_info->IsResourceWebviewAccessible(

[not at google - send to devlin, 2015/09/03 20:17:54]

See point about WebviewInfo::IsResourceWebviewAccessible(...)

[paulmeyer, 2015/09/08 18:51:36]

Done.

+            extension, dispatcher_->webview_partition_id(),
+            resource_url.path()))) {
     GURL frame_url = frame->document().url();
 
     // The page_origin may be GURL("null") for unique origins like data URLs,
     // but this is ok for the checks below.  We only care if it matches the
     // current extension or has a devtools scheme.
     GURL page_origin = GURL(frame->top()->securityOrigin().toString());
 
     // Exceptions are:
     // - empty origin (needed for some edge cases when we have empty origins)
     bool is_empty_origin = frame_url.is_empty();
@@ skipping 22 matching lines @@
       frame->addMessageToConsole(
           blink::WebConsoleMessage(blink::WebConsoleMessage::LevelError,
                                     blink::WebString::fromUTF8(message)));
       return false;
     }
   }
 
   return true;
 }
 
-// static
 bool ResourceRequestPolicy::CanRequestExtensionResourceScheme(
     const GURL& resource_url,
     blink::WebFrame* frame) {
-  CHECK(resource_url.SchemeIs(extensions::kExtensionResourceScheme));
+  CHECK(resource_url.SchemeIs(kExtensionResourceScheme));
 
   GURL frame_url = frame->document().url();
-  if (!frame_url.is_empty() &&
-      !frame_url.SchemeIs(extensions::kExtensionScheme)) {
+  if (!frame_url.is_empty() && !frame_url.SchemeIs(kExtensionScheme)) {
     std::string message = base::StringPrintf(
         "Denying load of %s. chrome-extension-resources:// can only be "
         "loaded from extensions.",
       resource_url.spec().c_str());
     frame->addMessageToConsole(
         blink::WebConsoleMessage(blink::WebConsoleMessage::LevelError,
                                   blink::WebString::fromUTF8(message)));
     return false;
   }
 
   return true;
 }
 
-ResourceRequestPolicy::ResourceRequestPolicy() {
-}
-
 }  // namespace extensions