Use CORS for fetching NaCl resources from extensions.

ppapi/native_client/src/trusted/plugin/file_downloader.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "native_client/src/trusted/plugin/file_downloader.h"
 
 #include <stdio.h>
 #include <string>
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
@@ skipping 24 matching lines @@
   file_io_trusted_interface_ = static_cast<const PPB_FileIOTrusted*>(
       pp::Module::Get()->GetBrowserInterface(PPB_FILEIOTRUSTED_INTERFACE));
   url_loader_trusted_interface_ = static_cast<const PPB_URLLoaderTrusted*>(
       pp::Module::Get()->GetBrowserInterface(PPB_URLLOADERTRUSTED_INTERFACE));
 }
 
 
 bool FileDownloader::Open(
     const nacl::string& url,
     DownloadFlags flags,
-    bool allow_extension_url,
     const pp::CompletionCallback& callback,
     PP_URLLoaderTrusted_StatusCallback progress_callback) {
-  PLUGIN_PRINTF(("FileDownloader::Open (url=%s, allow_extension_url=%d)\n",
-                 url.c_str(), allow_extension_url));
+  PLUGIN_PRINTF(("FileDownloader::Open (url=%s)\n", url.c_str()));
   if (callback.pp_completion_callback().func == NULL ||
       instance_ == NULL ||
       file_io_trusted_interface_ == NULL)
     return false;
 
   CHECK(instance_ != NULL);
   open_time_ = NaClGetTimeOfDayMicroseconds();
   url_to_open_ = url;
   url_ = url;
   file_open_notify_callback_ = callback;
   flags_ = flags;
   buffer_.clear();
   pp::URLRequestInfo url_request(instance_);
 
   do {
     // Reset the url loader and file reader.
     // Note that we have the only reference to the underlying objects, so
     // this will implicitly close any pending IO and destroy them.
     url_loader_ = pp::URLLoader(instance_);
     url_scheme_ = instance_->GetUrlScheme(url);
     bool grant_universal_access = false;
     if (url_scheme_ == SCHEME_CHROME_EXTENSION) {
-      if (allow_extension_url) {
-        // This NEXE has been granted rights to access URLs in the chrome
-        // extension scheme.
-        grant_universal_access = true;
-      }
+      // Use CORS to access URLs in the chrome extension scheme. If the files
+      // are truly restricted, then they should not be listed as a
+      // web_accessible_resource in the extension manifest.
+      url_request.SetAllowCrossOriginRequests(true);
     } else if (url_scheme_ == SCHEME_DATA) {
       // TODO(elijahtaylor) Remove this when data URIs can be read without
       // universal access.
+      // https://bugs.webkit.org/show_bug.cgi?id=17352
       if (streaming_to_buffer()) {
         grant_universal_access = true;
       } else {
         // Open is to invoke a callback on success or failure. Schedule
         // it asynchronously to follow PPAPI's convention and avoid reentrancy.
         pp::Core* core = pp::Module::Get()->core();
         core->CallOnMainThread(0, callback, PP_ERROR_NOACCESS);
         PLUGIN_PRINTF(("FileDownloader::Open (pp_error=PP_ERROR_NOACCESS)\n"));
         return true;
       }
     }
 
     if (url_loader_trusted_interface_ != NULL) {
       if (grant_universal_access) {
-        // TODO(sehr,jvoung): this should use
-        // pp::URLRequestInfo::SetAllowCrossOriginRequests() when
-        // support for web accessible resources is added to extensions.
+        // TODO(sehr,jvoung): See if we can remove this -- currently
+        // only used for data URIs.
         url_loader_trusted_interface_->GrantUniversalAccess(
             url_loader_.pp_resource());
       }
       if (progress_callback != NULL) {
         url_request.SetRecordDownloadProgress(true);
         url_loader_trusted_interface_->RegisterStatusCallback(
             url_loader_.pp_resource(), progress_callback);
       }
     }
 
@@ skipping 228 matching lines @@
 
 bool FileDownloader::streaming_to_file() const {
   return (flags_ & DOWNLOAD_TO_BUFFER) == 0;
 }
 
 bool FileDownloader::streaming_to_buffer() const {
   return (flags_ & DOWNLOAD_TO_BUFFER) == 1;
 }
 
 }  // namespace plugin