Bugfix HTTPS SNI and IP Address

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -275,7 +275,7 @@ public class HTTPClient {
                     let taskHandler = TaskHandler(task: task, delegate: delegate, redirectHandler: redirectHandler, ignoreUncleanSSLShutdown: self.configuration.ignoreUncleanSSLShutdown)
                     return channel.pipeline.addHandler(taskHandler)
                 }
-            }
+        }
 
         if let timeout = self.resolve(timeout: self.configuration.timeout.connect, deadline: deadline) {
             bootstrap = bootstrap.connectTimeout(timeout)
@@ -285,11 +285,11 @@ public class HTTPClient {
         bootstrap.connect(host: address.host, port: address.port)
             .map { channel in
                 task.setChannel(channel)
-            }
-            .flatMap { channel in
-                channel.writeAndFlush(request)
-            }
-            .cascadeFailure(to: task.promise)
+        }
+        .flatMap { channel in
+            channel.writeAndFlush(request)
+        }
+        .cascadeFailure(to: task.promise)
 
         return task
     }
@@ -501,7 +501,7 @@ private extension ChannelPipeline {
         do {
             let tlsConfiguration = tlsConfiguration ?? TLSConfiguration.forClient()
             let context = try NIOSSLContext(configuration: tlsConfiguration)
-            return self.addHandler(try NIOSSLClientHandler(context: context, serverHostname: request.host),
+            return self.addHandler(try NIOSSLClientHandler(context: context, serverHostname: request.host.isIPAddress ? nil : request.host),
                                    position: .first)
         } catch {
             return self.eventLoop.makeFailedFuture(error)

Sources/AsyncHTTPClient/Utils.swift

@@ -14,6 +14,10 @@
 
 import NIO
 import NIOHTTP1
+#if os(Linux)
+#else
+import Network
+#endif
 
 public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate {
     public typealias Response = Void
@@ -32,3 +36,36 @@ public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate {
         return ()
     }
 }
+
+#if os(Linux)
+internal extension String {
+    var isIPAddress: Bool {
+      var ipv4Addr = in_addr()
+      var ipv6Addr = in6_addr()
+
+      return self.withCString { ptr in
+          return inet_pton(AF_INET, ptr, &ipv4Addr) == 1 ||
+                 inet_pton(AF_INET6, ptr, &ipv6Addr) == 1
+      }
+    }
+}
+#else
+internal extension String {
+    var isIPAddress: Bool {
+        if #available(OSX 10.14, *) {
+            if IPv4Address(self) != nil || IPv6Address(self) != nil {
+                return true
+            }
+        } else {
+            var ipv4Addr = in_addr()
+            var ipv6Addr = in6_addr()
+
+            return self.withCString { ptr in
+                return inet_pton(AF_INET, ptr, &ipv4Addr) == 1 ||
+                       inet_pton(AF_INET6, ptr, &ipv6Addr) == 1
+            }
+        }
+        return false
+    }
+}
+#endif

Tests/AsyncHTTPClientTests/HTTPClientTests+XCTest.swift

@@ -32,6 +32,7 @@ extension HTTPClientTests {
             ("testGetWithDifferentEventLoopBackpressure", testGetWithDifferentEventLoopBackpressure),
             ("testPost", testPost),
             ("testGetHttps", testGetHttps),
+            ("testGetHttpsWithIP", testGetHttpsWithIP),
             ("testPostHttps", testPostHttps),
             ("testHttpRedirect", testHttpRedirect),
             ("testHttpHostRedirect", testHttpHostRedirect),

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

@@ -122,6 +122,19 @@ class HTTPClientTests: XCTestCase {
         XCTAssertEqual(.ok, response.status)
     }
 
+    func testGetHttpsWithIP() throws {
+        let httpBin = HTTPBin(ssl: true)
+        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew,
+                                    configuration: HTTPClient.Configuration(certificateVerification: .none))
+        defer {
+            XCTAssertNoThrow(try httpClient.syncShutdown())
+            XCTAssertNoThrow(try httpBin.shutdown())
+        }
+
+        let response = try httpClient.get(url: "https://127.0.0.1:\(httpBin.port)/get").wait()
+        XCTAssertEqual(.ok, response.status)
+    }
+
     func testPostHttps() throws {
         let httpBin = HTTPBin(ssl: true)
         let httpClient = HTTPClient(eventLoopGroupProvider: .createNew,