Skip to content

[Site Isolation] WebKitTestRunner leaks isolated site records between tests and across runs #71663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szewai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Site Isolation] WebKitTestRunner leaks isolated site records between tests and across runs #71663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8378,7 +8378,8 @@ SiteIsolationEnabled:

SiteIsolationSharedProcessEnabled:
type: bool
status: unstable
status: internal
defaultsOverridable: true
category: security
humanReadableName: "Shared process for Site Isolation"
humanReadableDescription: "Put cross-site frames in a shared Web process"
Expand Down
10 changes: 10 additions & 0 deletions Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ void WKWebsiteDataStoreConfigurationSetServiceWorkerRegistrationDirectory(WKWebs
protect(WebKit::toImpl(configuration))->setServiceWorkerRegistrationDirectory(protect(WebKit::toImpl(directory))->string());
}

WKStringRef WKWebsiteDataStoreConfigurationCopyIsolatedSitesDirectory(WKWebsiteDataStoreConfigurationRef configuration)
{
return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->isolatedSitesDirectory());
}

void WKWebsiteDataStoreConfigurationSetIsolatedSitesDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory)
{
protect(WebKit::toImpl(configuration))->setIsolatedSitesDirectory(protect(WebKit::toImpl(directory))->string());
}

WKStringRef WKWebsiteDataStoreConfigurationCopyCookieStorageFile(WKWebsiteDataStoreConfigurationRef configuration)
{
return WebKit::toCopiedAPI(WebKit::toImpl(configuration)->cookieStorageFile());
Expand Down
3 changes: 3 additions & 0 deletions Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ WK_EXPORT void WKWebsiteDataStoreConfigurationSetResourceLoadStatisticsDirectory
WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyServiceWorkerRegistrationDirectory(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetServiceWorkerRegistrationDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);

WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyIsolatedSitesDirectory(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetIsolatedSitesDirectory(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef directory);

WK_EXPORT WKStringRef WKWebsiteDataStoreConfigurationCopyCookieStorageFile(WKWebsiteDataStoreConfigurationRef configuration);
WK_EXPORT void WKWebsiteDataStoreConfigurationSetCookieStorageFile(WKWebsiteDataStoreConfigurationRef configuration, WKStringRef cookieStorageFile);

Expand Down
3 changes: 2 additions & 1 deletion Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,8 @@ void WKWebsiteDataStoreClearStorage(WKWebsiteDataStoreRef dataStoreRef, void* co
WebKit::WebsiteDataType::FileSystem,
WebKit::WebsiteDataType::DOMCache,
WebKit::WebsiteDataType::Credentials,
WebKit::WebsiteDataType::ServiceWorkerRegistrations
WebKit::WebsiteDataType::ServiceWorkerRegistrations,
WebKit::WebsiteDataType::IsolatedSiteRecord
};
protect(WebKit::toImpl(dataStoreRef))->removeData(dataTypes, -WallTime::infinity(), [context, callback] {
if (callback)
Expand Down
1 change: 1 addition & 0 deletions Tools/WebKitTestRunner/TestController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,7 @@ void TestController::configureWebsiteDataStoreTemporaryDirectories(WKWebsiteData
WKWebsiteDataStoreConfigurationSetMediaKeysStorageDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "MediaKeys"_s, pathSeparator, randomNumber)).get());
WKWebsiteDataStoreConfigurationSetResourceLoadStatisticsDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "ResourceLoadStatistics"_s, pathSeparator, randomNumber)).get());
WKWebsiteDataStoreConfigurationSetServiceWorkerRegistrationDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "ServiceWorkers"_s, pathSeparator, randomNumber)).get());
WKWebsiteDataStoreConfigurationSetIsolatedSitesDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "IsolatedSites"_s, pathSeparator, randomNumber)).get());

@rniwa rniwa Aug 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want to delete this file afterwards?

WKWebsiteDataStoreConfigurationSetGeneralStorageDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "Default"_s, pathSeparator, randomNumber)).get());
WKWebsiteDataStoreConfigurationSetResourceMonitorThrottlerDirectory(configuration, toWK(makeString(temporaryFolder, pathSeparator, "ResourceMonitorThrottler"_s, pathSeparator, randomNumber)).get());
#if PLATFORM(WIN)
Expand Down