summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/file_manager/fileapi_util.cc
diff options
context:
space:
mode:
authormtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 04:56:40 +0000
committermtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 04:56:40 +0000
commit0fa422a0e4ee63132825a23a2f60f1a0c05aec79 (patch)
tree74b2cfb7115484e507cde71b18d1e9ea4e1a1c47 /chrome/browser/chromeos/file_manager/fileapi_util.cc
parent7c89ff265392829fbc3510c047a555d290366408 (diff)
downloadchromium_src-0fa422a0e4ee63132825a23a2f60f1a0c05aec79.zip
chromium_src-0fa422a0e4ee63132825a23a2f60f1a0c05aec79.tar.gz
chromium_src-0fa422a0e4ee63132825a23a2f60f1a0c05aec79.tar.bz2
Create file systems restricted to volumes.
Before, on Chrome OS, JS Entry objects were holding the same DOMFileSystem object, and they were attached to the same big root. All of the mount points were first-level directories. This looks like a Linux approach. However, for better isolation a different approach has been suggested. To have a separate DOMFileSystem object per every volume on Chrome OS. So, Downloads and Drive files would be separate, and the filesystem's root would be one of the mount points. What is more, restricting DOMFileSystem objects to a mount point is not enough. In case of `archive` and `removable`, we have two level mount points. The first level is either `archive` or `removable`. Either of them contains mounted volumes - archives or removable devices. This patch restricts DOMFileSystem objects (and thereof Entry objects) to the inner most mount point. For example: /Downloads, /drive, /archive/archive-1, /archive/archive-2, /removable/disk-1, /removable/disk-2. Having this solution it is impossible to access the grand root containing all of the outer mount points, which was until now restricted in JavaScript. Also, it doesn't allow to get an Entry for /archive and /removable, which was also filtered out in JS layer. Moreover, and what is the most important, this approach allows to map a C++ VolumeInfo to a DOMFileSystem object with 1:1 relationship. To achieve that, the OpenFileSystem has been renamed to ResolveURL, since this method has been always used to Resolving a file system URL. Opening the file system was a side effect. This allowed to unify the code paths for sandboxed and non-sandboxed file systems. Before, for non-sandboxed file systems, the root url (and the name) were manually computed using a deprecated utility function fileapi::GetFileSystemInfoForChromeOS(), which is removed in this patch. The drawback of this change was that the root_url and the fs name resolution became asynchonous. The reason for that is that sandboxed file systems may perform operations on different threads, therefore they have to be asynchronous. To simplify migration a utility function has been introduced to convert FileDefinition vectors to EntryDefinition vectors. Finally, this change will allow simplifying Files app volumes logic significantly. The JS VolumeInfo will match C++ VolumeInfo 1:1, as well as either VolumeInfo will match a DOMFileSystem object 1:1. As a result, we will be able to remove special cases for inner mount points (for archives and removables). Another advantage is simple way to pass names of JS-provided file systems. The permission management is currently simplified, but the next step will be to grant permissions per inner-most mount point, which will clean up security policy comparing to the former implementation. TBR=phajdan.jr@chromium.org BUG=318021 TEST=Tested manually. Review URL: https://codereview.chromium.org/162963003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/file_manager/fileapi_util.cc')
-rw-r--r--chrome/browser/chromeos/file_manager/fileapi_util.cc214
1 files changed, 214 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/file_manager/fileapi_util.cc b/chrome/browser/chromeos/file_manager/fileapi_util.cc
index 2cf6044..e946650 100644
--- a/chrome/browser/chromeos/file_manager/fileapi_util.cc
+++ b/chrome/browser/chromeos/file_manager/fileapi_util.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/chromeos/file_manager/fileapi_util.h"
+#include "base/files/file.h"
#include "base/files/file_path.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/storage_partition.h"
@@ -15,8 +17,11 @@
#include "net/base/escape.h"
#include "url/gurl.h"
#include "webkit/browser/fileapi/file_system_context.h"
+#include "webkit/browser/fileapi/open_file_system_mode.h"
#include "webkit/common/fileapi/file_system_util.h"
+using content::BrowserThread;
+
namespace file_manager {
namespace util {
@@ -32,8 +37,189 @@ GURL ConvertRelativeFilePathToFileSystemUrl(const base::FilePath& relative_path,
false)); // Space to %20 instead of +.
}
+// Creates an ErrorDefinition with an error set to |error|.
+EntryDefinition CreateEntryDefinitionWithError(base::File::Error error) {
+ EntryDefinition result;
+ result.error = error;
+ return result;
+}
+
+// Helper class for performing conversions from file definitions to entry
+// definitions. It is possible to do it without a class, but the code would be
+// crazy and super tricky.
+//
+// This class copies the input |file_definition_list|,
+// so there is no need to worry about validity of passed |file_definition_list|
+// reference. Also, it automatically deletes itself after converting finished,
+// or if shutdown is invoked during ResolveURL(). Must be called on UI thread.
+class FileDefinitionListConverter {
+ public:
+ FileDefinitionListConverter(Profile* profile,
+ const std::string& extension_id,
+ const FileDefinitionList& file_definition_list,
+ const EntryDefinitionListCallback& callback);
+ ~FileDefinitionListConverter() {}
+
+ private:
+ // Converts the element under the iterator to an entry. First, converts
+ // the virtual path to an URL, and calls OnResolvedURL(). In case of error
+ // calls OnIteratorConverted with an error entry definition.
+ void ConvertNextIterator(scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator);
+
+ // Creates an entry definition from the URL as well as the file definition.
+ // Then, calls OnIteratorConverted with the created entry definition.
+ void OnResolvedURL(scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator,
+ const GURL& root_url,
+ const std::string& name,
+ base::File::Error error);
+
+ // Called when the iterator is converted. Adds the |entry_definition| to
+ // |results_| and calls ConvertNextIterator() for the next element.
+ void OnIteratorConverted(scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator,
+ const EntryDefinition& entry_definition);
+
+ scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+ const std::string extension_id_;
+ const FileDefinitionList file_definition_list_;
+ const EntryDefinitionListCallback callback_;
+ scoped_ptr<EntryDefinitionList> result_;
+};
+
+FileDefinitionListConverter::FileDefinitionListConverter(
+ Profile* profile,
+ const std::string& extension_id,
+ const FileDefinitionList& file_definition_list,
+ const EntryDefinitionListCallback& callback)
+ : extension_id_(extension_id),
+ file_definition_list_(file_definition_list),
+ callback_(callback),
+ result_(new EntryDefinitionList) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ // May be NULL during unit_tests.
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (service) {
+ // File browser APIs are meant to be used only from extension context, so
+ // the extension's site is the one in whose file system context the virtual
+ // path should be found.
+ GURL site = service->GetSiteForExtensionId(extension_id_);
+ file_system_context_ =
+ content::BrowserContext::GetStoragePartitionForSite(
+ profile, site)->GetFileSystemContext();
+ }
+
+ // Deletes the converter, once the scoped pointer gets out of scope. It is
+ // either, if the conversion is finished, or ResolveURL() is terminated, and
+ // the callback not called because of shutdown.
+ scoped_ptr<FileDefinitionListConverter> self_deleter(this);
+ ConvertNextIterator(self_deleter.Pass(), file_definition_list_.begin());
+}
+
+void FileDefinitionListConverter::ConvertNextIterator(
+ scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator) {
+ if (iterator == file_definition_list_.end()) {
+ // The converter object will be destroyed since |self_deleter| gets out of
+ // scope.
+ callback_.Run(result_.Pass());
+ return;
+ }
+
+ if (!file_system_context_.get()) {
+ OnIteratorConverted(self_deleter.Pass(),
+ iterator,
+ CreateEntryDefinitionWithError(
+ base::File::FILE_ERROR_INVALID_OPERATION));
+ return;
+ }
+
+ fileapi::ExternalFileSystemBackend* backend =
+ file_system_context_->external_backend();
+ if (!backend) {
+ OnIteratorConverted(self_deleter.Pass(),
+ iterator,
+ CreateEntryDefinitionWithError(
+ base::File::FILE_ERROR_INVALID_OPERATION));
+ return;
+ }
+
+ fileapi::FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
+ extensions::Extension::GetBaseURLFromExtensionId(extension_id_),
+ fileapi::kFileSystemTypeExternal,
+ iterator->virtual_path);
+ DCHECK(url.is_valid());
+
+ // The converter object will be deleted if the callback is not called because
+ // of shutdown during ResolveURL().
+ //
+ // TODO(mtomasz, nhiroki): Call FileSystemContext::ResolveURL() directly,
+ // after removing redundant thread restrictions in there.
+ backend->ResolveURL(
+ url,
+ // Not sandboxed file systems are not creatable via ResolveURL().
+ fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT,
+ base::Bind(&FileDefinitionListConverter::OnResolvedURL,
+ base::Unretained(this),
+ base::Passed(&self_deleter),
+ iterator));
+}
+
+void FileDefinitionListConverter::OnResolvedURL(
+ scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator,
+ const GURL& root_url,
+ const std::string& name,
+ base::File::Error error) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ EntryDefinition entry_definition;
+ entry_definition.file_system_root_url = root_url.spec();
+ entry_definition.file_system_name = name;
+ entry_definition.is_directory = iterator->is_directory;
+ entry_definition.error = error;
+
+ // Construct a target Entry.fullPath value from the virtual path and the
+ // root URL. Eg. Downloads/A/b.txt -> A/b.txt.
+ const base::FilePath root_virtual_path =
+ file_system_context_->CrackURL(root_url).virtual_path();
+ DCHECK(root_virtual_path == iterator->virtual_path ||
+ root_virtual_path.IsParent(iterator->virtual_path));
+ base::FilePath full_path;
+ root_virtual_path.AppendRelativePath(iterator->virtual_path, &full_path);
+ entry_definition.full_path = full_path;
+
+ OnIteratorConverted(self_deleter.Pass(), iterator, entry_definition);
+}
+
+void FileDefinitionListConverter::OnIteratorConverted(
+ scoped_ptr<FileDefinitionListConverter> self_deleter,
+ FileDefinitionList::const_iterator iterator,
+ const EntryDefinition& entry_definition) {
+ result_->push_back(entry_definition);
+ ConvertNextIterator(self_deleter.Pass(), ++iterator);
+}
+
+// Helper function to return the converted definition entry directly, without
+// the redundant container.
+void OnConvertFileDefinitionDone(
+ const EntryDefinitionCallback& callback,
+ scoped_ptr<EntryDefinitionList> entry_definition_list) {
+ DCHECK_EQ(1u, entry_definition_list->size());
+ callback.Run(entry_definition_list->at(0));
+}
+
} // namespace
+EntryDefinition::EntryDefinition() {
+}
+
+EntryDefinition::~EntryDefinition() {
+}
+
fileapi::FileSystemContext* GetFileSystemContextForExtensionId(
Profile* profile,
const std::string& extension_id) {
@@ -122,5 +308,33 @@ bool ConvertAbsoluteFilePathToRelativeFileSystemPath(
return true;
}
+void ConvertFileDefinitionListToEntryDefinitionList(
+ Profile* profile,
+ const std::string& extension_id,
+ const FileDefinitionList& file_definition_list,
+ const EntryDefinitionListCallback& callback) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ // The converter object destroys itself.
+ new FileDefinitionListConverter(
+ profile, extension_id, file_definition_list, callback);
+}
+
+void ConvertFileDefinitionToEntryDefinition(
+ Profile* profile,
+ const std::string& extension_id,
+ const FileDefinition& file_definition,
+ const EntryDefinitionCallback& callback) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ FileDefinitionList file_definition_list;
+ file_definition_list.push_back(file_definition);
+ ConvertFileDefinitionListToEntryDefinitionList(
+ profile,
+ extension_id,
+ file_definition_list,
+ base::Bind(&OnConvertFileDefinitionDone, callback));
+}
+
} // namespace util
} // namespace file_manager
generated by cgit v1.1 at 2025-04-03 12:42:48 +0000