Don't create NIOSSLClientTLSProvider is SSL disabled

swift-server-community · Aug 12, 2021 · 6fe49a0 · 6fe49a0
1 parent 98be336
commit 6fe49a0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/Sources/MQTTNIO/MQTTConnection.swift b/Sources/MQTTNIO/MQTTConnection.swift
@@ -112,11 +112,13 @@ final class MQTTConnection {
             default:
                 tlsConfiguration = TLSConfiguration.makeClientConfiguration()
             }
-            let sslContext = try NIOSSLContext(configuration: tlsConfiguration)
-            let tlsProvider = try NIOSSLClientTLSProvider<ClientBootstrap>(context: sslContext, serverHostname: serverName)
-            bootstrap = NIOClientTCPBootstrap(clientBootstrap, tls: tlsProvider)
             if client.configuration.useSSL {
+                let sslContext = try NIOSSLContext(configuration: tlsConfiguration)
+                let tlsProvider = try NIOSSLClientTLSProvider<ClientBootstrap>(context: sslContext, serverHostname: serverName)
+                bootstrap = NIOClientTCPBootstrap(clientBootstrap, tls: tlsProvider)
                 return bootstrap.enableTLS()
+            } else {
+                bootstrap = NIOClientTCPBootstrap(clientBootstrap,tls: NIOInsecureNoTLS())
             }
             return bootstrap
         }

diff --git a/Tests/MQTTNIOTests/MQTTNIOTests.swift b/Tests/MQTTNIOTests/MQTTNIOTests.swift
@@ -384,6 +384,26 @@ final class MQTTNIOTests: XCTestCase {
         try client.syncShutdownGracefully()
     }
 
+    func testRawIPConnect() throws {
+        #if os(macOS)
+        if ProcessInfo.processInfo.environment["CI"] != nil {
+            return
+        }
+        let elg = MultiThreadedEventLoopGroup(numberOfThreads: 2)
+        defer { XCTAssertNoThrow(try elg.syncShutdownGracefully()) }
+        let client = MQTTClient(
+            host: "127.0.0.1",
+            identifier: "test/raw-ip",
+            eventLoopGroupProvider: .shared(elg),
+            logger: self.logger
+        )
+        _ = try client.connect().wait()
+        _ = try client.ping().wait()
+        try client.disconnect().wait()
+        try client.syncShutdownGracefully()
+        #endif
+    }
+
     // MARK: Helper variables and functions
 
     func createClient(identifier: String, configuration: MQTTClient.Configuration = .init()) -> MQTTClient {