Cache Storage: restrict access to secure origins (Blink-side)

Source/modules/cachestorage/InspectorCacheStorageAgent.cpp

 // Copyright 2014 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 "config.h"
 #include "modules/cachestorage/InspectorCacheStorageAgent.h"
 
 #include "core/InspectorBackendDispatcher.h"
 #include "core/InspectorTypeBuilder.h"
 #include "platform/JSONValues.h"
@@ skipping 52 matching lines @@
         return false;
     }
     *securityOrigin = id.substring(0, pipe);
     *cacheName = id.substring(pipe + 1);
     return true;
 }
 
 PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorage(ErrorString* errorString, const String& securityOrigin)
 {
     RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin);
+
+    // Cache Storage API is restricted to trustworthy origins.
+    if (!secOrigin->isPotentiallyTrustworthy(*errorString))
+        return nullptr;
+
     String identifier = createDatabaseIdentifierFromSecurityOrigin(secOrigin.get());
     OwnPtr<WebServiceWorkerCacheStorage> cache = adoptPtr(Platform::current()->cacheStorage(identifier));
     if (!cache)
         *errorString = "Could not find cache storage.";
     return cache.release();
 }
 
 PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorageAndNameForId(ErrorString* errorString, const String& cacheId, String* cacheName)
 {
     String securityOrigin;
@@ skipping 318 matching lines @@
 
 InspectorCacheStorageAgent::~InspectorCacheStorageAgent() { }
 
 DEFINE_TRACE(InspectorCacheStorageAgent)
 {
     InspectorBaseAgent::trace(visitor);
 }
 
 void InspectorCacheStorageAgent::requestCacheNames(ErrorString* errorString, const String& securityOrigin, PassRefPtrWillBeRawPtr<RequestCacheNamesCallback> callback)
 {
+    RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin);
+
+    // Cache Storage API is restricted to trustworthy origins.
+    String ignoredMessage;
+    if (!secOrigin->isPotentiallyTrustworthy(ignoredMessage)) {
+        // Don't treat this as an error, just don't attempt to open and enumerate the caches.
+        callback->sendSuccess(Array<TypeBuilder::CacheStorage::Cache>::create());
+        return;
+    }
+
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, securityOrigin);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchKeys(new RequestCacheNames(securityOrigin, callback));
 }
 
 void InspectorCacheStorageAgent::requestEntries(ErrorString* errorString, const String& cacheId, int skipCount, int pageSize, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
 {
@@ skipping 27 matching lines @@
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchOpen(new GetCacheForDeleteEntry(request, cacheName, callback), WebString(cacheName));
 }
 
 
 } // namespace blink