Add a property to WebKitWebsiteDataManager to set the LocalStorage quota.

magomez · pgorszkowski-igalia · commit a9798739b744 · 2024-05-02T08:12:47.000+02:00
diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
@@ -263,6 +263,12 @@ LocalStorageDatabasePath:
     WebCore:
       default: '{ }'
 
+LocalStorageQuota:
+  type: uint32_t
+  defaultValue:
+    WebCore:
+      default: 5242880
+
 MaximumHTMLParserDOMTreeDepth:
   type: uint32_t
   defaultValue:
diff --git a/Source/WebCore/storage/StorageNamespaceProvider.cpp b/Source/WebCore/storage/StorageNamespaceProvider.cpp
@@ -29,14 +29,12 @@
 #include "Document.h"
 #include "Page.h"
 #include "SecurityOriginData.h"
+#include "Settings.h"
 #include "StorageArea.h"
 #include "StorageNamespace.h"
 
 namespace WebCore {
 
-// Suggested by the HTML5 spec.
-unsigned localStorageDatabaseQuotaInBytes = 5 * 1024 * 1024;
-
 StorageNamespaceProvider::StorageNamespaceProvider()
 {
 }
@@ -53,9 +51,9 @@ Ref<StorageArea> StorageNamespaceProvider::localStorageArea(Document& document)
 
     RefPtr<StorageNamespace> storageNamespace;
     if (document.canAccessResource(ScriptExecutionContext::ResourceType::LocalStorage) == ScriptExecutionContext::HasResourceAccess::DefaultForThirdParty)
-        storageNamespace = &transientLocalStorageNamespace(document.topOrigin(), document.page()->sessionID());
+        storageNamespace = &transientLocalStorageNamespace(document.topOrigin(), document.page()->settings().localStorageQuota(), document.page()->sessionID());
     else
-        storageNamespace = &localStorageNamespace(document.page()->sessionID());
+        storageNamespace = &localStorageNamespace(document.page()->settings().localStorageQuota(), document.page()->sessionID());
 
     return storageNamespace->storageArea(document.securityOrigin());
 }
@@ -69,20 +67,20 @@ Ref<StorageArea> StorageNamespaceProvider::sessionStorageArea(Document& document
     return sessionStorageNamespace(document.topOrigin(), *document.page())->storageArea(document.securityOrigin());
 }
 
-StorageNamespace& StorageNamespaceProvider::localStorageNamespace(PAL::SessionID sessionID)
+StorageNamespace& StorageNamespaceProvider::localStorageNamespace(unsigned quota, PAL::SessionID sessionID)
 {
     if (!m_localStorageNamespace)
-        m_localStorageNamespace = createLocalStorageNamespace(localStorageDatabaseQuotaInBytes, sessionID);
+        m_localStorageNamespace = createLocalStorageNamespace(quota, sessionID);
 
     ASSERT(m_localStorageNamespace->sessionID() == sessionID);
     return *m_localStorageNamespace;
 }
 
-StorageNamespace& StorageNamespaceProvider::transientLocalStorageNamespace(SecurityOrigin& securityOrigin, PAL::SessionID sessionID)
+StorageNamespace& StorageNamespaceProvider::transientLocalStorageNamespace(SecurityOrigin& securityOrigin, unsigned quota, PAL::SessionID sessionID)
 {
     auto& slot = m_transientLocalStorageNamespaces.add(securityOrigin.data(), nullptr).iterator->value;
     if (!slot)
-        slot = createTransientLocalStorageNamespace(securityOrigin, localStorageDatabaseQuotaInBytes, sessionID);
+        slot = createTransientLocalStorageNamespace(securityOrigin, quota, sessionID);
 
     ASSERT(slot->sessionID() == sessionID);
     return *slot;
diff --git a/Source/WebCore/storage/StorageNamespaceProvider.h b/Source/WebCore/storage/StorageNamespaceProvider.h
@@ -63,8 +63,8 @@ class StorageNamespaceProvider : public RefCounted<StorageNamespaceProvider> {
 
 private:
     friend class Internals;
-    WEBCORE_EXPORT StorageNamespace& localStorageNamespace(PAL::SessionID);
-    StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&, PAL::SessionID);
+    WEBCORE_EXPORT StorageNamespace& localStorageNamespace(unsigned quota, PAL::SessionID);
+    StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&, unsigned quota, PAL::SessionID);
 
     virtual Ref<StorageNamespace> createLocalStorageNamespace(unsigned quota, PAL::SessionID) = 0;
     virtual Ref<StorageNamespace> createTransientLocalStorageNamespace(SecurityOrigin&, unsigned quota, PAL::SessionID) = 0;
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
@@ -3072,7 +3072,7 @@ uint64_t Internals::storageAreaMapCount() const
     if (!page)
         return 0;
 
