Fix for WebView accessible resources.

extensions/browser/url_request_util.cc

 // Copyright 2014 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 "extensions/browser/url_request_util.h"
 
 #include <string>
 
 #include "content/public/browser/resource_request_info.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/browser/info_map.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 "net/url_request/url_request.h"
 
 namespace extensions {
 namespace url_request_util {
 
 bool AllowCrossRendererResourceLoad(net::URLRequest* request,
                                     bool is_incognito,
                                     const Extension* extension,
                                     InfoMap* extension_info_map,
                                     bool* allowed) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
 
   // Extensions with webview: allow loading certain resources by guest renderers
   // with privileged partition IDs as specified in owner's extension the
   // manifest file.
   std::string owner_extension_id;
   int owner_process_id;
   WebViewRendererState::GetInstance()->GetOwnerInfo(
       info->GetChildID(), &owner_process_id, &owner_extension_id);
   const Extension* owner_extension =
       extension_info_map->extensions().GetByID(owner_extension_id);
-  const WebviewInfo* webview_info =
-      owner_extension
-          ? static_cast<const WebviewInfo*>(owner_extension->GetManifestData(
-                manifest_keys::kWebviewAccessibleResources))
-          : nullptr;
   std::string partition_id;
   bool is_guest = WebViewRendererState::GetInstance()->GetPartitionID(
       info->GetChildID(), &partition_id);
   std::string resource_path = request->url().path();
-  if (is_guest && webview_info &&
-      webview_info->IsResourceWebviewAccessible(extension, partition_id,
-                                                resource_path)) {
+  // |owner_extension == extension| needs to be checked because extension
+  // resources should only be accessible to WebViews owned by that extension.
+  if (is_guest && owner_extension == extension &&
+      WebviewInfo::IsResourceWebviewAccessible(extension, partition_id,
+                                               resource_path)) {
     *allowed = true;
     return true;
   }
 
   // If the request is for navigations outside of webviews, then it should be
   // allowed. The navigation logic in CrossSiteResourceHandler will properly
   // transfer the navigation to a privileged process before it commits.
   if (content::IsResourceTypeFrame(info->GetResourceType()) && !is_guest) {
     *allowed = true;
     return true;
@@ skipping 46 matching lines @@
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
   // |info| can be NULL sometimes: http://crbug.com/370070.
   if (!info)
     return false;
   return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID());
 }
 
 }  // namespace url_request_util
 }  // namespace extensions