Make requestStorageAccess return NoModificationAllowedError until fra…

…me is reloaded https://bugs.webkit.org/show_bug.cgi?id=269108 rdar://122676929 Reviewed by Alex Christensen. Add a feature flag to make requestStorageAccess return NoModificationAllowedError on granted request until frame is reloaded, to faciliate testing behavior change on requestStorageAccess when site isolation is enabled. Test: http/tests/storageAccess/request-throw-exception-on-grant-until-reload.html * LayoutTests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload-expected.txt: Added. * LayoutTests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload.html: Added. * LayoutTests/http/tests/storageAccess/resources/request-throw-exception-on-grant-until-reload-iframe.html: Added. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/dom/DocumentStorageAccess.cpp: (WebCore::DocumentStorageAccess::requestStorageAccess): (WebCore::DocumentStorageAccess::requestStorageAccessQuirk): * Source/WebCore/dom/DocumentStorageAccess.h: * Source/WebCore/page/Quirks.h: * Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h: * Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp: (WebKit::WebResourceLoadStatisticsStore::requestStorageAccess): (WebKit::WebResourceLoadStatisticsStore::grantStorageAccess): (WebKit::WebResourceLoadStatisticsStore::grantStorageAccessEphemeral): (WebKit::WebResourceLoadStatisticsStore::grantStorageAccessInStorageSession): (WebKit::WebResourceLoadStatisticsStore::recordFrameLoadForStorageAccess): (WebKit::WebResourceLoadStatisticsStore::clearFrameLoadRecordsForStorageAccess): (WebKit::WebResourceLoadStatisticsStore::storageAccessWasGrantedValueForFrame): * Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h: * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad): (WebKit::NetworkConnectionToWebProcess::clearFrameLoadRecordsForStorageAccess): * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h: * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in: * Source/WebKit/NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::removeWebPageNetworkParameters): * Source/WebKit/NetworkProcess/NetworkProcess.h: * Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp: (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters): * Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h: * Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.serialization.in: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/UIProcess/Network/NetworkProcessProxy.h: * Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess): * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h: * Source/WebKit/WebProcess/WebProcess.cpp: (WebKit::WebProcess::removeWebFrame): * Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: * Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp: (WTR::TestRunner::setRequestStorageAccessThrowsExceptionUntilReload): * Tools/WebKitTestRunner/InjectedBundle/TestRunner.h: * Tools/WebKitTestRunner/TestController.cpp: (WTR::TestController::setRequestStorageAccessThrowsExceptionUntilReload): * Tools/WebKitTestRunner/TestController.h: * Tools/WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle): Canonical link: https://commits.webkit.org/274636@main
WebKit · Feb 14, 2024 · 65461aa · 65461aa
1 parent c76ab28
commit 65461aa
Show file tree

Hide file tree

