Changeset 250312 in webkit

Timestamp:

Sep 24, 2019, 11:54:38 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Move HSTS storage directory to LegacyGlobalSettings
​https://bugs.webkit.org/show_bug.cgi?id=202059

Reviewed by Tim Horton.

I continue my lamentation begun in r245075.
Remove the glib setting of it on the WebKitWebContext because they use it on the WebsiteDataStore. We should do that too when we can.

• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):

• UIProcess/API/APIProcessPoolConfiguration.h:
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:

(-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
(-[_WKProcessPoolConfiguration hstsStorageDirectory]):

• UIProcess/LegacyGlobalSettings.h:

(WebKit::LegacyGlobalSettings::setHSTSStorageDirectory):
(WebKit::LegacyGlobalSettings::hstsStorageDirectory const):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.h (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (modified) (1 diff)
• UIProcess/API/glib/WebKitWebContext.cpp (modified) (1 diff)
• UIProcess/LegacyGlobalSettings.h (modified) (3 diffs)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-24  Alex Christensen  <achristensen@webkit.org>
+
+        Move HSTS storage directory to LegacyGlobalSettings
+        https://bugs.webkit.org/show_bug.cgi?id=202059
+
+        Reviewed by Tim Horton.
+
+        I continue my lamentation begun in r245075.
+        Remove the glib setting of it on the WebKitWebContext because they use it on the WebsiteDataStore.  We should do that too when we can.
+
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
+        (-[_WKProcessPoolConfiguration hstsStorageDirectory]):
+        * UIProcess/LegacyGlobalSettings.h:
+        (WebKit::LegacyGlobalSettings::setHSTSStorageDirectory):
+        (WebKit::LegacyGlobalSettings::hstsStorageDirectory const):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+
 2019-09-24  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -78 +78 @@
     copy->m_customWebContentServiceBundleIdentifier = this->m_customWebContentServiceBundleIdentifier;
     copy->m_usesSingleWebProcess = m_usesSingleWebProcess;
-    copy->m_hstsStorageDirectory = m_hstsStorageDirectory;
 
     return copy;

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

@@ -148 +148 @@
     const WTF::String& customWebContentServiceBundleIdentifier() const { return m_customWebContentServiceBundleIdentifier; }
     void setCustomWebContentServiceBundleIdentifier(const WTF::String& customWebContentServiceBundleIdentifier) { m_customWebContentServiceBundleIdentifier = customWebContentServiceBundleIdentifier; }
-
-    const WTF::String& hstsStorageDirectory() const { return m_hstsStorageDirectory; }
-    void setHSTSStorageDirectory(WTF::String&& directory) { m_hstsStorageDirectory = WTFMove(directory); }
     
 #if PLATFORM(COCOA)
@@ -188 +185 @@
     bool m_usesSingleWebProcess { false };
     uint32_t m_downloadMonitorSpeedMultiplier { 1 };
-    WTF::String m_hstsStorageDirectory;
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

@@ -359 +359 @@
 
     // FIXME: Move this to _WKWebsiteDataStoreConfiguration once rdar://problem/50109631 is fixed.
-    _processPoolConfiguration->setHSTSStorageDirectory(directory.path);
+    WebKit::LegacyGlobalSettings::singleton().setHSTSStorageDirectory(directory.path);
 }
 
 - (NSURL *)hstsStorageDirectory
 {
-    return [NSURL fileURLWithPath:_processPoolConfiguration->hstsStorageDirectory() isDirectory:YES];
+    return [NSURL fileURLWithPath:WebKit::LegacyGlobalSettings::singleton().hstsStorageDirectory() isDirectory:YES];
 }
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

@@ -329 +329 @@
 
     if (!webkit_website_data_manager_is_ephemeral(priv->websiteDataManager.get()))
-        configuration.setHSTSStorageDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_hsts_cache_directory(priv->websiteDataManager.get())));
+        WebKit::LegacyGlobalSettings::singleton().setHSTSStorageDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_hsts_cache_directory(priv->websiteDataManager.get())));
 
     priv->processPool = WebProcessPool::create(configuration);

trunk/Source/WebKit/UIProcess/LegacyGlobalSettings.h

@@ -28 +28 @@
 #include "CacheModel.h"
 #include <wtf/Forward.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebKit {
@@ -39 +40 @@
     CacheModel cacheModel() const { return m_cacheModel; }
     
+    void setHSTSStorageDirectory(String&& directory) { m_hstsStorageDirectory = WTFMove(directory); }
+    const String& hstsStorageDirectory() const { return m_hstsStorageDirectory; }
+    
 private:
     friend class NeverDestroyed<LegacyGlobalSettings>;
@@ -44 +48 @@
     
     CacheModel m_cacheModel { CacheModel::PrimaryWebBrowser };
+    String m_hstsStorageDirectory;
 };
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -521 +521 @@
 #endif
 
-    parameters.hstsStorageDirectory = m_configuration->hstsStorageDirectory();
+    parameters.hstsStorageDirectory = LegacyGlobalSettings::singleton().hstsStorageDirectory();
     if (!parameters.hstsStorageDirectory.isNull())
         SandboxExtension::createHandleForReadWriteDirectory(parameters.hstsStorageDirectory, parameters.hstsStorageDirectoryExtensionHandle);