Add cross-origin loading of NEXEs for MIME type handlers

src/trusted/plugin/ppapi/plugin_ppapi.cc

 /*
  * Copyright (c) 2011 The Native Client 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/ppapi/plugin_ppapi.h"
 
 #include <stdio.h>
 
@@ skipping 18 matching lines @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 
 namespace plugin {
 
 namespace {
 
 const char* const kSrcAttribute = "src";  // The "src" attr of the <embed> tag.
+const char* const kTypeAttribute = "type";
 // The "nacl" attribute of the <embed> tag.  The value is expected to be either
 // a URL or URI pointing to the manifest file (which is expeceted to contain
 // JSON matching ISAs with .nexe URLs).
 const char* const kNaclManifestAttribute = "nacl";
 // This is a pretty arbitrary limit on the byte size of the NaCl manfest file.
 // Note that the resulting string object has to have at least one byte extra
 // for the null termination character.
 const ssize_t kNaclManifestMaxFileBytesPlusNull = 1024;
 const ssize_t kNaclManifestMaxFileBytesNoNull =
     kNaclManifestMaxFileBytesPlusNull - 1;
@@ skipping 11 matching lines @@
   PluginPpapi* plugin =
       static_cast<PluginPpapi*>(reinterpret_cast<Plugin*>(obj));
   const char* url = ins[0]->arrays.str;
   // TODO(sehr,polina): Ensure that origin checks are performed here.
   return plugin->UrlAsNaClDesc(
       url, *reinterpret_cast<pp::Var*>(ins[1]->arrays.oval));
 }
 
 }  // namespace
 
+const char* const kNaClMIMEType = "application/x-nacl";

[polina, 2011/04/15 06:24:57]

please put this at the top with other constants

[abarth-chromium, 2011/04/15 06:36:40]

The constants above have internal linkage, preventing me from linking to the
symbol from file_downloader.cc.

[polina, 2011/04/15 22:52:10]

Might be better to make it a static member of the plugin, perhaps?

+
 bool PluginPpapi::SetAsyncCallback(void* obj, SrpcParams* params) {
   PluginPpapi* plugin =
       static_cast<PluginPpapi*>(reinterpret_cast<Plugin*>(obj));
   if (plugin->service_runtime_ == NULL) {
     params->set_exception_string("No subprocess running");
     return false;
   }
   if (plugin->receive_thread_running_) {
     params->set_exception_string("A callback has already been registered");
     return false;
@@ skipping 56 matching lines @@
                  static_cast<void*>(scriptable_handle())));
   bool status = Plugin::Init(
       browser_interface,
       PPInstanceToInstanceIdentifier(static_cast<pp::Instance*>(this)),
       static_cast<int>(argc),
       // TODO(polina): Can we change the args on our end to be const to
       // avoid these ugly casts? This will also require changes to npapi code.
       const_cast<char**>(argn),
       const_cast<char**>(argv));
   if (status) {
+    const char* type_attr = LookupArgument(kTypeAttribute);
+    if (type_attr != NULL) {
+      mime_type_ = std::string(type_attr);
+      std::transform(mime_type_.begin(), mime_type_.end(), mime_type_.begin(),
+                     tolower);
+    }
     // Note: The order of attribute lookup is important.  This pattern looks
     // for a "nacl" attribute first, then a "src" attribute, and finally a
     // "nexes" attribute.
     const char* nacl_attr = LookupArgument(kNaclManifestAttribute);
     PLUGIN_PRINTF(("PluginPpapi::Init (nacl_attr=%s)\n", nacl_attr));
     if (nacl_attr != NULL) {
       // Issue a GET for the "nacl" attribute.  The value of the attribute
       // can be a data: URI, or a URL that must be fetched.  In either case,
       // the GET is started here, and once a valid .nexe file has been
       // determined, SetSrcPropertyImpl() is called to shut down the current
@@ skipping 421 matching lines @@
 
 
 bool PluginPpapi::Failure(const nacl::string& error) {
   PLUGIN_PRINTF(("PluginPpapi::Failure (error='%s')\n", error.c_str()));
   browser_interface()->AddToConsole(instance_id(), error);
   ShutdownProxy();
   return false;
 }
 
 }  // namespace plugin