Changeset 250144 in webkit

Timestamp:

Sep 20, 2019, 1:17:26 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Remove functionality to disable TLS fallback
​https://bugs.webkit.org/show_bug.cgi?id=201998

Reviewed by Geoff Garen.

Source/WebCore/PAL:

• pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

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.

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (modified) (4 diffs)
• WebKit/NetworkProcess/NetworkSessionCreationParameters.h (modified) (2 diffs)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (1 diff)
• WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (modified) (1 diff)
• WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)
• WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (modified) (2 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-09-20  Alex Christensen  <achristensen@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  <krollin@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -191 +191 @@
 @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;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-20  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp

@@ -49 +49 @@
         , { }
         , { }
-        , AllowsTLSFallback::Yes
         , false
         , { }
@@ -88 +87 @@
     encoder << sourceApplicationBundleIdentifier;
     encoder << sourceApplicationSecondaryIdentifier;
-    encoder << allowsTLSFallback;
     encoder << shouldLogCookieInformation;
     encoder << loadThrottleLatency;
@@ -150 +148 @@
         return WTF::nullopt;
 
-    Optional<AllowsTLSFallback> allowsTLSFallback;
-    decoder >> allowsTLSFallback;
-    if (!allowsTLSFallback)
-        return WTF::nullopt;
-
     Optional<bool> shouldLogCookieInformation;
     decoder >> shouldLogCookieInformation;
@@ -273 +266 @@
         , WTFMove(*sourceApplicationBundleIdentifier)
         , WTFMove(*sourceApplicationSecondaryIdentifier)
-        , WTFMove(*allowsTLSFallback)
         , WTFMove(*shouldLogCookieInformation)
         , WTFMove(*loadThrottleLatency)

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

@@ -54 +54 @@
 
 enum class AllowsCellularAccess : bool { No, Yes };
-enum class AllowsTLSFallback : bool { No, Yes };
 
 struct NetworkSessionCreationParameters {
@@ -68 +67 @@
     String sourceApplicationBundleIdentifier;
     String sourceApplicationSecondaryIdentifier;
-    AllowsTLSFallback allowsTLSFallback { AllowsTLSFallback::Yes };
     bool shouldLogCookieInformation { false };
     Seconds loadThrottleLatency;

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -996 +996 @@
 #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);

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

@@ -444 +444 @@
 - (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;
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -489 +489 @@
         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();

trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

@@ -125 +125 @@
         m_sourceApplicationBundleIdentifier,
         m_sourceApplicationSecondaryIdentifier,
-        m_allowsTLSFallback ? AllowsTLSFallback::Yes : AllowsTLSFallback::No,
         shouldLogCookieInformation,
         Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -2033 +2033 @@
 }
 
-bool WebsiteDataStore::setAllowsTLSFallback(bool allows)
-{
-    if (m_networkingHasBegun)
-        return false;
-    m_allowsTLSFallback = allows;
-    return true;
-}
-    
 bool WebsiteDataStore::setSourceApplicationBundleIdentifier(String&& identifier)
 {

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -220 +220 @@
     bool setSourceApplicationSecondaryIdentifier(String&&);
 
-    bool allowsTLSFallback() const { return m_allowsTLSFallback; }
-    bool setAllowsTLSFallback(bool);
-
     void networkingHasBegun() { m_networkingHasBegun = true; }
     
@@ -327 +324 @@
     String m_sourceApplicationBundleIdentifier;
     String m_sourceApplicationSecondaryIdentifier;
-    bool m_allowsTLSFallback { true };
     bool m_networkingHasBegun { false };