Add unit test for testing SSL and new docker image for spinning up postgres with self-signed certificate

Author: Andrew Theis

Sources/PostgreSQL/Connection/PostgreSQLConnection+TCP.swift

@@ -24,7 +24,7 @@ extension PostgreSQLConnection {
         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 connection.addSSLClientHandler(using: tlsConfiguration).transform(to: connection)
             }
             return Future.map(on: worker) { connection }
         }

Sources/PostgreSQL/Connection/PostgreSQLConnection.swift

@@ -129,8 +129,9 @@ public final class PostgreSQLConnection: DatabaseConnection, BasicWorker {
         return new
     }
 
-    /// Trys opening a SLL connection
-    internal func attemptSSLConnection(using tlsConfiguration: TLSConfiguration) -> Future<Void> {
+    /// Ask the server if it supports SSL and adds a new OpenSSLClientHandler to pipeline if it does
+    /// This will throw an error if the server does not support SSL
+    internal func addSSLClientHandler(using tlsConfiguration: TLSConfiguration) -> Future<Void> {
         return queue.enqueue([.sslSupportRequest(PostgreSQLSSLSupportRequest())]) { message in
             guard case .sslSupportResponse(let response) = message else {
                 throw PostgreSQLError(identifier: "SSL support check", reason: "Unsupported message encountered during SSL support check: \(message).", source: .capture())

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -441,6 +441,7 @@ class PostgreSQLConnectionTests: XCTestCase {
     }
 
     static var allTests = [
+        ("testSSLConnection", testSSLConnection),
         ("testVersion", testVersion),
         ("testSelectTypes", testSelectTypes),
         ("testParse", testParse),
@@ -466,9 +467,18 @@ extension PostgreSQLConnection {
         hostname = "localhost"
         #endif
         let group = MultiThreadedEventLoopGroup(numThreads: 1)
-        let client = try PostgreSQLConnection.connect(hostname: hostname, tlsConfiguration: tlsConfiguration, on: group) { error in
-            XCTFail("\(error)")
-        }.wait()
+        var client: PostgreSQLConnection
+        
+        if let tlsConfiguration = tlsConfiguration {
+            client = try PostgreSQLConnection.connect(hostname: hostname, port: 5433, tlsConfiguration: tlsConfiguration, on: group) { error in
+                XCTFail("\(error)")
+            }.wait()
+        } else {
+            client = try PostgreSQLConnection.connect(hostname: hostname, on: group) { error in
+                XCTFail("\(error)")
+            }.wait()
+        }
+        
         _ = try client.authenticate(username: "vapor_username", database: "vapor_database", password: nil).wait()
         return client
     }

contribute_bootstrap.sh

@@ -4,13 +4,23 @@ docker-machine start default
 echo "💧  exporting docker machine environment..."
 eval $(docker-machine env default)
 
-echo "💧  cleaning previous vapor-psql dev db..."
+echo "💧  cleaning previous psql containers..."
+rm -rf postgres
 docker stop vapor-psql
+docker stop vapor-psql-ssl
 docker rm vapor-psql
+docker rm vapor-psql-ssl
 
 echo "💧  creating vapor-psql dev db..."
 docker run --name vapor-psql -e POSTGRES_USER=vapor_username -e POSTGRES_DB=vapor_database -p 5432:5432 -d postgres:latest
 
+echo "💧  building postgres-ssl docker image..."
+docker build -t postgres-ssl https://github.com/scenecheck/postgres-ssl.git
+# docker build -t postgres-ssl ~/Repositories/Docker-Postgres-SSL # 
+
+echo "💧  creating vapor-psql-ssl dev db..."
+docker run -d --name vapor-psql-ssl -e POSTGRES_USER=vapor_username -e POSTGRES_DB=vapor_database -p 5433:5432 postgres-ssl
+
 echo "💧  generating xcode proj..."
 swift package -Xswiftc -DTEST_DOCKER_HOSTNAME generate-xcodeproj