-    return page->storageNamespaceProvider().localStorageNamespace(page->sessionID()).storageAreaMapCountForTesting();
+    return page->storageNamespaceProvider().localStorageNamespace(page->settings().localStorageQuota(), page->sessionID()).storageAreaMapCountForTesting();
 }
 
 uint64_t Internals::elementIdentifier(Element& element) const
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
@@ -412,6 +412,10 @@ class NetworkProcess final : public AuxiliaryProcess, private DownloadManager::C
     void setEmulatedConditions(PAL::SessionID, std::optional<int64_t>&& bytesPerSecondLimit);
 #endif
 
+#if USE(SOUP)
+    static unsigned localStorageQuota() { return s_localStorageQuota; }
+#endif
+
     void deleteWebsiteDataForOrigin(PAL::SessionID, OptionSet<WebsiteDataType>, const WebCore::ClientOrigin&, CompletionHandler<void()>&&);
     void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, const Vector<String>& HSTSCacheHostnames, const Vector<RegistrableDomain>&, CompletionHandler<void()>&&);
 
@@ -586,6 +590,10 @@ class NetworkProcess final : public AuxiliaryProcess, private DownloadManager::C
     int m_mediaStreamingActivitityToken { NOTIFY_TOKEN_INVALID };
     bool m_isParentProcessFullWebBrowserOrRunningTest { false };
 #endif
+
+#if USE(SOUP)
+    static unsigned s_localStorageQuota;
+#endif
 };
 
 #if !PLATFORM(COCOA)
diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
@@ -66,6 +66,7 @@ struct NetworkProcessCreationParameters {
     WebCore::HTTPCookieAcceptPolicy cookieAcceptPolicy { WebCore::HTTPCookieAcceptPolicy::AlwaysAccept };
     Vector<String> languages;
     std::optional<MemoryPressureHandler::Configuration> memoryPressureHandlerConfiguration;
+    uint32_t localStorageQuota;
 #endif
 
     Vector<String> urlSchemesRegisteredAsSecure;
diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.serialization.in b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.serialization.in
@@ -44,6 +44,7 @@ headers: "NetworkProcessCreationParameters.h" "AuxiliaryProcessCreationParameter
     WebCore::HTTPCookieAcceptPolicy cookieAcceptPolicy
     Vector<String> languages
     std::optional<MemoryPressureHandler::Configuration> memoryPressureHandlerConfiguration
+    uint32_t localStorageQuota
 #endif
 
     Vector<String> urlSchemesRegisteredAsSecure
diff --git a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
@@ -50,6 +50,8 @@
 namespace WebKit {
 using namespace WebCore;
 
+unsigned NetworkProcess::s_localStorageQuota = 5 * MB;
+
 static CString buildAcceptLanguages(const Vector<String>& languages)
 {
     size_t languagesCount = languages.size();
@@ -155,6 +157,8 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
         });
     }
 #endif
+
+    s_localStorageQuota = parameters.localStorageQuota;
 }
 
 void NetworkProcess::setIgnoreTLSErrors(PAL::SessionID sessionID, bool ignoreTLSErrors)
diff --git a/Source/WebKit/NetworkProcess/storage/LocalStorageManager.cpp b/Source/WebKit/NetworkProcess/storage/LocalStorageManager.cpp
@@ -27,15 +27,14 @@
 #include "LocalStorageManager.h"
 
 #include "MemoryStorageArea.h"
