Third-party appcache blocking.

webkit/appcache/appcache_service.cc

 // Copyright (c) 2011 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 "webkit/appcache/appcache_service.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "net/base/io_buffer.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_backend_impl.h"
 #include "webkit/appcache/appcache_entry.h"
 #include "webkit/appcache/appcache_histograms.h"
+#include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_quota_client.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage_impl.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
 namespace appcache {
 
 AppCacheInfoCollection::AppCacheInfoCollection() {}
 
@@ skipping 45 matching lines @@
   service_->storage()->CancelDelegateCallbacks(this);
   service_ = NULL;
 }
 
 // CanHandleOfflineHelper -------
 
 class AppCacheService::CanHandleOfflineHelper : AsyncHelper {
  public:
   CanHandleOfflineHelper(
       AppCacheService* service, const GURL& url,
-      net::CompletionCallback* callback)
-      : AsyncHelper(service, callback), url_(url) {
+      const GURL& first_party, net::CompletionCallback* callback)
+      : AsyncHelper(service, callback), url_(url), first_party_(first_party) {
   }
 
   virtual void Start() {
+    AppCachePolicy* policy = service_->appcache_policy();
+    if (policy && !policy->CanLoadAppCache(url_, first_party_)) {
+      CallCallback(net::ERR_FAILED);
+      return;
+    }
     service_->storage()->FindResponseForMainRequest(url_, GURL(), this);
   }
 
  private:
   // AppCacheStorage::Delegate override
   virtual void OnMainResponseFound(
       const GURL& url, const AppCacheEntry& entry,
       const GURL& fallback_url, const AppCacheEntry& fallback_entry,
-      int64 cache_id, const GURL& mainfest_url,
-      bool was_blocked_by_policy);
+      int64 cache_id, const GURL& mainfest_url);
 
   GURL url_;
+  GURL first_party_;
   DISALLOW_COPY_AND_ASSIGN(CanHandleOfflineHelper);
 };
 
 void AppCacheService::CanHandleOfflineHelper::OnMainResponseFound(
       const GURL& url, const AppCacheEntry& entry,
       const GURL& fallback_url, const AppCacheEntry& fallback_entry,
-      int64 cache_id, const GURL& mainfest_url,
-      bool was_blocked_by_policy) {
-  bool can = !was_blocked_by_policy &&
-             (entry.has_response_id() || fallback_entry.has_response_id());
+      int64 cache_id, const GURL& manifest_url) {
+  bool can = (entry.has_response_id() || fallback_entry.has_response_id());
   CallCallback(can ? net::OK : net::ERR_FAILED);
   delete this;
 }
 
 // DeleteHelper -------
 
 class AppCacheService::DeleteHelper : public AsyncHelper {
  public:
   DeleteHelper(
       AppCacheService* service, const GURL& manifest_url,
@@ skipping 314 matching lines @@
 void AppCacheService::Initialize(const FilePath& cache_directory,
                                  base::MessageLoopProxy* cache_thread) {
   DCHECK(!storage_.get());
   AppCacheStorageImpl* storage = new AppCacheStorageImpl(this);
   storage->Initialize(cache_directory, cache_thread);
   storage_.reset(storage);
 }
 
 void AppCacheService::CanHandleMainResourceOffline(
     const GURL& url,
+    const GURL& first_party,
     net::CompletionCallback* callback) {
   CanHandleOfflineHelper* helper =
-      new CanHandleOfflineHelper(this, url, callback);
+      new CanHandleOfflineHelper(this, url, first_party, callback);
   helper->Start();
 }
 
 void AppCacheService::GetAllAppCacheInfo(AppCacheInfoCollection* collection,
                                          net::CompletionCallback* callback) {
   DCHECK(collection);
   GetInfoHelper* helper = new GetInfoHelper(this, collection, callback);
   helper->Start();
 }
 
@@ skipping 28 matching lines @@
   backends_.insert(
       BackendMap::value_type(backend_impl->process_id(), backend_impl));
 }
 
 void AppCacheService::UnregisterBackend(
     AppCacheBackendImpl* backend_impl) {
   backends_.erase(backend_impl->process_id());
 }
 
 }  // namespace appcache