Showing 29 changed files with 290 additions and 25 deletions.
diff --git a/...Tests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload-expected.txt b/...Tests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload-expected.txt
@@ -0,0 +1,11 @@
+Tests that requestStorageAccess throws exception on cross-site iframe until iframe is reloaded
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS requestStorageAccess result: NoModificationAllowedError
+PASS requestStorageAccess result: Granted
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload.html b/LayoutTests/http/tests/storageAccess/request-throw-exception-on-grant-until-reload.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/js-test-resources/js-test.js"></script>
+    <script src="/js-test-resources/ui-helper.js"></script>
+    <script src="/resourceLoadStatistics/resources/util.js"></script>
+    <script>
+        description("Tests that requestStorageAccess throws exception on cross-site iframe until iframe is reloaded");
+        jsTestIsAsync = true;
+        testEnded = false;
+        testStarted = false;
+
+        function endTest() {
+            if (testEnded)
+                return;
+
+            testEnded = true;
+            testRunner.setRequestStorageAccessThrowsExceptionUntilReload(false);
+            setEnableFeature(false, finishJSTest);
+        }
+
+        function receiveMessage(event) {
+            if (event.origin !== "http://localhost:8000") {
+                testFailed("Unexpected origin: " + event.origin);
+                endTest();
+                return;
+            }
+
+            if (event.data == "NoModificationAllowedError") {
+                testPassed("requestStorageAccess result: " + event.data);
+                return;
+            }
+
+            if (event.data == "Done") {
+                testPassed("requestStorageAccess result: Granted");
+                endTest();
+                return;
+            }
+
+            testFailed("Unexpected message: " + event.data);
+            endTest();
+        }
+
+        function activateElement(elementId) {
+            var element = document.getElementById(elementId);
+            var centerX = element.offsetLeft + element.offsetWidth / 2;
+            var centerY = element.offsetTop + element.offsetHeight / 2;
+            UIHelper.activateAt(centerX, centerY).then(() => {
+                if (window.eventSender)
+                    eventSender.keyDown("escape");
+                else {
+                    testFailed("eventSender is missing");
+                    endTest();
+                }
+            }).catch(() => {
+                testFailed("activateAt failed");
+                endTest();
+            });
+        }
+
+        function frameLoaded() {
+            if (!testStarted) {
+                setEnableFeature(true, function() {
+                    activateElement("TheIframeThatRequestsStorageAccess");
+                });
+                return;
+            }
+
+            testStarted = true;
+            activateElement("TheIframeThatRequestsStorageAccess");
+        }
+
+        window.addEventListener("message", receiveMessage, false);
+        if (window.testRunner)
+            testRunner.setRequestStorageAccessThrowsExceptionUntilReload(true);
+    </script>
+</head>
+<body>
+    <iframe sandbox="allow-storage-access-by-user-activation allow-scripts allow-same-origin allow-modals" onload="frameLoaded()" id="TheIframeThatRequestsStorageAccess" src="http://localhost:8000/storageAccess/resources/request-throw-exception-on-grant-until-reload-iframe.html"></iframe>
+</body>
+</html>
diff --git a/...p/tests/storageAccess/resources/request-throw-exception-on-grant-until-reload-iframe.html b/...p/tests/storageAccess/resources/request-throw-exception-on-grant-until-reload-iframe.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+    <script>
+        function messageToTop(message) {
+            top.postMessage(message, "http://127.0.0.1:8000");
+        }
+
+        function performStorageAccessRequest() {
+            document.requestStorageAccess().then(() => {
+                messageToTop("Done");
+            }).catch((error) => {
+                if (!error) {
+                    messageToTop("None");
+                    return;
+                }
+
+                messageToTop(error.name);
+                if (!window.location.hash && error.name == "NoModificationAllowedError") 
+                    location.reload();
+            });
+        }
+    </script>
+</head>
+<body onclick="performStorageAccessRequest()">
+</html>
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -5559,6 +5559,20 @@ RequestIdleCallbackEnabled:
     WebCore:
       default: false
 
+RequestStorageAccessThrowsExceptionUntilReload:
+  type: bool
+  status: unstable
+  category: dom
+  humanReadableName: "requestStorageAccess throws execption until reload"
+  humanReadableDescription: "requestStorageAccess throws execption until reload"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
 RequestSubmitEnabled:
   type: bool
   status: stable

diff --git a/Source/WebCore/dom/DocumentStorageAccess.cpp b/Source/WebCore/dom/DocumentStorageAccess.cpp
@@ -202,7 +202,15 @@ void DocumentStorageAccess::requestStorageAccess(Ref<DeferredPromise>&& promise)
             return;
 
         // Consume the user gesture only if the user explicitly denied access.
-        bool shouldPreserveUserGesture = result.wasGranted == StorageAccessWasGranted::Yes || result.promptWasShown == StorageAccessPromptWasShown::No;
+        bool shouldPreserveUserGesture;
+        switch (result.wasGranted) {
+        case StorageAccessWasGranted::Yes:
+        case StorageAccessWasGranted::YesWithException:
+            shouldPreserveUserGesture = true;
+            break;
+        case StorageAccessWasGranted::No:
+            shouldPreserveUserGesture = result.promptWasShown == StorageAccessPromptWasShown::No;
+        }
 
         if (shouldPreserveUserGesture) {
             protectedDocument()->eventLoop().queueMicrotask([this, weakThis] {
@@ -211,9 +219,14 @@ void DocumentStorageAccess::requestStorageAccess(Ref<DeferredPromise>&& promise)
             });
         }
 
