NaCl: enable meta-based validation for shared libraries.

ppapi/native_client/src/trusted/plugin/file_downloader.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 "native_client/src/trusted/plugin/file_downloader.h"
 
 #include <stdio.h>
+#include <string.h>
 #include <string>
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_time.h"
 #include "native_client/src/trusted/plugin/callback_source.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/utility.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/cpp/file_io.h"
 #include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/url_request_info.h"
 #include "ppapi/cpp/url_response_info.h"
 
 namespace {

[Mark Seaborn, 2013/05/16 23:01:47]

Add empty line after this

[Nick Bray (chromium), 2013/05/21 20:09:06]

Done.

 const int32_t kExtensionUrlRequestStatusOk = 200;
 const int32_t kDataUriRequestStatusOk = 0;
+
+struct NaClFileInfo NoFileInfo() {

[Mark Seaborn, 2013/05/16 23:01:47]

'struct NaClFileInfo' -> 'NaClFileInfo' in C++?  Same below.

[Nick Bray (chromium), 2013/05/21 20:09:06]

Staying consistent with the C code base.

+  struct NaClFileInfo info;
+  memset(&info, 0, sizeof(info));
+  info.desc = -1;
+  return info;
+}
+
 }
 
 namespace plugin {
 
 void FileDownloader::Initialize(Plugin* instance) {
   PLUGIN_PRINTF(("FileDownloader::FileDownloader (this=%p)\n",
                  static_cast<void*>(this)));
   CHECK(instance != NULL);
   CHECK(instance_ == NULL);  // Can only initialize once.
   instance_ = instance;
@@ skipping 102 matching lines @@
   // invocation of the user callback. The user code will not be reentered.
   pp::CompletionCallback onload_callback =
       callback_factory_.NewCallback(start_notify);
   int32_t pp_error = url_loader_.Open(url_request, onload_callback);
   PLUGIN_PRINTF(("FileDownloader::Open (pp_error=%"NACL_PRId32")\n", pp_error));
   CHECK(pp_error == PP_OK_COMPLETIONPENDING);
   return true;
 }
 
 void FileDownloader::OpenFast(const nacl::string& url,
-                              PP_FileHandle file_handle) {
+                              PP_FileHandle file_handle,
+                              uint64_t nonce) {
   PLUGIN_PRINTF(("FileDownloader::OpenFast (url=%s)\n", url.c_str()));
   CHECK(instance_ != NULL);
   open_time_ = NaClGetTimeOfDayMicroseconds();
   status_code_ = NACL_HTTP_STATUS_OK;
   url_to_open_ = url;
   url_ = url;
   mode_ = DOWNLOAD_NONE;
   file_handle_ = file_handle;
+  nonce_ = nonce;
 }
 
-int32_t FileDownloader::GetPOSIXFileDescriptor() {
+struct NaClFileInfo FileDownloader::GetFileInfo() {
+  struct NaClFileInfo info = NoFileInfo();
   int32_t file_desc = NACL_NO_FILE_DESC;
   if (not_streaming() && file_handle_ != PP_kInvalidFileHandle) {
 #if NACL_WINDOWS
     // On Windows, valid handles are 32 bit unsigned integers so this is safe.
     file_desc = reinterpret_cast<uintptr_t>(file_handle_);
 #else
     file_desc = file_handle_;
 #endif
+    info.nonce = nonce_;
   } else {
     if (!streaming_to_file()) {
-      return NACL_NO_FILE_DESC;
+      return NoFileInfo();
     }
     // Use the trusted interface to get the file descriptor.
     if (file_io_trusted_interface_ == NULL) {
-      return NACL_NO_FILE_DESC;
+      return NoFileInfo();
     }
     file_desc = file_io_trusted_interface_->GetOSFileDescriptor(
         file_reader_.pp_resource());
   }
 
 #if NACL_WINDOWS
   // Convert the Windows HANDLE from Pepper to a POSIX file descriptor.
   int32_t posix_desc = _open_osfhandle(file_desc, _O_RDWR | _O_BINARY);
   if (posix_desc == -1) {
     // Close the Windows HANDLE if it can't be converted.
     CloseHandle(reinterpret_cast<HANDLE>(file_desc));
-    return NACL_NO_FILE_DESC;
+    return NoFileInfo();
   }
   file_desc = posix_desc;
 #endif
 
-  return file_desc;
+  info.desc = file_desc;
+  return info;
 }
 
 int64_t FileDownloader::TimeSinceOpenMilliseconds() const {
   int64_t now = NaClGetTimeOfDayMicroseconds();
   // If Open() wasn't called or we somehow return an earlier time now, just
   // return the 0 rather than worse nonsense values.
   if (open_time_ < 0 || now < open_time_)
     return 0;
   return (now - open_time_) / NACL_MICROS_PER_MILLI;
 }
@@ skipping 196 matching lines @@
 
 bool FileDownloader::streaming_to_user() const {
   return mode_ == DOWNLOAD_STREAM;
 }
 
 bool FileDownloader::not_streaming() const {
   return mode_ == DOWNLOAD_NONE;
 }
 
 }  // namespace plugin