Add ability to clear content licenses

content/browser/storage_partition_impl.cc

Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index 65bf56140be1ff27696d83e7f5f483486b15345b..2b3a66611c58151148517eb81fe7410f628eca0b 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -13,6 +13,7 @@
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
@@ -33,9 +34,19 @@
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "ppapi/shared_impl/ppapi_constants.h"
 #include "storage/browser/database/database_tracker.h"
 #include "storage/browser/quota/quota_manager.h"
 
+#if defined(ENABLE_PLUGINS)
+#include "base/files/file_enumerator.h"
+#include "storage/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/isolated_context.h"
+#include "storage/browser/fileapi/obfuscated_file_util.h"
+#include "storage/common/fileapi/file_system_util.h"
+#endif  // defined(ENABLE_PLUGINS)
+
 namespace content {
 
 namespace {
@@ -215,6 +226,344 @@ void ClearSessionStorageOnUIThread(
                  callback));
 }
 
+#if defined(ENABLE_PLUGINS)
+// Helper for deleting plugin private data for a specified origin and plugin.
+// If any file matches the time range specified, then all files for this
+// origin and plugin are deleted.
+// All of the operations in this class are done on the FILE thread.
+class PluginPrivateDataByOriginDeletionHelper {
+ public:
+  PluginPrivateDataByOriginDeletionHelper(
+      storage::FileSystemContext* filesystem_context,
+      const GURL& origin,
+      const std::string& plugin_name,
+      const base::Time begin,
+      const base::Time end,
+      const base::Closure& callback)
+      : filesystem_context_(filesystem_context),
+        origin_(origin),
+        plugin_name_(plugin_name),
+        begin_(begin),
+        end_(end),
+        callback_(callback) {
+    // Create the filesystem ID.
+    fsid_ = storage::IsolatedContext::GetInstance()
+                ->RegisterFileSystemForVirtualPath(
+                    storage::kFileSystemTypePluginPrivate,
+                    ppapi::kPluginPrivateRootName, base::FilePath());
+  }
+  ~PluginPrivateDataByOriginDeletionHelper() {}
+
+  // Checks the files contained in the plugin private filesystem for |origin_|
+  // and |plugin_name_| and deletes any files whose last modified time is
+  // greater or equal to |begin_|. |callback_| is called when all actions
+  // are complete.
+  void Start();
+
+ private:
+  void OnFileSystemOpened(base::File::Error result);
+  void OnDirectoryRead(const std::string& root,
+                       base::File::Error result,
+                       const storage::AsyncFileUtil::EntryList& file_list,
+                       bool has_more);
+  void OnFileInfo(const std::string& file_name,
+                  const storage::FileSystemURL& file_url,
+                  base::File::Error result,
+                  const base::File::Info& file_info);
+
+  // Keeps track of the pending work. When |task_count_| goes to 0 then
+  // |callback_| is called and this helper object is destroyed.
+  void IncrementTaskCount();
+  void DecrementTaskCount();
+
+  // Not owned by this object. Caller is responsible for keeping the
+  // FileSystemContext alive until |callback_| is called.
+  storage::FileSystemContext* filesystem_context_;
+
+  GURL origin_;
+  std::string plugin_name_;
+  base::Time begin_;
+  base::Time end_;

[nhiroki, 2016/05/24 01:40:03]

Could you add 'const' to these fields?

[jrummell, 2016/05/24 22:15:33]

Done.

+  base::Closure callback_;
+  std::string fsid_;
+  int task_count_ = 0;
+  bool delete_this_data_ = false;
+};
+
+void PluginPrivateDataByOriginDeletionHelper::Start() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DCHECK(storage::ValidateIsolatedFileSystemId(fsid_));
+
+  IncrementTaskCount();
+  filesystem_context_->OpenPluginPrivateFileSystem(
+      origin_, storage::kFileSystemTypePluginPrivate, fsid_, plugin_name_,
+      storage::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT,
+      base::Bind(&PluginPrivateDataByOriginDeletionHelper::OnFileSystemOpened,
+                 base::Unretained(this)));
+}
+
+void PluginPrivateDataByOriginDeletionHelper::OnFileSystemOpened(
+    base::File::Error result) {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DVLOG(3) << "Opened filesystem for " << origin_ << ":" << plugin_name_
+           << ", result: " << result;
+
+  // If we can't open the directory, we can't delete files so simply return.
+  if (result != base::File::FILE_OK) {
+    DecrementTaskCount();
+    return;
+  }
+
+  storage::AsyncFileUtil* file_util = filesystem_context_->GetAsyncFileUtil(
+      storage::kFileSystemTypePluginPrivate);
+  std::string root = storage::GetIsolatedFileSystemRootURIString(
+      origin_, fsid_, ppapi::kPluginPrivateRootName);
+  std::unique_ptr<storage::FileSystemOperationContext> operation_context =
+      base::WrapUnique(
+          new storage::FileSystemOperationContext(filesystem_context_));
+  file_util->ReadDirectory(
+      std::move(operation_context), filesystem_context_->CrackURL(GURL(root)),
+      base::Bind(&PluginPrivateDataByOriginDeletionHelper::OnDirectoryRead,
+                 base::Unretained(this), root));
+}
+
+void PluginPrivateDataByOriginDeletionHelper::OnDirectoryRead(
+    const std::string& root,
+    base::File::Error result,
+    const storage::AsyncFileUtil::EntryList& file_list,
+    bool has_more) {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DVLOG(3) << __FUNCTION__ << " result: " << result
+           << ", #files: " << file_list.size();
+
+  // Quit if there is an error.
+  if (result != base::File::FILE_OK) {
+    DLOG(ERROR) << "Unable to read directory for " << origin_ << ":"
+                << plugin_name_;
+    DecrementTaskCount();
+    return;
+  }

[nhiroki, 2016/05/24 01:40:03]

You might want to skip remaining tasks if |delete_this_data_| is true.

[jrummell, 2016/05/24 22:15:33]

Done. Not sure if it will help right now, as typically there will only be 1 file
in the directory, but in the future if there are lots of files it will help.

+
+  // No error, process the files returned.
+  storage::AsyncFileUtil* file_util = filesystem_context_->GetAsyncFileUtil(
+      storage::kFileSystemTypePluginPrivate);
+  for (const auto& file : file_list) {
+    DVLOG(3) << __FUNCTION__ << " file: " << file.name;
+    DCHECK(!file.is_directory);  // Nested directories not implemented.
+
+    std::unique_ptr<storage::FileSystemOperationContext> operation_context =
+        base::WrapUnique(
+            new storage::FileSystemOperationContext(filesystem_context_));
+    storage::FileSystemURL file_url =
+        filesystem_context_->CrackURL(GURL(root + file.name));
+    IncrementTaskCount();
+    file_util->GetFileInfo(
+        std::move(operation_context), file_url,
+        storage::FileSystemOperation::GET_METADATA_FIELD_SIZE |
+            storage::FileSystemOperation::GET_METADATA_FIELD_LAST_MODIFIED,
+        base::Bind(&PluginPrivateDataByOriginDeletionHelper::OnFileInfo,
+                   base::Unretained(this), file.name, file_url));

[nhiroki, 2016/05/24 01:40:03]

You can just stop passing |file_url| here.

[jrummell, 2016/05/24 22:15:33]

Done.

+  }
+
+  // If there are more files in this directory, wait for the next call.
+  if (has_more)
+    return;
+
+  DecrementTaskCount();
+}
+
+void PluginPrivateDataByOriginDeletionHelper::OnFileInfo(
+    const std::string& file_name,
+    const storage::FileSystemURL& /* file_url */,
+    base::File::Error result,
+    const base::File::Info& file_info) {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+
+  if (result == base::File::FILE_OK) {
+    DVLOG(3) << __FUNCTION__ << " name: " << file_name
+             << ", size: " << file_info.size
+             << ", modified: " << file_info.last_modified;
+    if (file_info.last_modified >= begin_ && file_info.last_modified <= end_)
+      delete_this_data_ = true;

[nhiroki, 2016/05/24 01:40:03]

|delete_this_data_| would sound a bit confusing to me. It seems like we delete
only |file_name| data. However, actual behavior is to delete all this origin
data. Could you rename this to something like |delete_this_origin_data_|?

[jrummell, 2016/05/24 22:15:33]

Done.

+  }
+
+  DecrementTaskCount();
+}
+
+void PluginPrivateDataByOriginDeletionHelper::IncrementTaskCount() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  ++task_count_;
+}
+
+void PluginPrivateDataByOriginDeletionHelper::DecrementTaskCount() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DCHECK_GT(task_count_, 0);
+  --task_count_;
+  if (task_count_)
+    return;
+
+  // If there are no more tasks in progress, then delete the files for this
+  // origin if necessary.
+  if (delete_this_data_) {
+    DVLOG(3) << "Deleting plugin data for " << origin_ << ":" << plugin_name_;
+    storage::FileSystemBackend* backend =
+        filesystem_context_->GetFileSystemBackend(
+            storage::kFileSystemTypePluginPrivate);
+    storage::FileSystemQuotaUtil* quota_util = backend->GetQuotaUtil();
+    base::File::Error result = quota_util->DeleteOriginDataOnFileTaskRunner(
+        filesystem_context_, nullptr, origin_,
+        storage::kFileSystemTypePluginPrivate);
+    DLOG_IF(ERROR, result != base::File::FILE_OK)
+        << "Unable to delete the plugin data for " << origin_ << ":"
+        << plugin_name_;
+  }
+
+  // Run |callback_| and then this helper can be deleted.
+  callback_.Run();
+  delete this;
+}
+
+// Helper for deleting the plugin private data.
+// All of the operations in this class are done on the FILE thread.
+class PluginPrivateDataDeletionHelper {
+ public:
+  PluginPrivateDataDeletionHelper(
+      scoped_refptr<storage::FileSystemContext> filesystem_context,
+      const base::Time begin,
+      const base::Time end,
+      const base::Closure& callback)
+      : filesystem_context_(filesystem_context),

[nhiroki, 2016/05/24 01:40:03]

std::move(filesystem_context) because the context is non-const scoped_refptr.

[jrummell, 2016/05/24 22:15:33]

Done.

+        begin_(begin),
+        end_(end),
+        callback_(callback) {}
+  ~PluginPrivateDataDeletionHelper() {}
+
+  void CheckOrigins(const std::set<GURL>& origins);
+
+ private:
+  // Keeps track of the pending work. When |task_count_| goes to 0 then
+  // |callback_| is called and this helper object is destroyed.
+  void IncrementTaskCount();
+  void DecrementTaskCount();
+
+  // Keep a reference to FileSystemContext until we are done with it.
+  scoped_refptr<storage::FileSystemContext> filesystem_context_;
+
+  base::Time begin_;
+  base::Time end_;

[nhiroki, 2016/05/24 01:40:03]

Could you add 'const' to these fields?

[jrummell, 2016/05/24 22:15:33]

Done.

+  base::Closure callback_;
+  int task_count_ = 0;
+};
+
+void PluginPrivateDataDeletionHelper::CheckOrigins(
+    const std::set<GURL>& origins) {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  IncrementTaskCount();
+
+  base::Closure decrement_callback =
+      base::Bind(&PluginPrivateDataDeletionHelper::DecrementTaskCount,
+                 base::Unretained(this));
+  storage::AsyncFileUtil* async_file_util =
+      filesystem_context_->GetAsyncFileUtil(
+          storage::kFileSystemTypePluginPrivate);
+  storage::ObfuscatedFileUtil* obfuscated_file_util =
+      static_cast<storage::ObfuscatedFileUtil*>(
+          static_cast<storage::AsyncFileUtilAdapter*>(async_file_util)
+              ->sync_file_util());
+  for (const auto& origin : origins) {
+    // Determine the available directories for this origin.

[nhiroki, 2016/05/24 01:40:03]

"available plugin private filesystems" would be clearer.

[jrummell, 2016/05/24 22:15:33]

Done.

+    base::File::Error error;
+    base::FilePath path = obfuscated_file_util->GetDirectoryForOriginAndType(
+        origin, "", false, &error);
+    if (error != base::File::FILE_OK) {
+      DLOG(ERROR) << "Unable to read directory for " << origin;
+      continue;
+    }
+    base::FileEnumerator file_enumerator(path, false,

[nhiroki, 2016/05/24 01:40:03]

Could you add comments about why we iterate all directories under the origin
directories and what those directory names mean?

[jrummell, 2016/05/24 22:15:33]

Done.

+                                         base::FileEnumerator::DIRECTORIES);
+    for (base::FilePath plugin_path = file_enumerator.Next();
+         !plugin_path.empty(); plugin_path = file_enumerator.Next()) {
+      IncrementTaskCount();
+      PluginPrivateDataByOriginDeletionHelper* helper =
+          new PluginPrivateDataByOriginDeletionHelper(
+              filesystem_context_.get(), origin.GetOrigin(),
+              plugin_path.BaseName().MaybeAsASCII(), begin_, end_,
+              decrement_callback);
+      helper->Start();
+      // |helper| will delete itself when it is done.
+    }
+  }
+
+  // Cancels out the call to IncrementTaskCount() at the start of this method.
+  // If there are no origins specified then this will cause this helper to
+  // be destroyed.
+  DecrementTaskCount();
+}
+
+void PluginPrivateDataDeletionHelper::IncrementTaskCount() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  ++task_count_;
+}
+
+void PluginPrivateDataDeletionHelper::DecrementTaskCount() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DCHECK_GT(task_count_, 0);
+  --task_count_;
+  if (task_count_)
+    return;
+
+  // If there are no more tasks in progress, run |callback_| and then
+  // this helper can be deleted.
+  callback_.Run();
+  delete this;
+}
+
+void ClearPluginPrivateDataOnFileThread(
+    scoped_refptr<storage::FileSystemContext> filesystem_context,
+    const GURL& storage_origin,
+    const base::Time begin,
+    const base::Time end,
+    const base::Closure& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DVLOG(3) << "Clearing plugin data for origin: " << storage_origin;
+
+  storage::FileSystemBackend* backend =
+      filesystem_context->GetFileSystemBackend(
+          storage::kFileSystemTypePluginPrivate);
+  storage::FileSystemQuotaUtil* quota_util = backend->GetQuotaUtil();
+
+  // Determine the set of origins used.
+  std::set<GURL> origins;
+  quota_util->GetOriginsForTypeOnFileTaskRunner(
+      storage::kFileSystemTypePluginPrivate, &origins);
+
+  if (origins.empty()) {
+    // No origins, so nothing to do.
+    callback.Run();
+    return;
+  }
+
+  // If a specific origin is provided, then check that it is in the list
+  // returned and remove all the other origins.
+  if (!storage_origin.is_empty()) {
+    if (!ContainsKey(origins, storage_origin)) {
+      // Nothing matches, so nothing to do.
+      callback.Run();
+      return;
+    }
+
+    // List should only contain the one value that matches.
+    origins.clear();
+    origins.insert(storage_origin);
+  }
+
+  PluginPrivateDataDeletionHelper* helper = new PluginPrivateDataDeletionHelper(
+      std::move(filesystem_context), begin, end, callback);
+  helper->CheckOrigins(origins);
+  // |helper| will delete itself when all origins have been checked.
+}
+#endif  // defined(ENABLE_PLUGINS)
+
 }  // namespace
 
 // Static.
