- Revision
- 294469
- Author
- [email protected]
- Date
- 2022-05-18 23:24:56 -0700 (Wed, 18 May 2022)
Log Message
Move directories from WebProcessPool to WebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=240609
Reviewed by Chris Dumez.
Moving directories out of WebProcessPool because WebsiteDataStore usually decides where to store things. It is confusing
in current implementation that WebsiteDataStore gets the paths from WebProcessPool, and then WebProcessPool query paths
from WebsiteDataStore.
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::cacheDirectoryInContainerOrHomeDirectory): Deleted.
(WebKit::WebProcessPool::cookieStorageDirectory): Deleted.
(WebKit::WebProcessPool::parentBundleDirectory): Deleted.
(WebKit::WebProcessPool::networkingCachesDirectory): Deleted.
(WebKit::WebProcessPool::webContentCachesDirectory): Deleted.
(WebKit::WebProcessPool::containerTemporaryDirectory): Deleted.
* Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:
(WebKit::gpuProcessCachesDirectory):
(WebKit::GPUProcessProxy::GPUProcessProxy):
* Source/WebKit/UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::webProcessDataStoreParameters):
* Source/WebKit/UIProcess/WebProcessPool.h:
* Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
(WebKit::WebsiteDataStore::cacheDirectoryInContainerOrHomeDirectory):
(WebKit::WebsiteDataStore::cookieStorageDirectory):
(WebKit::WebsiteDataStore::containerCachesDirectory):
(WebKit::WebsiteDataStore::parentBundleDirectory):
(WebKit::WebsiteDataStore::networkingCachesDirectory):
(WebKit::WebsiteDataStore::containerTemporaryDirectory):
* Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
(WebKit::WebsiteDataStore::parameters):
* Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:
(WebKit::WebsiteDataStore::cookieStorageDirectory const): Deleted.
(WebKit::WebsiteDataStore::containerCachesDirectory const): Deleted.
(WebKit::WebsiteDataStore::containerTemporaryDirectory const): Deleted.
Canonical link: https://commits.webkit.org/250731@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-05-19 06:24:56 UTC (rev 294469)
@@ -263,24 +263,6 @@
#endif
}
-#if PLATFORM(IOS_FAMILY)
-String WebProcessPool::cacheDirectoryInContainerOrHomeDirectory(const String& subpath)
-{
- String path = pathForProcessContainer();
- if (path.isEmpty())
- path = NSHomeDirectory();
-
- path = path + subpath;
- path = stringByResolvingSymlinksInPath(path);
- return path;
-}
-
-String WebProcessPool::cookieStorageDirectory()
-{
- return cacheDirectoryInContainerOrHomeDirectory("/Library/Cookies"_s);
-}
-#endif
-
void WebProcessPool::platformResolvePathsForSandboxExtensions()
{
m_resolvedPaths.uiProcessBundleResourcePath = resolvePathForSandboxExtension(String { [[NSBundle mainBundle] resourcePath] });
@@ -482,47 +464,6 @@
}
#if PLATFORM(IOS_FAMILY)
-String WebProcessPool::parentBundleDirectory()
-{
- return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
-}
-
-String WebProcessPool::networkingCachesDirectory()
-{
- String path = cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.Networking/"_s);
-
- NSError *error = nil;
- NSString* nsPath = path;
- if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
- NSLog(@"could not create networking caches directory \"%@\", error %@", nsPath, error);
- return String();
- }
-
- return path;
-}
-
-String WebProcessPool::webContentCachesDirectory()
-{
- String path = cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.WebContent/"_s);
-
- NSError *error = nil;
- NSString* nsPath = path;
- if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
- NSLog(@"could not create web content caches directory \"%@\", error %@", nsPath, error);
- return String();
- }
-
- return path;
-}
-
-String WebProcessPool::containerTemporaryDirectory()
-{
- String path = NSTemporaryDirectory();
- return stringByResolvingSymlinksInPath(path);
-}
-#endif
-
-#if PLATFORM(IOS_FAMILY)
void WebProcessPool::setJavaScriptConfigurationFileEnabledFromDefaults()
{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
Modified: trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2022-05-19 06:24:56 UTC (rev 294469)
@@ -106,7 +106,7 @@
#if USE(SANDBOX_EXTENSIONS_FOR_CACHE_AND_TEMP_DIRECTORY_ACCESS)
static String gpuProcessCachesDirectory()
{
- String path = WebProcessPool::cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.GPU/"_s);
+ String path = WebsiteDataStore::cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.GPU/"_s);
FileSystem::makeAllDirectories(path);
@@ -142,7 +142,7 @@
#if USE(SANDBOX_EXTENSIONS_FOR_CACHE_AND_TEMP_DIRECTORY_ACCESS)
auto containerCachesDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(gpuProcessCachesDirectory());
- auto containerTemporaryDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::containerTemporaryDirectory());
+ auto containerTemporaryDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebsiteDataStore::containerTemporaryDirectory());
if (!containerCachesDirectory.isEmpty()) {
if (auto handle = SandboxExtension::createHandleWithoutResolvingPath(containerCachesDirectory, SandboxExtension::Type::ReadWrite))
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-05-19 06:24:56 UTC (rev 294469)
@@ -761,14 +761,14 @@
#if PLATFORM(IOS_FAMILY)
std::optional<SandboxExtension::Handle> cookieStorageDirectoryExtensionHandle;
- if (auto& directory = websiteDataStore.cookieStorageDirectory(); !directory.isEmpty())
- cookieStorageDirectoryExtensionHandle = SandboxExtension::createHandleWithoutResolvingPath(directory, SandboxExtension::Type::ReadWrite);
+ if (auto directory = websiteDataStore.cookieStorageDirectory(); !directory.isEmpty())
+ cookieStorageDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(directory);
std::optional<SandboxExtension::Handle> containerCachesDirectoryExtensionHandle;
- if (auto& directory = websiteDataStore.containerCachesDirectory(); !directory.isEmpty())
- containerCachesDirectoryExtensionHandle = SandboxExtension::createHandleWithoutResolvingPath(directory, SandboxExtension::Type::ReadWrite);
+ if (auto directory = websiteDataStore.containerCachesDirectory(); !directory.isEmpty())
+ containerCachesDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(directory);
std::optional<SandboxExtension::Handle> containerTemporaryDirectoryExtensionHandle;
- if (auto& directory = websiteDataStore.containerTemporaryDirectory(); !directory.isEmpty())
- containerTemporaryDirectoryExtensionHandle = SandboxExtension::createHandleWithoutResolvingPath(directory, SandboxExtension::Type::ReadWrite);
+ if (auto directory = WebsiteDataStore::containerTemporaryDirectory(); !directory.isEmpty())
+ containerTemporaryDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(directory);
#endif
return WebProcessDataStoreParameters {
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2022-05-19 06:24:56 UTC (rev 294469)
@@ -512,15 +512,6 @@
static void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
static Vector<String> urlSchemesWithCustomProtocolHandlers();
-#if PLATFORM(IOS_FAMILY)
- static String cacheDirectoryInContainerOrHomeDirectory(const String& subpath);
- static String cookieStorageDirectory();
- static String parentBundleDirectory();
- static String networkingCachesDirectory();
- static String webContentCachesDirectory();
- static String containerTemporaryDirectory();
-#endif
-
Ref<WebProcessProxy> createNewWebProcess(WebsiteDataStore*, WebProcessProxy::CaptivePortalMode, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No, WebCore::CrossOriginMode = WebCore::CrossOriginMode::Shared);
bool hasAudibleMediaActivity() const { return !!m_audibleMediaActivity; }
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2022-05-19 06:24:56 UTC (rev 294469)
@@ -629,4 +629,63 @@
return !internalFeatureEnabled(WebPreferencesKey::useGeneralDirectoryForStorageKey(), true);
}
+#if PLATFORM(IOS_FAMILY)
+
+String WebsiteDataStore::cacheDirectoryInContainerOrHomeDirectory(const String& subpath)
+{
+ String path = pathForProcessContainer();
+ if (path.isEmpty())
+ path = NSHomeDirectory();
+
+ path = path + subpath;
+ path = stringByResolvingSymlinksInPath(path);
+ return path;
}
+
+String WebsiteDataStore::cookieStorageDirectory()
+{
+ return cacheDirectoryInContainerOrHomeDirectory("/Library/Cookies"_s);
+}
+
+String WebsiteDataStore::containerCachesDirectory()
+{
+ String path = cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.WebContent/"_s);
+
+ NSError *error = nil;
+ NSString* nsPath = path;
+ if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
+ NSLog(@"could not create web content caches directory \"%@\", error %@", nsPath, error);
+ return String();
+ }
+
+ return path;
+}
+
+String WebsiteDataStore::parentBundleDirectory()
+{
+ return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
+}
+
+String WebsiteDataStore::networkingCachesDirectory()
+{
+ String path = cacheDirectoryInContainerOrHomeDirectory("/Library/Caches/com.apple.WebKit.Networking/"_s);
+
+ NSError *error = nil;
+ NSString* nsPath = path;
+ if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
+ NSLog(@"could not create networking caches directory \"%@\", error %@", nsPath, error);
+ return String();
+ }
+
+ return path;
+}
+
+String WebsiteDataStore::containerTemporaryDirectory()
+{
+ String path = NSTemporaryDirectory();
+ return stringByResolvingSymlinksInPath(path);
+}
+
+#endif
+
+}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2022-05-19 06:24:56 UTC (rev 294469)
@@ -299,13 +299,6 @@
if (!m_configuration->modelElementCacheDirectory().isEmpty())
m_resolvedConfiguration->setModelElementCacheDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->modelElementCacheDirectory()));
#endif
-#if PLATFORM(IOS_FAMILY)
- if (isPersistent()) {
- m_cookieStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::cookieStorageDirectory());
- m_containerCachesDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::webContentCachesDirectory());
- m_containerTemporaryDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::containerTemporaryDirectory());
- }
-#endif
// Resolve directories for file paths.
if (!m_configuration->cookieStorageFile().isEmpty()) {
@@ -1928,12 +1921,12 @@
#if PLATFORM(IOS_FAMILY)
if (isPersistent()) {
- if (String cookieStorageDirectory = WebProcessPool::cookieStorageDirectory(); !cookieStorageDirectory.isEmpty())
- parameters.cookieStorageDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(cookieStorageDirectory);
- if (String containerCachesDirectory = WebProcessPool::networkingCachesDirectory(); !containerCachesDirectory.isEmpty())
- parameters.containerCachesDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory);
- if (String parentBundleDirectory = WebProcessPool::parentBundleDirectory(); !parentBundleDirectory.isEmpty())
- parameters.parentBundleDirectoryExtensionHandle = SandboxExtension::createHandle(parentBundleDirectory, SandboxExtension::Type::ReadOnly);
+ if (auto directory = cookieStorageDirectory(); !directory.isEmpty())
+ parameters.cookieStorageDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(directory);
+ if (auto directory = networkingCachesDirectory(); !directory.isEmpty())
+ parameters.containerCachesDirectoryExtensionHandle = SandboxExtension::createHandleForReadWriteDirectory(directory);
+ if (auto directory = parentBundleDirectory(); !directory.isEmpty())
+ parameters.parentBundleDirectoryExtensionHandle = SandboxExtension::createHandle(directory, SandboxExtension::Type::ReadOnly);
if (auto handleAndFilePath = SandboxExtension::createHandleForTemporaryFile(emptyString(), SandboxExtension::Type::ReadWrite))
parameters.tempDirectoryExtensionHandle = WTFMove(handleAndFilePath->first);
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (294468 => 294469)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2022-05-19 05:53:40 UTC (rev 294468)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2022-05-19 06:24:56 UTC (rev 294469)
@@ -161,9 +161,10 @@
const String& cacheStorageDirectory() const { return m_resolvedConfiguration->cacheStorageDirectory(); }
#if PLATFORM(IOS_FAMILY)
- const String& cookieStorageDirectory() const { return m_cookieStorageDirectory; }
- const String& containerCachesDirectory() const { return m_containerCachesDirectory; }
- const String& containerTemporaryDirectory() const { return m_containerTemporaryDirectory; }
+ String cookieStorageDirectory();
+ String containerCachesDirectory();
+ static String containerTemporaryDirectory();
+ static String cacheDirectoryInContainerOrHomeDirectory(const String& subpath);
#endif
#if ENABLE(INTELLIGENT_TRACKING_PREVENTION)
@@ -427,6 +428,11 @@
void setAppBoundDomainsForITP(const HashSet<WebCore::RegistrableDomain>&, CompletionHandler<void()>&&);
#endif
+#if PLATFORM(IOS_FAMILY)
+ String networkingCachesDirectory();
+ String parentBundleDirectory();
+#endif
+
const PAL::SessionID m_sessionID;
Ref<WebsiteDataStoreConfiguration> m_resolvedConfiguration;
@@ -433,11 +439,6 @@
Ref<const WebsiteDataStoreConfiguration> m_configuration;
bool m_hasResolvedDirectories { false };
const Ref<DeviceIdHashSaltStorage> m_deviceIdHashSaltStorage;
-#if PLATFORM(IOS_FAMILY)
- String m_cookieStorageDirectory;
- String m_containerCachesDirectory;
- String m_containerTemporaryDirectory;
-#endif
#if ENABLE(INTELLIGENT_TRACKING_PREVENTION)
bool m_resourceLoadStatisticsDebugMode { false };