strict TLS/SLL check, unittest for secure/insecure mqtt client connections

Author: brentru

Adafruit_IO/mqtt_client.py

@@ -56,8 +56,10 @@ def __init__(self, username, key, service_host='io.adafruit.com', secure=True):
         self._client = mqtt.Client()
         if secure:
             self._client.tls_set_context()
+            self._secure = True
         elif not secure:
             print('**THIS CONNECTION IS INSECURE** SSL/TLS not supported for this platform')
+            self._secure = False
         self._client.username_pw_set(username, key)
         self._client.on_connect    = self._mqtt_connect
         self._client.on_disconnect = self._mqtt_disconnect

tests/test_mqtt_client.py

@@ -49,8 +49,10 @@ def test_create_client(self):
         # Verify not connected by default.
         self.assertFalse(client.is_connected())
 
-    def test_connect(self):
-        # Create MQTT test client.
+    def test_secure_connect(self):
+        """Test a secure (port 8883, TLS enabled) AIO connection
+        """
+        # Create MQTT-Secure test client.
         client = MQTTClient(self.get_test_username(), self.get_test_key())
         # Verify on_connect handler is called and expected client is provided.
         def on_connect(mqtt_client):
@@ -61,6 +63,25 @@ def on_connect(mqtt_client):
         self.wait_until_connected(client)
         # Verify connected.
         self.assertTrue(client.is_connected())
+        self.assertTrue(client._secure)
+
+    def test_insecure_connect(self):
+        """Test an insecure (port 1883, TLS disabled) AIO connection
+        """
+        # Create MQTT-Insecure (non-SSL) test client.
+        client = MQTTClient(self.get_test_username(), self.get_test_key(), secure=False)
+        # Verify on_connect handler is called and expected client is provided.
+        def on_connect(mqtt_client):
+            self.assertEqual(mqtt_client, client)
+        client.on_connect = on_connect
+        # Connect and wait until on_connect event is fired.
+        client.connect()
+        self.wait_until_connected(client)
+        # Verify connected.
+        self.assertTrue(client.is_connected())
+        # Verify insecure connection established
+        self.assertFalse(client._secure)
+
 
     def test_disconnect(self):
         # Create MQTT test client.
@@ -100,4 +121,4 @@ def on_message(mqtt_client, feed, payload):
             client.loop()
             time.sleep(0)
         # Verify one update message with payload is received.
-        self.assertListEqual(messages, [('TestFeed', '42')])
+        self.assertListEqual(messages, [('TestFeed', '42')])