Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (250143 => 250144)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-20 20:17:26 UTC (rev 250144)
@@ -1,3 +1,12 @@
+2019-09-20 Alex Christensen <achristen...@webkit.org>
+
+ Remove functionality to disable TLS fallback
+ https://bugs.webkit.org/show_bug.cgi?id=201998
+
+ Reviewed by Geoff Garen.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2019-09-18 Keith Rollin <krol...@apple.com>
Remove alternate declaration of CCECCryptorImportKey
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (250143 => 250144)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-20 20:17:26 UTC (rev 250144)
@@ -190,7 +190,6 @@
@property (nullable, copy) NSString *_sourceApplicationBundleIdentifier;
@property (nullable, copy) NSString *_sourceApplicationSecondaryIdentifier;
@property BOOL _shouldSkipPreferredClientCertificateLookup NS_AVAILABLE(10_10, 8_0);
-@property BOOL _allowsTLSFallback;
#if PLATFORM(IOS_FAMILY)
@property (nullable, copy) NSString *_CTDataConnectionServiceType;
#endif
Modified: trunk/Source/WebKit/ChangeLog (250143 => 250144)
--- trunk/Source/WebKit/ChangeLog 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/ChangeLog 2019-09-20 20:17:26 UTC (rev 250144)
@@ -1,5 +1,33 @@
2019-09-20 Alex Christensen <achristen...@webkit.org>
+ Remove functionality to disable TLS fallback
+ https://bugs.webkit.org/show_bug.cgi?id=201998
+
+ Reviewed by Geoff Garen.
+
+ Since r249019 it is not used. It was a useful experiment and I'm glad we didn't see any regressions.
+
+ * NetworkProcess/NetworkSessionCreationParameters.cpp:
+ (WebKit::NetworkSessionCreationParameters::privateSessionParameters):
+ (WebKit::NetworkSessionCreationParameters::encode const):
+ (WebKit::NetworkSessionCreationParameters::decode):
+ * NetworkProcess/NetworkSessionCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _setAllowsTLSFallback:]):
+ (-[WKWebsiteDataStore _allowsTLSFallback]):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+ (WebKit::WebsiteDataStore::parameters):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::setAllowsTLSFallback): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ (WebKit::WebsiteDataStore::allowsTLSFallback const): Deleted.
+
+2019-09-20 Alex Christensen <achristen...@webkit.org>
+
Remove unused storage paths on APIProcessPoolConfiguration
https://bugs.webkit.org/show_bug.cgi?id=202028
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (250143 => 250144)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-09-20 20:17:26 UTC (rev 250144)
@@ -48,7 +48,6 @@
, { }
, { }
, { }
- , AllowsTLSFallback::Yes
, false
, { }
, { }
@@ -87,7 +86,6 @@
IPC::encode(encoder, proxyConfiguration.get());
encoder << sourceApplicationBundleIdentifier;
encoder << sourceApplicationSecondaryIdentifier;
- encoder << allowsTLSFallback;
encoder << shouldLogCookieInformation;
encoder << loadThrottleLatency;
encoder << httpProxy;
@@ -149,11 +147,6 @@
if (!sourceApplicationSecondaryIdentifier)
return WTF::nullopt;
- Optional<AllowsTLSFallback> allowsTLSFallback;
- decoder >> allowsTLSFallback;
- if (!allowsTLSFallback)
- return WTF::nullopt;
-
Optional<bool> shouldLogCookieInformation;
decoder >> shouldLogCookieInformation;
if (!shouldLogCookieInformation)
@@ -272,7 +265,6 @@
, WTFMove(proxyConfiguration)
, WTFMove(*sourceApplicationBundleIdentifier)
, WTFMove(*sourceApplicationSecondaryIdentifier)
- , WTFMove(*allowsTLSFallback)
, WTFMove(*shouldLogCookieInformation)
, WTFMove(*loadThrottleLatency)
, WTFMove(*httpProxy)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (250143 => 250144)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-09-20 20:17:26 UTC (rev 250144)
@@ -53,7 +53,6 @@
namespace WebKit {
enum class AllowsCellularAccess : bool { No, Yes };
-enum class AllowsTLSFallback : bool { No, Yes };
struct NetworkSessionCreationParameters {
void encode(IPC::Encoder&) const;
@@ -67,7 +66,6 @@
RetainPtr<CFDictionaryRef> proxyConfiguration;
String sourceApplicationBundleIdentifier;
String sourceApplicationSecondaryIdentifier;
- AllowsTLSFallback allowsTLSFallback { AllowsTLSFallback::Yes };
bool shouldLogCookieInformation { false };
Seconds loadThrottleLatency;
URL httpProxy;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (250143 => 250144)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-09-20 20:17:26 UTC (rev 250144)
@@ -995,10 +995,6 @@
configuration._companionProxyPreference = NSURLSessionCompanionProxyPreferencePreferDirectToCloud;
#endif
- static SEL allowsTLSFallbackSetter = NSSelectorFromString(@"set_allowsTLSFallback:");
- if (parameters.allowsTLSFallback == AllowsTLSFallback::No && [configuration respondsToSelector:allowsTLSFallbackSetter])
- wtfObjCMsgSend<void>(configuration, allowsTLSFallbackSetter, NO);
-
auto* storageSession = networkProcess.storageSession(parameters.sessionID);
RELEASE_ASSERT(storageSession);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (250143 => 250144)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-09-20 20:17:26 UTC (rev 250144)
@@ -443,13 +443,11 @@
- (void)_setAllowsTLSFallback:(BOOL)allows
{
- if (!_websiteDataStore->websiteDataStore().setAllowsTLSFallback(allows))
- [NSException raise:NSGenericException format:@"_setAllowsTLSFallback cannot be called after networking has begun"];
}
- (BOOL)_allowsTLSFallback
{
- return _websiteDataStore->websiteDataStore().allowsTLSFallback();
+ return NO;
}
- (NSDictionary *)_proxyConfiguration
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (250143 => 250144)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-20 20:17:26 UTC (rev 250144)
@@ -488,7 +488,6 @@
#if PLATFORM(COCOA)
parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_websiteDataStore->websiteDataStore().sourceApplicationBundleIdentifier();
parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_websiteDataStore->websiteDataStore().sourceApplicationSecondaryIdentifier();
- parameters.defaultDataStoreParameters.networkSessionParameters.allowsTLSFallback = m_websiteDataStore->websiteDataStore().allowsTLSFallback() ? AllowsTLSFallback::Yes : AllowsTLSFallback::No;
#endif
m_websiteDataStore->websiteDataStore().networkingHasBegun();
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (250143 => 250144)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2019-09-20 20:17:26 UTC (rev 250144)
@@ -124,7 +124,6 @@
m_proxyConfiguration,
m_sourceApplicationBundleIdentifier,
m_sourceApplicationSecondaryIdentifier,
- m_allowsTLSFallback ? AllowsTLSFallback::Yes : AllowsTLSFallback::No,
shouldLogCookieInformation,
Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },
WTFMove(httpProxy),
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (250143 => 250144)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 20:17:26 UTC (rev 250144)
@@ -2032,14 +2032,6 @@
return true;
}
-bool WebsiteDataStore::setAllowsTLSFallback(bool allows)
-{
- if (m_networkingHasBegun)
- return false;
- m_allowsTLSFallback = allows;
- return true;
-}
-
bool WebsiteDataStore::setSourceApplicationBundleIdentifier(String&& identifier)
{
if (m_networkingHasBegun)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (250143 => 250144)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-09-20 20:11:50 UTC (rev 250143)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2019-09-20 20:17:26 UTC (rev 250144)
@@ -219,9 +219,6 @@
const String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
bool setSourceApplicationSecondaryIdentifier(String&&);
- bool allowsTLSFallback() const { return m_allowsTLSFallback; }
- bool setAllowsTLSFallback(bool);
-
void networkingHasBegun() { m_networkingHasBegun = true; }
void setAllowsCellularAccess(AllowsCellularAccess allows) { m_allowsCellularAccess = allows; }
@@ -326,7 +323,6 @@
AllowsCellularAccess m_allowsCellularAccess { AllowsCellularAccess::Yes };
String m_sourceApplicationBundleIdentifier;
String m_sourceApplicationSecondaryIdentifier;
- bool m_allowsTLSFallback { true };
bool m_networkingHasBegun { false };
#if HAVE(SEC_KEY_PROXY)