-        if (result.wasGranted == StorageAccessWasGranted::Yes)
+        switch (result.wasGranted) {
+        case StorageAccessWasGranted::Yes:
             promise->resolve();
-        else {
+            break;
+        case StorageAccessWasGranted::YesWithException:
+            promise->reject(ExceptionCode::NoModificationAllowedError);
+            break;
+        case StorageAccessWasGranted::No:
             if (result.promptWasShown == StorageAccessPromptWasShown::Yes)
                 setWasExplicitlyDeniedFrameSpecificStorageAccess();
             promise->reject();
@@ -285,9 +298,12 @@ void DocumentStorageAccess::requestStorageAccessQuirk(RegistrableDomain&& reques
             });
         }
 
-        if (result.wasGranted == StorageAccessWasGranted::Yes)
+        switch (result.wasGranted) {
+        case StorageAccessWasGranted::Yes:
+        case StorageAccessWasGranted::YesWithException:
             completionHandler(StorageAccessWasGranted::Yes);
-        else {
+            break;
+        case StorageAccessWasGranted::No:
             if (result.promptWasShown == StorageAccessPromptWasShown::Yes)
                 setWasExplicitlyDeniedFrameSpecificStorageAccess();
             completionHandler(StorageAccessWasGranted::No);

diff --git a/Source/WebCore/dom/DocumentStorageAccess.h b/Source/WebCore/dom/DocumentStorageAccess.h
@@ -36,7 +36,7 @@ class Document;
 class UserGestureIndicator;
 class WeakPtrImplWithEventTargetData;
 
-enum class StorageAccessWasGranted : bool { No, Yes };
+enum class StorageAccessWasGranted : uint8_t { No, Yes, YesWithException };
 
 enum class StorageAccessPromptWasShown : bool { No, Yes };
 

diff --git a/Source/WebCore/page/Quirks.h b/Source/WebCore/page/Quirks.h
@@ -45,7 +45,7 @@ class SecurityOriginData;
 class WeakPtrImplWithEventTargetData;
 
 enum class IsSyntheticClick : bool;
-enum class StorageAccessWasGranted : bool;
+enum class StorageAccessWasGranted : uint8_t;
 
 class Quirks {
     WTF_MAKE_NONCOPYABLE(Quirks); WTF_MAKE_FAST_ALLOCATED;

diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h
@@ -44,7 +44,7 @@ class KeyedDecoder;
 class KeyedEncoder;
 class SQLiteStatement;
 enum class StorageAccessPromptWasShown : bool;
-enum class StorageAccessWasGranted : bool;
+enum class StorageAccessWasGranted : uint8_t;
 struct ResourceLoadStatistics;
 }
 

diff --git a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
@@ -452,7 +452,7 @@ void WebResourceLoadStatisticsStore::requestStorageAccess(RegistrableDomain&& su
             }
             return;
         case StorageAccessStatus::HasAccess:
-            completionHandler({ StorageAccessWasGranted::Yes, StorageAccessPromptWasShown::No, scope, topFrameDomain, subFrameDomain });
+            completionHandler({ storageAccessWasGrantedValueForFrame(frameID, subFrameDomain), StorageAccessPromptWasShown::No, scope, topFrameDomain, subFrameDomain });
             return;
         }
     };
