Move SSL handshake to PostgreSQLConnection.connect static method

Author: Andrew Theis

Sources/PostgreSQL/Connection/PostgreSQLConnection+TCP.swift

@@ -1,11 +1,13 @@
 import Async
 import NIO
+import NIOOpenSSL
 
 extension PostgreSQLConnection {
     /// Connects to a Redis server using a TCP socket.
     public static func connect(
         hostname: String = "localhost",
         port: Int = 5432,
+        tlsConfiguration: TLSConfiguration? = nil,
         on worker: Worker,
         onError: @escaping (Error) -> ()
     ) throws -> Future<PostgreSQLConnection> {
@@ -19,8 +21,12 @@ extension PostgreSQLConnection {
                 }
         }
 
-        return bootstrap.connect(host: hostname, port: port).map(to: PostgreSQLConnection.self) { channel in
-            return .init(queue: handler, channel: channel)
+        return bootstrap.connect(host: hostname, port: port).flatMap(to: PostgreSQLConnection.self) { channel in
+            let connection = PostgreSQLConnection(queue: handler, channel: channel)
+            if let tlsConfiguration = tlsConfiguration {
+                return connection.attemptSSLConnection(using: tlsConfiguration).transform(to: connection)
+            }
+            return Future.map(on: worker) { connection }
         }
     }
 }

Sources/PostgreSQL/Database/PostgreSQLDatabase.swift

@@ -19,13 +19,8 @@ public final class PostgreSQLDatabase: Database, LogSupporting {
     public func newConnection(on worker: Worker) -> Future<PostgreSQLConnection> {
         let config = self.config
         return Future.flatMap(on: worker) {
-            return try PostgreSQLConnection.connect(hostname: config.hostname, port: config.port, on: worker) { error in
+            return try PostgreSQLConnection.connect(hostname: config.hostname, port: config.port, tlsConfiguration: config.tlsConfiguration, on: worker) { error in
                 print("[PostgreSQL] \(error)")
-            }.flatMap(to: PostgreSQLConnection.self) { client in
-                if let tlsConfiguration = config.tlsConfiguration {
-                    return client.attemptSSLConnection(using: tlsConfiguration).transform(to: client)
-                }
-                return Future.map(on: worker) { client }
             }.flatMap(to: PostgreSQLConnection.self) { client in
                 return client.authenticate(
                     username: config.username,

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -1,6 +1,7 @@
 import Foundation
 import XCTest
 import NIO
+import NIOOpenSSL
 import PostgreSQL
 import Core
 
@@ -11,6 +12,12 @@ class PostgreSQLConnectionTests: XCTestCase {
         let results = try client.simpleQuery("SELECT version();").wait()
         try XCTAssert(results[0].firstValue(forColumn: "version")?.decode(String.self).contains("10.") == true)
     }
+    
+    func testSSLConnection() throws {
+        let client = try PostgreSQLConnection.makeTest(tlsConfiguration: .forClient(certificateVerification: .none))
+        let results = try client.simpleQuery("SELECT version();").wait()
+        try XCTAssert(results[0].firstValue(forColumn: "version")?.decode(String.self).contains("10.") == true)
+    }
 
     func testSelectTypes() throws {
         let client = try PostgreSQLConnection.makeTest()
@@ -451,15 +458,15 @@ class PostgreSQLConnectionTests: XCTestCase {
 
 extension PostgreSQLConnection {
     /// Creates a test event loop and psql client.
-    static func makeTest() throws -> PostgreSQLConnection {
+    static func makeTest(tlsConfiguration: TLSConfiguration? = nil) throws -> PostgreSQLConnection {
         let hostname: String
         #if Xcode
         hostname = (try? Process.execute("docker-machine", "ip")) ?? "192.168.99.100"
         #else
         hostname = "localhost"
         #endif
         let group = MultiThreadedEventLoopGroup(numThreads: 1)
-        let client = try PostgreSQLConnection.connect(hostname: hostname, on: group) { error in
+        let client = try PostgreSQLConnection.connect(hostname: hostname, tlsConfiguration: tlsConfiguration, on: group) { error in
             XCTFail("\(error)")
         }.wait()
         _ = try client.authenticate(username: "vapor_username", database: "vapor_database", password: nil).wait()