@@ -316,6 +665,7 @@ struct StoragePartitionImpl::DataDeletionHelper {
       storage::QuotaManager* quota_manager,
       storage::SpecialStoragePolicy* special_storage_policy,
       WebRTCIdentityStore* webrtc_identity_store,
+      storage::FileSystemContext* filesystem_context,
       const base::Time begin,
       const base::Time end);
 
@@ -635,7 +985,8 @@ void StoragePartitionImpl::ClearDataImpl(
   helper->ClearDataOnUIThread(
       storage_origin, origin_matcher, cookie_matcher, GetPath(), rq_context,
       dom_storage_context_.get(), quota_manager_.get(),
-      special_storage_policy_.get(), webrtc_identity_store_.get(), begin, end);
+      special_storage_policy_.get(), webrtc_identity_store_.get(),
+      filesystem_context_.get(), begin, end);
 }
 
 void StoragePartitionImpl::
@@ -775,6 +1126,7 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread(
     storage::QuotaManager* quota_manager,
     storage::SpecialStoragePolicy* special_storage_policy,
     WebRTCIdentityStore* webrtc_identity_store,
+    storage::FileSystemContext* filesystem_context,
     const base::Time begin,
     const base::Time end) {
   DCHECK_NE(remove_mask, 0u);
@@ -855,6 +1207,17 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread(
                    decrement_callback));
   }
 
+#if defined(ENABLE_PLUGINS)
+  if (remove_mask & REMOVE_DATA_MASK_PLUGIN_PRIVATE_DATA) {
+    IncrementTaskCountOnUI();
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(&ClearPluginPrivateDataOnFileThread,
+                   make_scoped_refptr(filesystem_context), storage_origin,
+                   begin, end, decrement_callback));
+  }
+#endif  // defined(ENABLE_PLUGINS)
+
   DecrementTaskCountOnUI();
 }