- Revision
- 266133
- Author
- [email protected]
- Date
- 2020-08-25 11:06:43 -0700 (Tue, 25 Aug 2020)
Log Message
Clean up deprecated and unused SPI to set HSTS storage on ProcessPoolConfiguration
https://bugs.webkit.org/show_bug.cgi?id=215788
Patch by Alex Christensen <[email protected]> on 2020-08-25
Reviewed by Chris Dumez.
Source/WebCore/PAL:
* pal/spi/cf/CFNetworkSPI.h:
Source/WebKit:
After rdar://problem/65047971 this is no longer needed because the replacement on WebsiteDataStoreConfiguration has been adopted.
The selector on _WKProcessPoolConfiguration had already been deprecated, and is left for now to allow easier debugging with OSes that use it still.
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
(-[_WKProcessPoolConfiguration hstsStorageDirectory]):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (266132 => 266133)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-08-25 18:06:43 UTC (rev 266133)
@@ -1,3 +1,12 @@
+2020-08-25 Alex Christensen <[email protected]>
+
+ Clean up deprecated and unused SPI to set HSTS storage on ProcessPoolConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=215788
+
+ Reviewed by Chris Dumez.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2020-08-24 Alex Christensen <[email protected]>
Make _WKWebsiteDataStoreConfiguration SPI for HSTS storage to replace _WKProcessPoolConfiguration.hstsStorageDirectory
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (266132 => 266133)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-08-25 18:06:43 UTC (rev 266133)
@@ -392,10 +392,6 @@
CFMutableURLRequestRef _CFURLRequestCreateFromArchiveList(CFAllocatorRef, CFIndex version, CFTypeRef* objects, CFIndex objectCount, CFDictionaryRef protocolProperties);
void CFURLRequestSetProxySettings(CFMutableURLRequestRef, CFDictionaryRef);
-#if HAVE(HSTS_STORAGE_PATH)
-void _CFNetworkSetHSTSStoragePath(CFStringRef);
-#endif
-
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxy;
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyHost;
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyPort;
Modified: trunk/Source/WebKit/ChangeLog (266132 => 266133)
--- trunk/Source/WebKit/ChangeLog 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/ChangeLog 2020-08-25 18:06:43 UTC (rev 266133)
@@ -1,3 +1,30 @@
+2020-08-25 Alex Christensen <[email protected]>
+
+ Clean up deprecated and unused SPI to set HSTS storage on ProcessPoolConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=215788
+
+ Reviewed by Chris Dumez.
+
+ After rdar://problem/65047971 this is no longer needed because the replacement on WebsiteDataStoreConfiguration has been adopted.
+ The selector on _WKProcessPoolConfiguration had already been deprecated, and is left for now to allow easier debugging with OSes that use it still.
+
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
+ (-[_WKProcessPoolConfiguration hstsStorageDirectory]):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+
2020-08-25 Eric Carlson <[email protected]>
[macOS] Update audio arbitration manager when audio transport changes
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (266132 => 266133)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-08-25 18:06:43 UTC (rev 266133)
@@ -74,8 +74,6 @@
#endif
encoder << shouldEnableITPDatabase;
encoder << enableAdClickAttributionDebugMode;
- encoder << hstsStorageDirectory;
- encoder << hstsStorageDirectoryExtensionHandle;
}
bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
@@ -167,12 +165,6 @@
if (!decoder.decode(result.enableAdClickAttributionDebugMode))
return false;
- if (!decoder.decode(result.hstsStorageDirectory))
- return false;
-
- if (!decoder.decode(result.hstsStorageDirectoryExtensionHandle))
- return false;
-
return true;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (266132 => 266133)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-08-25 18:06:43 UTC (rev 266133)
@@ -93,8 +93,6 @@
#endif
bool shouldEnableITPDatabase { false };
bool enableAdClickAttributionDebugMode { false };
- String hstsStorageDirectory;
- SandboxExtension::Handle hstsStorageDirectoryExtensionHandle;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (266132 => 266133)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-08-25 18:06:43 UTC (rev 266133)
@@ -74,13 +74,6 @@
WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
setApplicationSDKVersion(parameters.uiProcessSDKVersion);
-#if HAVE(HSTS_STORAGE_PATH)
- if (!parameters.hstsStorageDirectory.isNull()) {
- SandboxExtension::consumePermanently(parameters.hstsStorageDirectoryExtensionHandle);
- _CFNetworkSetHSTSStoragePath(parameters.hstsStorageDirectory.createCFString().get());
- }
-#endif
-
#if PLATFORM(IOS_FAMILY)
SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (266132 => 266133)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-08-25 18:06:43 UTC (rev 266133)
@@ -68,7 +68,6 @@
copy->m_usesBackForwardCache = this->m_usesBackForwardCache;
copy->m_customWebContentServiceBundleIdentifier = this->m_customWebContentServiceBundleIdentifier;
copy->m_usesSingleWebProcess = m_usesSingleWebProcess;
- copy->m_hstsStorageDirectory = m_hstsStorageDirectory;
#if PLATFORM(GTK) && !USE(GTK4)
copy->m_useSystemAppearanceForScrollbars = m_useSystemAppearanceForScrollbars;
#endif
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (266132 => 266133)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-08-25 18:06:43 UTC (rev 266133)
@@ -131,9 +131,6 @@
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(GTK) && !USE(GTK4)
bool useSystemAppearanceForScrollbars() const { return m_useSystemAppearanceForScrollbars; }
void setUseSystemAppearanceForScrollbars(bool useSystemAppearanceForScrollbars) { m_useSystemAppearanceForScrollbars = useSystemAppearanceForScrollbars; }
@@ -176,7 +173,6 @@
bool m_shouldConfigureJSCForTesting { false };
bool m_isJITEnabled { true };
bool m_usesSingleWebProcess { false };
- WTF::String m_hstsStorageDirectory;
#if PLATFORM(GTK) && !USE(GTK4)
bool m_useSystemAppearanceForScrollbars { false };
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (266132 => 266133)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-08-25 18:06:43 UTC (rev 266133)
@@ -303,16 +303,11 @@
- (void)setHSTSStorageDirectory:(NSURL *)directory
{
- if (directory && ![directory isFileURL])
- [NSException raise:NSInvalidArgumentException format:@"%@ is not a file URL", directory];
-
- // FIXME: Move this to _WKWebsiteDataStoreConfiguration once rdar://problem/50109631 is fixed.
- _processPoolConfiguration->setHSTSStorageDirectory(directory.path);
}
- (NSURL *)hstsStorageDirectory
{
- return [NSURL fileURLWithPath:_processPoolConfiguration->hstsStorageDirectory() isDirectory:YES];
+ return nil;
}
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (266132 => 266133)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-08-25 17:45:17 UTC (rev 266132)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-08-25 18:06:43 UTC (rev 266133)
@@ -540,10 +540,6 @@
#endif
#endif
- parameters.hstsStorageDirectory = m_configuration->hstsStorageDirectory();
- if (!parameters.hstsStorageDirectory.isNull())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.hstsStorageDirectory, parameters.hstsStorageDirectoryExtensionHandle);
-
parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsBypassingContentSecurityPolicy());
parameters.urlSchemesRegisteredAsLocal = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsLocal());