@@ -525,16 +525,21 @@ void WebResourceLoadStatisticsStore::requestStorageAccessUnderOpenerEphemeral(Re
 void WebResourceLoadStatisticsStore::grantStorageAccess(RegistrableDomain&& subFrameDomain, RegistrableDomain&& topFrameDomain, FrameIdentifier frameID, PageIdentifier pageID, StorageAccessPromptWasShown promptWasShown, StorageAccessScope scope, CompletionHandler<void(RequestStorageAccessResult)>&& completionHandler)
 {
     ASSERT(RunLoop::isMain());
-    postTask([this, subFrameDomain = WTFMove(subFrameDomain).isolatedCopy(), topFrameDomain = WTFMove(topFrameDomain).isolatedCopy(), frameID, pageID, promptWasShown, scope, completionHandler = WTFMove(completionHandler)]() mutable {
+    postTask([this, weakStore = ThreadSafeWeakPtr { *this }, subFrameDomain = WTFMove(subFrameDomain).isolatedCopy(), topFrameDomain = WTFMove(topFrameDomain).isolatedCopy(), frameID, pageID, promptWasShown, scope, completionHandler = WTFMove(completionHandler)]() mutable {
         if (!m_statisticsStore) {
             postTaskReply([subFrameDomain = WTFMove(subFrameDomain).isolatedCopy(), topFrameDomain = WTFMove(topFrameDomain).isolatedCopy(), promptWasShown, scope, completionHandler = WTFMove(completionHandler)]() mutable {
                 completionHandler({ StorageAccessWasGranted::No, promptWasShown, scope, topFrameDomain, subFrameDomain });
             });
             return;
         }
 
-        m_statisticsStore->grantStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID, pageID, promptWasShown, scope, [subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), promptWasShown, scope, completionHandler = WTFMove(completionHandler)](StorageAccessWasGranted wasGrantedAccess) mutable {
-            postTaskReply([subFrameDomain = WTFMove(subFrameDomain).isolatedCopy(), topFrameDomain = WTFMove(topFrameDomain).isolatedCopy(), wasGrantedAccess, promptWasShown, scope, completionHandler = WTFMove(completionHandler)]() mutable {
+        m_statisticsStore->grantStorageAccess(WTFMove(subFrameDomain), WTFMove(topFrameDomain), frameID, pageID, promptWasShown, scope, [weakStore = WTFMove(weakStore), frameID, subFrameDomain = subFrameDomain.isolatedCopy(), topFrameDomain = topFrameDomain.isolatedCopy(), promptWasShown, scope, completionHandler = WTFMove(completionHandler)](StorageAccessWasGranted wasGrantedAccess) mutable {
+            postTaskReply([weakStore = WTFMove(weakStore), frameID, subFrameDomain = WTFMove(subFrameDomain).isolatedCopy(), topFrameDomain = WTFMove(topFrameDomain).isolatedCopy(), wasGrantedAccess, promptWasShown, scope, completionHandler = WTFMove(completionHandler)]() mutable {
+                RefPtr store { weakStore.get() };
+                if (store && wasGrantedAccess == StorageAccessWasGranted::Yes) {
+                    completionHandler({ store->storageAccessWasGrantedValueForFrame(frameID, subFrameDomain), promptWasShown, scope, topFrameDomain, subFrameDomain });
+                    return;
+                }
                 completionHandler({ wasGrantedAccess, promptWasShown, scope, topFrameDomain, subFrameDomain });
             });
         });
@@ -548,7 +553,7 @@ void WebResourceLoadStatisticsStore::grantStorageAccessEphemeral(const Registrab
     if (m_networkSession) {
         if (auto* storageSession = m_networkSession->networkStorageSession()) {
             storageSession->grantStorageAccess(subFrameDomain, topFrameDomain, frameID, pageID);
-            completionHandler({ StorageAccessWasGranted::Yes, promptWasShown, scope, topFrameDomain, subFrameDomain });
+            completionHandler({ storageAccessWasGrantedValueForFrame(frameID, subFrameDomain), promptWasShown, scope, topFrameDomain, subFrameDomain });
             return;
         }
     }
@@ -569,7 +574,13 @@ StorageAccessWasGranted WebResourceLoadStatisticsStore::grantStorageAccessInStor
         }
     }
 
-    return isStorageGranted ? StorageAccessWasGranted::Yes : StorageAccessWasGranted::No;
+    if (!isStorageGranted)
+        return StorageAccessWasGranted::No;
+
+    if (!frameID)
+        return StorageAccessWasGranted::Yes;
+
+    return storageAccessWasGrantedValueForFrame(*frameID, resourceDomain);
 }
 
 void WebResourceLoadStatisticsStore::callGrantStorageAccessHandler(const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, std::optional<FrameIdentifier> frameID, PageIdentifier pageID, StorageAccessScope scope, CompletionHandler<void(StorageAccessWasGranted)>&& completionHandler)
@@ -1551,4 +1562,43 @@ void WebResourceLoadStatisticsStore::insertExpiredStatisticForTesting(Registrabl
     });
 }
 
+void WebResourceLoadStatisticsStore::recordFrameLoadForStorageAccess(WebPageProxyIdentifier webPageProxyID, WebCore::FrameIdentifier frameID, const WebCore::RegistrableDomain& domain)
+{
+    auto currentTime = WallTime::now();
+    StorageAccessRequestRecordKey key { frameID, domain };
+    auto& recordValue = m_storageAccessRequestRecords.ensure(key, [&]() {
+        return StorageAccessRequestRecordValue { webPageProxyID, { }, currentTime };
+    }).iterator->value;
+    ASSERT(recordValue.webPageProxyID == webPageProxyID);
+    recordValue.lastLoadTime = currentTime;
+}
+
+void WebResourceLoadStatisticsStore::clearFrameLoadRecordsForStorageAccess(WebCore::FrameIdentifier frameID)
+{
+    m_storageAccessRequestRecords.removeIf([&](auto& record) {
+        return record.key.first == frameID;
+    });
+}
+
+void WebResourceLoadStatisticsStore::clearFrameLoadRecordsForStorageAccess(WebPageProxyIdentifier webPageProxyID)
+{
+    m_storageAccessRequestRecords.removeIf([&](auto& record) {
+        return record.value.webPageProxyID == webPageProxyID;
+    });
+}
+
+StorageAccessWasGranted WebResourceLoadStatisticsStore::storageAccessWasGrantedValueForFrame(WebCore::FrameIdentifier frameID, const WebCore::RegistrableDomain& domain)
+{
+    StorageAccessRequestRecordKey key { frameID, domain };
+    auto iter = m_storageAccessRequestRecords.find(key);
+    if (iter == m_storageAccessRequestRecords.end())
+        return StorageAccessWasGranted::Yes;
+
+    auto& value = iter->value;
+    if (!value.lastRequestTime)
+        value.lastRequestTime = WallTime::now();
+
+    return value.lastRequestTime.value() < value.lastLoadTime ? StorageAccessWasGranted::Yes : StorageAccessWasGranted::YesWithException;
+}
+
 } // namespace WebKit
diff --git a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h
@@ -93,7 +93,7 @@ struct RegistrableDomainsToDeleteOrRestrictWebsiteDataFor {
     bool isEmpty() const { return domainsToDeleteAllCookiesFor.isEmpty() && domainsToDeleteAllButHttpOnlyCookiesFor.isEmpty() && domainsToDeleteAllScriptWrittenStorageFor.isEmpty() && domainsToEnforceSameSiteStrictFor.isEmpty(); }
 };
 
-class WebResourceLoadStatisticsStore final : public ThreadSafeRefCounted<WebResourceLoadStatisticsStore, WTF::DestructionThread::Main> {
+class WebResourceLoadStatisticsStore final : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<WebResourceLoadStatisticsStore, WTF::DestructionThread::Main> {
 public:
     using ResourceLoadStatistics = WebCore::ResourceLoadStatistics;
     using RegistrableDomain = WebCore::RegistrableDomain;
@@ -221,6 +221,9 @@ class WebResourceLoadStatisticsStore final : public ThreadSafeRefCounted<WebReso
 
     bool isEphemeral() const { return m_isEphemeral == WebCore::ResourceLoadStatistics::IsEphemeral::Yes; };
     void insertExpiredStatisticForTesting(RegistrableDomain&&, unsigned numberOfOperatingDaysPassed, bool hadUserInteraction, bool isScheduledForAllButCookieDataRemoval, bool isPrevalent, CompletionHandler<void()>&&);
+    void recordFrameLoadForStorageAccess(WebPageProxyIdentifier, WebCore::FrameIdentifier, const WebCore::RegistrableDomain&);
+    void clearFrameLoadRecordsForStorageAccess(WebCore::FrameIdentifier);
+    void clearFrameLoadRecordsForStorageAccess(WebPageProxyIdentifier);
 
 private:
     explicit WebResourceLoadStatisticsStore(NetworkSession&, const String&, ShouldIncludeLocalhost, WebCore::ResourceLoadStatistics::IsEphemeral);
@@ -242,6 +245,7 @@ class WebResourceLoadStatisticsStore final : public ThreadSafeRefCounted<WebReso
     StorageAccessStatus storageAccessStatus(const String& subFramePrimaryDomain, const String& topFramePrimaryDomain);
 
     void destroyResourceLoadStatisticsStore(CompletionHandler<void()>&&);
+    StorageAccessWasGranted storageAccessWasGrantedValueForFrame(WebCore::FrameIdentifier, const WebCore::RegistrableDomain&);
 
     WeakPtr<NetworkSession> m_networkSession;
     Ref<SuspendableWorkQueue> m_statisticsQueue;
@@ -256,8 +260,15 @@ class WebResourceLoadStatisticsStore final : public ThreadSafeRefCounted<WebReso
     HashMap<TopFrameDomain, SubResourceDomain> m_domainsWithCrossPageStorageAccessQuirk;
 
     bool m_hasScheduledProcessStats { false };
-
     bool m_firstNetworkProcessCreated { false };
+
+    struct StorageAccessRequestRecordValue {
+        WebPageProxyIdentifier webPageProxyID;
+        Markable<WallTime> lastRequestTime;
+        WallTime lastLoadTime;
+    };
+    using StorageAccessRequestRecordKey = std::pair<WebCore::FrameIdentifier, RegistrableDomain>;
+    HashMap<StorageAccessRequestRecordKey, StorageAccessRequestRecordValue> m_storageAccessRequestRecords;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -568,6 +568,13 @@ void NetworkConnectionToWebProcess::scheduleResourceLoad(NetworkResourceLoadPara
             CONNECTION_RELEASE_LOG_ERROR(Loading, "scheduleResourceLoad: Could not find network session of existing NetworkResourceLoader to resume, will do a fresh load");
     }
 
+    if (loadParameters.shouldRecordFrameLoadForStorageAccess && loadParameters.mainResourceNavigationDataForAnyFrame) {
+        if (auto* session = networkSession()) {
+            if (auto* resourceLoadStatistics = session->resourceLoadStatistics())
+                resourceLoadStatistics->recordFrameLoadForStorageAccess(loadParameters.webPageProxyID, loadParameters.webFrameID, RegistrableDomain { loadParameters.request.url() });
+        }
+    }
+
     auto& loader = m_networkResourceLoaders.add(identifier, NetworkResourceLoader::create(WTFMove(loadParameters), *this)).iterator->value;
 
     loader->startWithServiceWorker();
@@ -1580,6 +1587,14 @@ void NetworkConnectionToWebProcess::destroyWebTransportSession(WebTransportSessi
     m_networkTransportSessions.remove(identifier);
 }
 
+void NetworkConnectionToWebProcess::clearFrameLoadRecordsForStorageAccess(WebCore::FrameIdentifier frameID)
+{
+    if (auto* session = networkSession()) {
+        if (auto* resourceLoadStatistics = session->resourceLoadStatistics())
+            resourceLoadStatistics->clearFrameLoadRecordsForStorageAccess(frameID);
+    }
+}
+
 } // namespace WebKit
 
 #undef CONNECTION_RELEASE_LOG