Merge pull request #5 from adolfo/feature/add-ssl-support

Add SSL support to MQTTSession
aciidgh · Aug 12, 2016 · e24e0c6 · e24e0c6
2 parents 7ff5af9 + 770abdb
commit e24e0c6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Master:
 
 ## Create MQTTSession object:
 ```swift
-mqttSession = MQTTSession(host: "localhost", port: 1883, clientID: "swift", cleanSession: true, keepAlive: 15)
+mqttSession = MQTTSession(host: "localhost", port: 1883, clientID: "swift", cleanSession: true, keepAlive: 15, useSSL: false)
 ```
 
 ## Connect

diff --git a/SwiftMQTT.podspec b/SwiftMQTT.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
     s.name         = "SwiftMQTT"
-    s.version      = "1.0.0"
+    s.version      = "1.0.1"
     s.summary      = "MQTT Client in pure swift"
     s.description  = <<-DESC
     MQTT Client in pure swift

diff --git a/SwiftMQTT/SwiftMQTT/MQTTSession.swift b/SwiftMQTT/SwiftMQTT/MQTTSession.swift
@@ -32,8 +32,8 @@ public class MQTTSession: MQTTSessionStreamDelegate {
     private var messagesCompletionBlocks = [UInt16 : MQTTSessionCompletionBlock]()
     private var stream: MQTTSessionStream
 
-    public init(host: String, port: UInt16, clientID: String, cleanSession: Bool, keepAlive: UInt16) {
-        stream = MQTTSessionStream(host: host, port: port)
+    public init(host: String, port: UInt16, clientID: String, cleanSession: Bool, keepAlive: UInt16, useSSL: Bool = false) {
+        stream = MQTTSessionStream(host: host, port: port, ssl: useSSL)
         self.clientID = clientID
         self.cleanSession = cleanSession
         self.keepAlive = keepAlive

diff --git a/SwiftMQTT/SwiftMQTT/MQTTSessionStreamDelegate.swift b/SwiftMQTT/SwiftMQTT/MQTTSessionStreamDelegate.swift
@@ -17,15 +17,17 @@ class MQTTSessionStream: NSObject, NSStreamDelegate {
 
     internal let host: String
     internal let port: UInt16
+    internal let ssl: Bool
 
     private var inputStream:NSInputStream?
     private var outputStream:NSOutputStream?
 
     internal var delegate: MQTTSessionStreamDelegate?
 
-    init(host: String, port: UInt16) {
+    init(host: String, port: UInt16, ssl: Bool) {
         self.host = host
         self.port = port
+        self.ssl = ssl
     }
 
     func createStreamConnection() {
@@ -36,6 +38,10 @@ class MQTTSessionStream: NSObject, NSStreamDelegate {
         outputStream?.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
         inputStream?.open()
         outputStream?.open()
+        if ssl {
+            inputStream?.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
+            outputStream?.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
+        }
     }
 
     func closeStreams() {

diff --git a/SwiftMQTT/SwiftMQTTTests/SwiftMQTTTests.swift b/SwiftMQTT/SwiftMQTTTests/SwiftMQTTTests.swift
@@ -16,7 +16,7 @@ class SwiftMQTTTests: XCTestCase, MQTTSessionDelegate {
 
     override func setUp() {
         super.setUp()
-        mqttSession = MQTTSession(host: "localhost", port: 1883, clientID: "swift", cleanSession: true, keepAlive: 15)
+        mqttSession = MQTTSession(host: "localhost", port: 1883, clientID: "swift", cleanSession: true, keepAlive: 15, useSSL: false)
         mqttSession.delegate = self
         mqttSession.connect { (succeeded, error) -> Void in
             XCTAssertTrue(succeeded, "could not connect, error \(error)")

diff --git a/SwiftMQTTExample/SwiftMQTTExample/MQTTViewController.swift b/SwiftMQTTExample/SwiftMQTTExample/MQTTViewController.swift
@@ -50,7 +50,7 @@ class MQTTViewController: UIViewController, MQTTSessionDelegate {
         let port:UInt16 = 1883
         let clientID = self.clientID()
 
-        mqttSession = MQTTSession(host: host, port: port, clientID: clientID, cleanSession: true, keepAlive: 15)
+        mqttSession = MQTTSession(host: host, port: port, clientID: clientID, cleanSession: true, keepAlive: 15, useSSL: false)
         mqttSession.delegate = self
 
         self.appendStringToTextView("Trying to connect to \(host) on port \(port) for clientID \(clientID)")