[BlobStorage] Added back security policy for files in blobs

content/browser/blob_storage/blob_dispatcher_host.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_BLOB_STORAGE_BLOB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLOB_STORAGE_BLOB_DISPATCHER_HOST_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 14 matching lines @@
 namespace IPC {
 class Sender;
 }
 
 namespace storage {
 class DataElement;
 class BlobDataBuilder;
 struct BlobItemBytesRequest;
 struct BlobItemBytesResponse;
 class BlobStorageContext;
+class FileSystemContext;
 }
 
 namespace content {
+class ChildProcessSecurityPolicyImpl;
 class ChromeBlobStorageContext;
 
 // This class's responsibility is to listen for and dispatch blob storage
 // messages and handle logistics of blob storage for a single child process.
 // When the child process terminates all blob references attributable to
 // that process go away upon destruction of the instance.
 // This lives in the browser process, is single threaded (IO thread), and there
 // is one per child process.
 class CONTENT_EXPORT BlobDispatcherHost : public BrowserMessageFilter {
  public:
-  explicit BlobDispatcherHost(ChromeBlobStorageContext* blob_storage_context);
+  BlobDispatcherHost(int process_id,
+                     storage::FileSystemContext* file_system_context,
+                     ChromeBlobStorageContext* blob_storage_context);

[kinuko, 2016/08/05 15:27:31]

nit: I'd place file_system_context parameter after blob_storage_context

[dmurph, 2016/08/05 19:12:45]

Done.

 
   // BrowserMessageFilter implementation.
   void OnChannelClosing() override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   ~BlobDispatcherHost() override;
 
   // For testing use only.
   void SetMemoryConstantsForTesting(size_t max_ipc_memory_size,
@@ skipping 66 matching lines @@
   // Send the appropriate IPC response to the renderer for the given result.
   void SendIPCResponse(const std::string& uuid,
                        storage::BlobTransportResult result);
 
   bool IsInUseInHost(const std::string& uuid);
   bool IsUrlRegisteredInHost(const GURL& blob_url);
 
   // Unregisters all blobs and urls that were registered in this host.
   void ClearHostFromBlobStorageContext();
 
+  int process_id_;

[kinuko, 2016/08/05 15:27:31]

const

[dmurph, 2016/08/05 19:12:45]

Done.

+  storage::FileSystemContext* file_system_context_;

[kinuko, 2016/08/05 15:27:31]

nit: I think this'd be safe, but maybe we'd better store this as scoped_refptr?

[dmurph, 2016/08/05 19:12:45]

The FileApiMessageFilter just stores the raw pointer... is it alright if we keep
it a raw pointer? I'm not sure if I'll be introducing a refcount cycle if I make
it a scoped_refptr

[kinuko, 2016/08/08 15:52:28]

Either works for me as far as we don't crash/leak, but it looked a bit weird /
inconsistent to me as we hold blob_storage_context_ as a ref-ptr while
file_system_context_ as a raw-ptr.

[dmurph, 2016/08/15 18:25:04]

Done.

+  ChildProcessSecurityPolicyImpl* security_policy_;
+
   // Collection of blob ids and a count of how many usages
   // of that id are attributable to this consumer.
   BlobReferenceMap blobs_inuse_map_;
 
   // The set of public blob urls coined by this consumer.
   std::set<GURL> public_blob_urls_;
 
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   storage::BlobAsyncBuilderHost async_builder_;
 
   DISALLOW_COPY_AND_ASSIGN(BlobDispatcherHost);
 };
 }  // namespace content
 #endif  // CONTENT_BROWSER_BLOB_STORAGE_BLOB_DISPATCHER_HOST_H_