Validate image files before writing them to media galleries.

chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc

 // Copyright (c) 2013 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/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/media_galleries/fileapi/itunes/itunes_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/media_file_validator_factory.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 #include "webkit/blob/local_file_stream_reader.h"
 #include "webkit/fileapi/async_file_util_adapter.h"
 #include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_types.h"
@@ skipping 16 matching lines @@
 namespace chrome {
 
 const char MediaFileSystemMountPointProvider::kMediaPathFilterKey[] =
     "MediaPathFilterKey";
 const char MediaFileSystemMountPointProvider::kMTPDeviceDelegateURLKey[] =
     "MTPDeviceDelegateKey";
 
 MediaFileSystemMountPointProvider::MediaFileSystemMountPointProvider(
     const base::FilePath& profile_path)
     : profile_path_(profile_path),
-      media_path_filter_(new MediaPathFilter()),
+      media_path_filter_(new MediaPathFilter),
+      media_copy_or_move_file_validator_factory_(new MediaFileValidatorFactory),
       native_media_file_util_(
           new fileapi::AsyncFileUtilAdapter(new NativeMediaFileUtil())),
       itunes_file_util_(new fileapi::AsyncFileUtilAdapter(
           new itunes::ItunesFileUtil())) {
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   // TODO(kmadhusu): Initialize |device_media_file_util_| in
   // initialization list.
   device_media_async_file_util_.reset(
       DeviceMediaAsyncFileUtil::Create(profile_path_));
 #endif
@@ skipping 63 matching lines @@
 }
 
 fileapi::CopyOrMoveFileValidatorFactory*
 MediaFileSystemMountPointProvider::GetCopyOrMoveFileValidatorFactory(
     fileapi::FileSystemType type, base::PlatformFileError* error_code) {
   DCHECK(error_code);
   *error_code = base::PLATFORM_FILE_OK;
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
     case fileapi::kFileSystemTypeDeviceMedia:
+    case fileapi::kFileSystemTypeItunes:

[Greg Billock, 2013/05/22 16:21:59]

Bad merge?

[vandebo (ex-Chrome), 2013/05/22 18:41:17]

No, we'll need this to support writing to iTunes's "import" directory.

       if (!media_copy_or_move_file_validator_factory_) {
         *error_code = base::PLATFORM_FILE_ERROR_SECURITY;
         return NULL;
       }
       return media_copy_or_move_file_validator_factory_.get();
     default:
       NOTREACHED();
   }
   return NULL;
 }
 
 void
 MediaFileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(

[Greg Billock, 2013/05/22 16:21:59]

How about just removing this and call sites?

[vandebo (ex-Chrome), 2013/05/22 18:41:17]

CopyorMoveValidator was added as a generic mechanism and this method is needed
for the test for the generic mechanism.  However, it is no longer needed for our
use.

     fileapi::FileSystemType type,
     scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
-  switch (type) {
-    case fileapi::kFileSystemTypeNativeMedia:
-    case fileapi::kFileSystemTypeDeviceMedia:
-      if (!media_copy_or_move_file_validator_factory_)
-        media_copy_or_move_file_validator_factory_.reset(factory.release());
-      break;
-    default:
-      NOTREACHED();
-  }
+  NOTREACHED();
 }
 
 fileapi::FilePermissionPolicy
 MediaFileSystemMountPointProvider::GetPermissionPolicy(
     const FileSystemURL& url, int permissions) const {
   // Access to media file systems should be checked using per-filesystem
   // access permission.
   return fileapi::FILE_PERMISSION_USE_FILESYSTEM_PERMISSION;
 }
 
@@ skipping 49 matching lines @@
 void MediaFileSystemMountPointProvider::DeleteFileSystem(
     const GURL& origin_url,
     fileapi::FileSystemType type,
     FileSystemContext* context,
     const DeleteFileSystemCallback& callback) {
   NOTREACHED();
   callback.Run(base::PLATFORM_FILE_ERROR_INVALID_OPERATION);
 }
 
 }  // namespace chrome