Gate CacheStorageRepresentation IPC behind AllowTestOnlyIPC

szewai · szewai · commit a90c33d29e3a · 2026-06-30T14:42:28.000-07:00
rdar://176915104 Reviewed by Per Arne Vollan. Add [EnabledBy=AllowTestOnlyIPC] so the generated dispatcher rejects this message outside of test configurations, matching other test-only endpoints such as GeneralStoragePathForTesting. * Source/WebKit/NetworkProcess/storage/NetworkStorageManager.messages.in: Originally-landed-as: 305413.938@safari-7624-branch (40dbe4d64205). rdar://180437831 Canonical link: https://commits.webkit.org/316201@main
diff --git a/LayoutTests/http/tests/cache-storage/cache-clearing-origin.https.html b/LayoutTests/http/tests/cache-storage/cache-clearing-origin.https.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ allowTestOnlyIPC=true ] -->
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/LayoutTests/http/tests/cache-storage/cache-origins.https.html b/LayoutTests/http/tests/cache-storage/cache-origins.https.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ allowTestOnlyIPC=true ] -->
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/LayoutTests/http/tests/cache-storage/cache-representation.https.html b/LayoutTests/http/tests/cache-storage/cache-representation.https.html
@@ -1,4 +1,4 @@
-<!-- webkit-test-runner [ useEphemeralSession=true ] -->
+<!-- webkit-test-runner [ useEphemeralSession=true allowTestOnlyIPC=true ] -->
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.messages.in b/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.messages.in
@@ -101,7 +101,7 @@
     CacheStorageRemoveRecords(WebCore::DOMCacheIdentifier cacheIdentifier, WebCore::ResourceRequest request, struct WebCore::CacheQueryOptions options) -> (WebCore::DOMCacheEngine::RecordIdentifiersOrError result)
     CacheStoragePutRecords(WebCore::DOMCacheIdentifier cacheIdentifier, Vector<WebCore::DOMCacheEngine::CrossThreadRecord> records) -> (WebCore::DOMCacheEngine::RecordIdentifiersOrError result)
     CacheStorageClearMemoryRepresentation(struct WebCore::ClientOrigin origin) -> ()
-    CacheStorageRepresentation() -> (String representation)
+    [EnabledBy=AllowTestOnlyIPC] CacheStorageRepresentation() -> (String representation)
 
     ResetQuotaUpdatedBasedOnUsageForTesting(struct WebCore::ClientOrigin origin)
 }
diff --git a/Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ServiceWorkerBasic.mm b/Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ServiceWorkerBasic.mm
@@ -2010,6 +2010,7 @@ - (void)userContentController:(WKUserContentController *)userContentController d
     [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
 
     RetainPtr configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [configuration _setAllowTestOnlyIPC:YES];
     setConfigurationInjectedBundlePath(configuration.get());
 
     RetainPtr<DirectoryPageMessageHandler> directoryPageMessageHandler = adoptNS([[DirectoryPageMessageHandler alloc] init]);
@@ -2055,6 +2056,7 @@ - (void)userContentController:(WKUserContentController *)userContentController d
     [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
 
     RetainPtr configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [configuration _setAllowTestOnlyIPC:YES];
     setConfigurationInjectedBundlePath(configuration.get());
     RetainPtr dataStoreConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]);
     NSString* tempDirectory = @"/var/tmp";
@@ -5259,6 +5261,7 @@ async function check()
     [[WKWebsiteDataStore defaultDataStore] _setResourceLoadStatisticsEnabled:NO];
 
     RetainPtr configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [configuration _setAllowTestOnlyIPC:YES];
 
     auto context = adoptWK(TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
     [configuration setProcessPool:(WKProcessPool *)context.get()];

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!-- webkit-test-runner [ allowTestOnlyIPC=true ] -->`
`1`	`2`	`<!DOCTYPE html>`
`2`	`3`	`<html>`
`3`	`4`	`<head>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- webkit-test-runner [ useEphemeralSession=true ] -->`
	`1`	`+<!-- webkit-test-runner [ useEphemeralSession=true allowTestOnlyIPC=true ] -->`
`2`	`2`	`<!DOCTYPE html>`
`3`	`3`	`<html>`
`4`	`4`	`<head>`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`CacheStorageRemoveRecords(WebCore::DOMCacheIdentifier cacheIdentifier, WebCore::ResourceRequest request, struct WebCore::CacheQueryOptions options) -> (WebCore::DOMCacheEngine::RecordIdentifiersOrError result)`
`102`	`102`	`CacheStoragePutRecords(WebCore::DOMCacheIdentifier cacheIdentifier, Vector<WebCore::DOMCacheEngine::CrossThreadRecord> records) -> (WebCore::DOMCacheEngine::RecordIdentifiersOrError result)`
`103`	`103`	`CacheStorageClearMemoryRepresentation(struct WebCore::ClientOrigin origin) -> ()`
`104`		`- CacheStorageRepresentation() -> (String representation)`
	`104`	`+ [EnabledBy=AllowTestOnlyIPC] CacheStorageRepresentation() -> (String representation)`
`105`	`105`
`106`	`106`	`ResetQuotaUpdatedBasedOnUsageForTesting(struct WebCore::ClientOrigin origin)`
`107`	`107`	`}`