Changeset 249342 in webkit

Timestamp:

Aug 30, 2019, 1:26:08 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
​https://bugs.webkit.org/show_bug.cgi?id=201279

Reviewed by Darin Adler.

Source/WebCore:

• platform/network/mac/WebCoreURLResponse.mm:

(WebCore::synthesizeRedirectResponseIfNecessary):
(WebCore::schemeWasUpgradedDueToDynamicHSTS): Deleted.

Source/WebKit:

• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(ignoreHSTS):
(updateIgnoreStrictTransportSecuritySettingIfNecessary):
(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):

Source/WTF:

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/mac/WebCoreURLResponse.mm (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (6 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-08-30  Alex Christensen  <achristensen@webkit.org>
+
+        Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+        https://bugs.webkit.org/show_bug.cgi?id=201279
+
+        Reviewed by Darin Adler.
+
+        * wtf/Platform.h:
+
 2019-08-30  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1437 +1437 @@
 
 #if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
-#define HAVE_CFNETWORK_WITH_IGNORE_HSTS 1
-#endif
-
-#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
 #define HAVE_CFNETWORK_WITH_AUTO_ADDED_HTTP_HEADER_SUPPRESSION_SUPPORT 1
 /* FIXME: Does this work, and is this needed on other iOS family platforms? */

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-30  Alex Christensen  <achristensen@webkit.org>
+
+        Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+        https://bugs.webkit.org/show_bug.cgi?id=201279
+
+        Reviewed by Darin Adler.
+
+        * platform/network/mac/WebCoreURLResponse.mm:
+        (WebCore::synthesizeRedirectResponseIfNecessary):
+        (WebCore::schemeWasUpgradedDueToDynamicHSTS): Deleted.
+
 2019-08-30  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm

@@ -331 +331 @@
 #endif
 
-static bool schemeWasUpgradedDueToDynamicHSTS(NSURLRequest *request)
-{
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
-    return [request _schemeWasUpgradedDueToDynamicHSTS];
-#else
-    UNUSED_PARAM(request);
-    return false;
-#endif
-}
-
 NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
 {
@@ -346 +336 @@
         return redirectResponse;
 
-    if ([[[newRequest URL] scheme] isEqualToString:[[currentRequest URL] scheme]] && !schemeWasUpgradedDueToDynamicHSTS(newRequest))
+    if ([[[newRequest URL] scheme] isEqualToString:[[currentRequest URL] scheme]] && ![newRequest _schemeWasUpgradedDueToDynamicHSTS])
         return nil;
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-30  Alex Christensen  <achristensen@webkit.org>
+
+        Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+        https://bugs.webkit.org/show_bug.cgi?id=201279
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (ignoreHSTS):
+        (updateIgnoreStrictTransportSecuritySettingIfNecessary):
+        (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+        (-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):
+
 2019-08-30  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -400 +400 @@
 }
 
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
 static NSURLRequest* downgradeRequest(NSURLRequest *request)
 {
@@ -423 +423 @@
 #endif
 
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
 static void setIgnoreHSTS(NSMutableURLRequest *request, bool ignoreHSTS)
 {
@@ -435 +434 @@
         && [request _ignoreHSTS];
 }
-#endif
 
 static NSURLRequest* updateIgnoreStrictTransportSecuritySettingIfNecessary(NSURLRequest *request, bool shouldIgnoreHSTS)
 {
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
     if ([request.URL.scheme isEqualToString:@"https"] && shouldIgnoreHSTS && ignoreHSTS(request)) {
         // The request was upgraded for some other reason than HSTS.
@@ -453 +450 @@
         return nsMutableRequest;
     }
-#else
-    UNUSED_PARAM(shouldIgnoreHSTS);
-#endif
 
     return request;
@@ -469 +463 @@
 
         bool shouldIgnoreHSTS = false;
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)        
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
         shouldIgnoreHSTS = schemeWasUpgradedDueToDynamicHSTS(request) && _session->networkProcess().storageSession(_session->sessionID())->shouldBlockCookies(request, networkDataTask->frameID(), networkDataTask->pageID());
         if (shouldIgnoreHSTS) {
@@ -502 +496 @@
     if (auto* networkDataTask = [self existingTask:task]) {
         bool shouldIgnoreHSTS = false;
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
         shouldIgnoreHSTS = schemeWasUpgradedDueToDynamicHSTS(request) && _session->networkProcess().storageSession(_session->sessionID())->shouldBlockCookies(request, networkDataTask->frameID(), networkDataTask->pageID());
         if (shouldIgnoreHSTS) {