+#include "NetworkProcess.h"
 #include "SQLiteStorageArea.h"
 #include "StorageAreaRegistry.h"
 #include <WebCore/SecurityOriginData.h>
 #include <wtf/FileSystem.h>
 
 namespace WebKit {
 
-// Suggested by https://www.w3.org/TR/webstorage/#disk-space
-constexpr unsigned localStorageQuotaInBytes = 5 * MB;
 constexpr auto s_fileSuffix = ".localstorage"_s;
 constexpr auto s_fileName = "localstorage.sqlite3"_s;
 
@@ -179,7 +178,7 @@ StorageAreaIdentifier LocalStorageManager::connectToLocalStorageArea(IPC::Connec
 {
     if (!m_localStorageArea) {
         if (!m_path.isEmpty())
-            m_localStorageArea = makeUnique<SQLiteStorageArea>(localStorageQuotaInBytes, origin, m_path, WTFMove(workQueue));
+            m_localStorageArea = makeUnique<SQLiteStorageArea>(NetworkProcess::localStorageQuota(), origin, m_path, WTFMove(workQueue));
         else
             m_localStorageArea = makeUnique<MemoryStorageArea>(origin, StorageAreaBase::StorageType::Local);
 
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
@@ -317,6 +317,8 @@ struct WebPageCreationParameters {
     WebCore::ContentSecurityPolicyModeForExtension contentSecurityPolicyModeForExtension { WebCore::ContentSecurityPolicyModeForExtension::None };
 
     std::optional<SubframeProcessPageParameters> subframeProcessPageParameters;
+    uint32_t localStorageQuota;
+
     std::optional<WebCore::FrameIdentifier> openerFrameIdentifier;
     std::optional<WebCore::FrameIdentifier> mainFrameIdentifier;
 
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
@@ -245,6 +245,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
     WebCore::ContentSecurityPolicyModeForExtension contentSecurityPolicyModeForExtension;
 
     std::optional<WebKit::SubframeProcessPageParameters> subframeProcessPageParameters;
+    uint32_t localStorageQuota;
+
     std::optional<WebCore::FrameIdentifier> openerFrameIdentifier;
     std::optional<WebCore::FrameIdentifier> mainFrameIdentifier;
 
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
@@ -86,6 +86,7 @@ enum {
     PROP_DOM_CACHE_DIRECTORY,
 #endif
     PROP_IS_EPHEMERAL,
+    PROP_LOCAL_STORAGE_QUOTA,
     PROP_ORIGIN_STORAGE_RATIO,
     PROP_TOTAL_STORAGE_RATIO
 };
@@ -118,6 +119,7 @@ struct _WebKitWebsiteDataManagerPrivate {
 
     gdouble originStorageRatio;
     gdouble totalStorageRatio;
+    unsigned localStorageQuota { 0 };
 };
 
 WEBKIT_DEFINE_FINAL_TYPE(WebKitWebsiteDataManager, webkit_website_data_manager, G_TYPE_OBJECT, GObject)
@@ -226,6 +228,10 @@ static void webkitWebsiteDataManagerSetProperty(GObject* object, guint propID, c
     case PROP_TOTAL_STORAGE_RATIO:
         manager->priv->totalStorageRatio = g_value_get_double(value);
         break;
+    case PROP_LOCAL_STORAGE_QUOTA:
+        manager->priv->localStorageQuota = g_value_get_uint(value);
+        WebProcessPool::setLocalStorageQuota(manager->priv->localStorageQuota);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
     }
@@ -493,6 +499,21 @@ static void webkit_website_data_manager_class_init(WebKitWebsiteDataManagerClass
             FALSE,
             static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
 
+     /**
+      * WebKitWebsiteDataManager:local-storage-quota:
+      *
+      * Quota for local storage (in bytes)
+      *
+      */
+     g_object_class_install_property(
+         gObjectClass,
+         PROP_LOCAL_STORAGE_QUOTA,
+         g_param_spec_uint("local-storage-quota",
+             _("Local storage quota"),
+             _("The maximum size of local storage in bytes"),
+             1, G_MAXUINT, 5 * 1024 * 1024,
+             static_cast<GParamFlags>(WEBKIT_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)));
+
     /**
      * WebKitWebsiteDataManager:origin-storage-ratio:
      *
@@ -555,6 +576,7 @@ WebKit::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteData
         if (priv->domCacheDirectory)
             configuration->setCacheStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->domCacheDirectory.get()));
 #endif
+        configuration->setLocalStorageQuota(priv->localStorageQuota);
         if (priv->originStorageRatio >= 0.0)
             configuration->setOriginQuotaRatio(priv->originStorageRatio);
 
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -10345,6 +10345,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
     parameters.hasResizableWindows = protectedPageClient()->hasResizableWindows();
 #endif
 
+    parameters.localStorageQuota = m_websiteDataStore->localStorageQuota();
+
 #if ENABLE(ADVANCED_PRIVACY_PROTECTIONS)
     parameters.linkDecorationFilteringData = LinkDecorationFilteringController::shared().cachedStrings();
     parameters.allowedQueryParametersForAdvancedPrivacyProtections = cachedAllowedQueryParametersForAdvancedPrivacyProtections();
diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
@@ -302,6 +302,7 @@ class WebProcessPool final
 
 #if USE(SOUP)
     static void setNetworkProcessMemoryPressureHandlerConfiguration(const std::optional<MemoryPressureHandler::Configuration>& configuration) { s_networkProcessMemoryPressureHandlerConfiguration = configuration; }
+    static void setLocalStorageQuota(unsigned quota) { s_localStorageQuota = quota; }
 #endif
     void setEnhancedAccessibility(bool);
     
@@ -734,6 +735,7 @@ class WebProcessPool final
 
 #if USE(SOUP)
     static std::optional<MemoryPressureHandler::Configuration> s_networkProcessMemoryPressureHandlerConfiguration;
+    static unsigned s_localStorageQuota;
 #endif
 
 #if PLATFORM(MAC)
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
@@ -439,6 +439,7 @@ class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataSt
     void setEmulatedConditions(std::optional<int64_t>&& bytesPerSecondLimit);
 #endif
 
+    unsigned localStorageQuota() const { return m_configuration->localStorageQuota(); }
     void addPage(WebPageProxy&);
     void removePage(WebPageProxy&);
 
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp
@@ -172,6 +172,7 @@ Ref<WebsiteDataStoreConfiguration> WebsiteDataStoreConfiguration::copy() const
 #if ENABLE(DECLARATIVE_WEB_PUSH)
     copy->m_isDeclarativeWebPushEnabled = this->m_isDeclarativeWebPushEnabled;
 #endif
+    copy-> m_localStorageQuota = this->m_localStorageQuota;
 
     return copy;
 }
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h
@@ -277,6 +277,9 @@ class WebsiteDataStoreConfiguration : public API::ObjectImpl<API::Object::Type::
     };
     const Directories& directories() const { return m_directories; }
 
+    unsigned localStorageQuota() const { return m_localStorageQuota; }
+    void setLocalStorageQuota(unsigned quota) { m_localStorageQuota = quota; }
+
 private:
     WebsiteDataStoreConfiguration(const String& baseCacheDirectory, const String& baseDataDirectory);
     static Ref<WebsiteDataStoreConfiguration> create(IsPersistent isPersistent, ShouldInitializePaths shouldInitializePaths) { return adoptRef(*new WebsiteDataStoreConfiguration(isPersistent, shouldInitializePaths)); }
@@ -335,6 +338,7 @@ class WebsiteDataStoreConfiguration : public API::ObjectImpl<API::Object::Type::
 #if PLATFORM(COCOA)
     RetainPtr<CFDictionaryRef> m_proxyConfiguration;
 #endif
+    unsigned m_localStorageQuota;
     Vector<size_t> m_memoryFootprintNotificationThresholds;
     std::optional<bool> m_defaultTrackingPreventionEnabledOverride;
 };
diff --git a/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp b/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp
@@ -37,11 +37,13 @@
 namespace WebKit {
 
 std::optional<MemoryPressureHandler::Configuration> WebProcessPool::s_networkProcessMemoryPressureHandlerConfiguration;
+unsigned WebProcessPool::s_localStorageQuota = 0;
 
 void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
 {
     parameters.languages = overrideLanguages().isEmpty() ? userPreferredLanguages() : overrideLanguages();
     parameters.memoryPressureHandlerConfiguration = s_networkProcessMemoryPressureHandlerConfiguration;
+    parameters.localStorageQuota = s_localStorageQuota;
 
 #if OS(LINUX)
     if (MemoryPressureMonitor::disabled())
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -1042,6 +1042,8 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
 #endif
 #endif // HAVE(SANDBOX_STATE_FLAGS)
 
+    m_page->settings().setLocalStorageQuota(parameters.localStorageQuota);
+
     updateThrottleState();
 #if ENABLE(ACCESSIBILITY_ANIMATION_CONTROL)
     updateImageAnimationEnabled();

Original file line number	Diff line number	Diff line change
`@@ -3072,7 +3072,7 @@ uint64_t Internals::storageAreaMapCount() const`
`3072`	`3072`	`if (!page)`
`3073`	`3073`	`return 0;`
`3074`	`3074`
`3075`		`- return page->storageNamespaceProvider().localStorageNamespace(page->sessionID()).storageAreaMapCountForTesting();`
	`3075`	`+ return page->storageNamespaceProvider().localStorageNamespace(page->settings().localStorageQuota(), page->sessionID()).storageAreaMapCountForTesting();`
`3076`	`3076`	`}`
`3077`	`3077`
`3078`	`3078`	`uint64_t Internals::elementIdentifier(Element& element) const`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@`
`50`	`50`	`namespace WebKit {`
`51`	`51`	`using namespace WebCore;`
`52`	`52`
	`53`	`+unsigned NetworkProcess::s_localStorageQuota = 5 * MB;`
	`54`	`+`
`53`	`55`	`static CString buildAcceptLanguages(const Vector<String>& languages)`
`54`	`56`	`{`
`55`	`57`	`size_t languagesCount = languages.size();`
`@@ -155,6 +157,8 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati`
`155`	`157`	`});`
`156`	`158`	`}`
`157`	`159`	`#endif`
	`160`	`+`
	`161`	`+ s_localStorageQuota = parameters.localStorageQuota;`
`158`	`162`	`}`
`159`	`163`
`160`	`164`	`void NetworkProcess::setIgnoreTLSErrors(PAL::SessionID sessionID, bool ignoreTLSErrors)`