Changeset 243806 in webkit

Timestamp:

Apr 3, 2019, 10:00:36 AM (7 years ago)

Author:

youenn@apple.com

Message:

Resetting quota should take into account third party origins
​https://bugs.webkit.org/show_bug.cgi?id=196462

Reviewed by Geoffrey Garen.

Source/WebKit:

When clearing the storage quota, we were resetting it to the default value
without taking care of whether third party or not.
Updated the code to ensure that the default quota is computed based on the origin.

Updated existing test to cover this case.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::clearStorageQuota):
(WebKit::NetworkProcess::setCacheStorageParameters):
(WebKit::NetworkProcess::updateQuotaBasedOnSpaceUsageForTesting):
(WebKit::NetworkProcess::storageQuotaManager):

• NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::StorageQuotaManagers::defaultQuota const):
(WebKit::NetworkProcess::StorageQuotaManagers::setDefaultQuotas):
(WebKit::NetworkProcess::StorageQuotaManagers::managersPerOrigin):

LayoutTests:

• http/wpt/cache-storage/quota-third-party.https-expected.txt:
• http/wpt/cache-storage/quota-third-party.https.html:
• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/cache-storage/quota-third-party.https-expected.txt (modified) (2 diffs)
• LayoutTests/http/wpt/cache-storage/quota-third-party.https.html (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.cpp (modified) (4 diffs)
• Source/WebKit/NetworkProcess/NetworkProcess.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-03  Youenn Fablet  <youenn@apple.com>
+
+        Resetting quota should take into account third party origins
+        https://bugs.webkit.org/show_bug.cgi?id=196462
+
+        Reviewed by Geoffrey Garen.
+
+        * http/wpt/cache-storage/quota-third-party.https-expected.txt:
+        * http/wpt/cache-storage/quota-third-party.https.html:
+        * platform/mac-wk2/TestExpectations:
+
 2019-04-03  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/LayoutTests/http/wpt/cache-storage/quota-third-party.https-expected.txt

@@ +1 @@
+CONSOLE MESSAGE: Cache API operation failed: Quota exceeded
 CONSOLE MESSAGE: Cache API operation failed: Quota exceeded
   
@@ -4 +5 @@
 PASS same origin iframe has regular quota 
 PASS cross origin iframe has reduced quota 
+PASS cross origin iframe has reduced quota after resetting quota 
 

trunk/LayoutTests/http/wpt/cache-storage/quota-third-party.https.html

@@ -25 +25 @@
 }, "cross origin iframe has reduced quota");
 
+promise_test(async () => {
+    // Clear DOMCaches to reset quotas.
+    if (window.testRunner)
+        testRunner.clearDOMCaches();
+
+    assert_equals(await load_iframe("https://127.0.0.1:9443/WebKit/cache-storage/resources/quota-third-party-iframe.html"), "FAIL");
+}, "cross origin iframe has reduced quota after resetting quota");
+
     </script>
 </body>

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -932 +932 @@
 webkit.org/b/196307 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Pass Failure ]
 
-webkit.org/b/196358 http/wpt/cache-storage/quota-third-party.https.html [ Pass Failure ]
-
 webkit.org/b/196376 storage/domstorage/localstorage/private-browsing-affects-storage.html [ Pass Failure ]
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-03  Youenn Fablet  <youenn@apple.com>
+
+        Resetting quota should take into account third party origins
+        https://bugs.webkit.org/show_bug.cgi?id=196462
+
+        Reviewed by Geoffrey Garen.
+
+        When clearing the storage quota, we were resetting it to the default value
+        without taking care of whether third party or not.
+        Updated the code to ensure that the default quota is computed based on the origin.
+
+        Updated existing test to cover this case.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::clearStorageQuota):
+        (WebKit::NetworkProcess::setCacheStorageParameters):
+        (WebKit::NetworkProcess::updateQuotaBasedOnSpaceUsageForTesting):
+        (WebKit::NetworkProcess::storageQuotaManager):
+        * NetworkProcess/NetworkProcess.h:
+        (WebKit::NetworkProcess::StorageQuotaManagers::defaultQuota const):
+        (WebKit::NetworkProcess::StorageQuotaManagers::setDefaultQuotas):
+        (WebKit::NetworkProcess::StorageQuotaManagers::managersPerOrigin):
+
 2019-04-03  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -1486 +1486 @@
         return;
 
