Add port 443 check for secure transport to avoid backward compat issue

gojek · Jul 10, 2023 · a3166b0 · a3166b0
1 parent 21d9e6d
commit a3166b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CourierCore/Models/ConnectOptions.swift b/CourierCore/Models/ConnectOptions.swift
@@ -45,4 +45,8 @@ public struct ConnectOptions: Equatable {
         self.alpn = alpn
         self.scheme = scheme
     }
+
+    public var shouldUseSecureTransportLayer: Bool {
+        scheme == "ssl" || scheme == "tls" || port == 443
+    }
 }
diff --git a/CourierMQTT/MQTT/Connection/MQTT-Client-Framework/MQTTClientFrameworkConnection.swift b/CourierMQTT/MQTT/Connection/MQTT-Client-Framework/MQTTClientFrameworkConnection.swift
@@ -74,7 +74,7 @@ class MQTTClientFrameworkConnection: NSObject, IMQTTConnection {
         let port = Int(connectOptions.port)
         var securityPolicy: MQTTSSLSecurityPolicy?
 
-        if connectOptions.scheme == "ssl" || connectOptions.scheme == "tls" {
+        if connectOptions.shouldUseSecureTransportLayer {
             securityPolicy = MQTTSSLSecurityPolicy()
             securityPolicy?.allowInvalidCertificates = true
         }

diff --git a/CourierMQTT/MQTT/Connection/MQTT-Client-Framework/MQTTClientFrameworkSessionManager.swift b/CourierMQTT/MQTT/Connection/MQTT-Client-Framework/MQTTClientFrameworkSessionManager.swift
@@ -144,7 +144,7 @@ class MQTTClientFrameworkSessionManager: NSObject, IMQTTClientFrameworkSessionMa
         printDebug("MQTT - COURIER: Client Session Manager connect to: \(host)")
         self.connectOptions = connectOptions
         let shouldReconnect = self.session != nil
-        let isTls = connectOptions.scheme == "ssl" || connectOptions.scheme == "tls"
+        let isTls = connectOptions.shouldUseSecureTransportLayer
 
         if (self.session == nil || host != self.host) ||
             port != self.port ?? 0 ||