Changeset 230467 in webkit

Timestamp:

Apr 9, 2018 8:43:46 PM (6 years ago)

Author:

wilander@apple.com

Message:

Refactor Ignore HSTS code
​https://bugs.webkit.org/show_bug.cgi?id=184433
<rdar://problem/39298238>

Reviewed by Darin Adler.

This patch refactors our ignore HSTS code. The convenience functions are moved
out of CFNetwork SPI in PAL, and into where they are used. It also switches
from performSelector: calls to straight function calls, after checking that
there is a responder.

Source/WebCore:

• platform/network/mac/WebCoreURLResponse.mm:

(WebCore::schemeWasUpgradedDueToDynamicHSTS):

Add convenience function here since it was moved out of
CFNetworkSPI.h.

Source/WebCore/PAL:

• pal/spi/cf/CFNetworkSPI.h:

(schemeWasUpgradedDueToDynamicHSTS): Deleted.
(setIgnoreHSTS): Deleted.
(ignoreHSTS): Deleted.

Source/WebKit:

• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(schemeWasUpgradedDueToDynamicHSTS):
(setIgnoreHSTS):
(ignoreHSTS):

Add convenience functions here since they were moved out of
CFNetworkSPI.h.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (1 diff)
• WebCore/platform/network/mac/WebCoreURLResponse.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-09  John Wilander  <wilander@apple.com>
+
+        Refactor Ignore HSTS code
+        https://bugs.webkit.org/show_bug.cgi?id=184433
+        <rdar://problem/39298238>
+
+        Reviewed by Darin Adler.
+
+        This patch refactors our ignore HSTS code. The convenience functions are moved
+        out of CFNetwork SPI in PAL, and into where they are used. It also switches
+        from performSelector: calls to straight function calls, after checking that
+        there is a responder.
+
+        * platform/network/mac/WebCoreURLResponse.mm:
+        (WebCore::schemeWasUpgradedDueToDynamicHSTS):
+            Add convenience function here since it was moved out of
+            CFNetworkSPI.h.
+
 2018-04-09  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2018-04-09  John Wilander  <wilander@apple.com>
+
+        Refactor Ignore HSTS code
+        https://bugs.webkit.org/show_bug.cgi?id=184433
+        <rdar://problem/39298238>
+
+        Reviewed by Darin Adler.
+
+        This patch refactors our ignore HSTS code. The convenience functions are moved
+        out of CFNetwork SPI in PAL, and into where they are used. It also switches
+        from performSelector: calls to straight function calls, after checking that
+        there is a responder.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+        (schemeWasUpgradedDueToDynamicHSTS): Deleted.
+        (setIgnoreHSTS): Deleted.
+        (ignoreHSTS): Deleted.
+
 2018-04-07  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -338 +338 @@
 @end
 
-static bool schemeWasUpgradedDueToDynamicHSTS(NSURLRequest *request)
-{
-    if ([request respondsToSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)])
-        return [request performSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)];
-    return false;
-}
-
-static void setIgnoreHSTS(NSMutableURLRequest *request, bool ignoreHSTS)
-{
-    if ([request respondsToSelector:@selector(_setIgnoreHSTS:)])
-        [request performSelector:@selector(_setIgnoreHSTS:) withObject:[NSNumber numberWithBool:ignoreHSTS]];
-}
-
-static bool ignoreHSTS(NSURLRequest *request)
-{
-    if ([request respondsToSelector:@selector(_ignoreHSTS)])
-        return [request performSelector:@selector(_ignoreHSTS)];
-    return false;
-}
-
 #endif // defined(__OBJC__)

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

@@ -328 +328 @@
 #endif
 
+static bool schemeWasUpgradedDueToDynamicHSTS(NSURLRequest *request)
+{
+#if !USE(CFNETWORK_IGNORE_HSTS)
+    UNUSED_PARAM(request);
+    return false;
+#else
+    return [request respondsToSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)]
+        && [request _schemeWasUpgradedDueToDynamicHSTS];
+#endif
+}
+
 NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-09  John Wilander  <wilander@apple.com>
+
+        Refactor Ignore HSTS code
+        https://bugs.webkit.org/show_bug.cgi?id=184433
+        <rdar://problem/39298238>
+
+        Reviewed by Darin Adler.
+
+        This patch refactors our ignore HSTS code. The convenience functions are moved
+        out of CFNetwork SPI in PAL, and into where they are used. It also switches
+        from performSelector: calls to straight function calls, after checking that
+        there is a responder.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (schemeWasUpgradedDueToDynamicHSTS):
+        (setIgnoreHSTS):
+        (ignoreHSTS):
+            Add convenience functions here since they were moved out of
+            CFNetworkSPI.h.
+
 2018-04-09  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -183 +183 @@
     return request;
 }
+
+static bool schemeWasUpgradedDueToDynamicHSTS(NSURLRequest *request)
+{
+    return [request respondsToSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)]
+        && [request _schemeWasUpgradedDueToDynamicHSTS];
+}
+
+static void setIgnoreHSTS(NSMutableURLRequest *request, bool ignoreHSTS)
+{
+    if ([request respondsToSelector:@selector(_setIgnoreHSTS:)])
+        [request _setIgnoreHSTS:ignoreHSTS];
+}
+
+static bool ignoreHSTS(NSURLRequest *request)
+{
+    return [request respondsToSelector:@selector(_ignoreHSTS)]
+        && [request _ignoreHSTS];
+}
 #endif