-    for (auto& manager : iterator->value.managersPerOrigin.values())
-        manager->resetQuota(iterator->value.defaultQuota);
+    auto& managers = iterator->value;
+    for (auto& manager : managers.managersPerOrigin())
+        manager.value->resetQuota(managers.defaultQuota(manager.key));
 }
 
@@ -2034 +2035 @@
         return StorageQuotaManagers { };
     }).iterator->value;
-    managers.defaultQuota = quota;
-    // FIXME: Pass default third party quota as a parameter.
-    managers.defaultThirdPartyQuota = quota / 10;
+    managers.setDefaultQuotas(quota, quota / 10);
 
     auto iterator = m_cacheStorageParametersCallbacks.find(sessionID);
@@ -2233 +2232 @@
 {
     auto& manager = storageQuotaManager(sessionID, origin);
-    manager.resetQuota(m_storageQuotaManagers.find(sessionID)->value.defaultQuota);
+    manager.resetQuota(m_storageQuotaManagers.find(sessionID)->value.defaultQuota(origin));
     manager.updateQuotaBasedOnSpaceUsage();
 }
@@ -2444 +2443 @@
         return StorageQuotaManagers { };
     }).iterator->value;
-    return *storageQuotaManagers.managersPerOrigin.ensure(origin, [this, &storageQuotaManagers, sessionID, &origin] {
-        auto quota = origin.topOrigin == origin.clientOrigin ? storageQuotaManagers.defaultQuota : storageQuotaManagers.defaultThirdPartyQuota;
-        auto manager = std::make_unique<StorageQuotaManager>(quota, [this, sessionID, origin](uint64_t quota, uint64_t currentSpace, uint64_t spaceIncrease, auto callback) {
+    return *storageQuotaManagers.managersPerOrigin().ensure(origin, [this, &storageQuotaManagers, sessionID, &origin] {
+        auto manager = std::make_unique<StorageQuotaManager>(storageQuotaManagers.defaultQuota(origin), [this, sessionID, origin](uint64_t quota, uint64_t currentSpace, uint64_t spaceIncrease, auto callback) {
             this->requestStorageSpace(sessionID, origin, quota, currentSpace, spaceIncrease, WTFMove(callback));
         });

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -533 +533 @@
 #endif
 
-    struct StorageQuotaManagers {
-        uint64_t defaultQuota { WebCore::StorageQuotaManager::defaultQuota() };
-        uint64_t defaultThirdPartyQuota { WebCore::StorageQuotaManager::defaultThirdPartyQuota() };
-        HashMap<WebCore::ClientOrigin, std::unique_ptr<WebCore::StorageQuotaManager>> managersPerOrigin;
+    class StorageQuotaManagers {
+    public:
+        uint64_t defaultQuota(const WebCore::ClientOrigin& origin) const { return origin.topOrigin == origin.clientOrigin ? m_defaultQuota : m_defaultThirdPartyQuota; }
+        void setDefaultQuotas(uint64_t defaultQuota, uint64_t defaultThirdPartyQuota)
+        {
+            m_defaultQuota = defaultQuota;
+            m_defaultThirdPartyQuota = defaultThirdPartyQuota;
+        }
+
+        HashMap<WebCore::ClientOrigin, std::unique_ptr<WebCore::StorageQuotaManager>>& managersPerOrigin() { return m_managersPerOrigin; }
+
+    private:
+        uint64_t m_defaultQuota { WebCore::StorageQuotaManager::defaultQuota() };
+        uint64_t m_defaultThirdPartyQuota { WebCore::StorageQuotaManager::defaultThirdPartyQuota() };
+        HashMap<WebCore::ClientOrigin, std::unique_ptr<WebCore::StorageQuotaManager>> m_managersPerOrigin;
     };
     HashMap<PAL::SessionID, StorageQuotaManagers> m_storageQuotaManagers;