Merge pull request #7 from myDevicesIoT/feature/secure-connection

Feature/secure connection

Author: jburhenn

README.rst

@@ -4,7 +4,7 @@ The Cayenne MQTT Python Library provides functions to easily connect to the `Cay
 
 Requirements
 ============
-* `Python 2.7 or 3.x <https://www.python.org/downloads/>`_.
+* `Python 2.7.9+ or 3.4+ <https://www.python.org/downloads/>`_.
 * `This library <https://github.com/myDevicesIoT/Cayenne-MQTT-Python/archive/master.zip>`_.
 * `Eclipse Paho MQTT Python client library <https://github.com/eclipse/paho.mqtt.python>`_. This is installed as part of the Cayenne library installation.
 

cayenne/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.1.0"

cayenne/client.py

@@ -1,5 +1,6 @@
-import paho.mqtt.client as mqtt
 import time
+from ssl import PROTOCOL_TLSv1_2
+import paho.mqtt.client as mqtt
 from cayenne import __version__
 
 # Data types
@@ -140,8 +141,10 @@ def begin(self, username, password, clientid, hostname='mqtt.mydevices.com', por
         self.client.on_disconnect = on_disconnect
         self.client.on_message = on_message
         self.client.username_pw_set(username, password)
+        if port == 8883:
+            self.client.tls_set(tls_version=PROTOCOL_TLSv1_2)
         self.client.connect(hostname, port, 60)        
-        print("Connecting to %s..." % hostname)
+        print("Connecting to {}:{}".format(hostname, port))
 
     def loop(self):
         """Process Cayenne messages.

examples/Example-01-SendData.py

@@ -9,8 +9,9 @@
 
 
 client = cayenne.client.CayenneMQTTClient()
-
 client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID)
+# For a secure connection use port 8883 when calling client.begin:
+# client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID, port=8883)
 
 i=0
 timestamp = 0

examples/Example-02-ReceiveData.py

@@ -15,5 +15,7 @@ def on_message(message):
 client = cayenne.client.CayenneMQTTClient()
 client.on_message = on_message
 client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID)
+# For a secure connection use port 8883 when calling client.begin:
+# client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID, port=8883)
 client.loop_forever()
 

examples/Example-03-CayenneClient.py

@@ -16,6 +16,8 @@ def on_message(message):
 client = cayenne.client.CayenneMQTTClient()
 client.on_message = on_message
 client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID)
+# For a secure connection use port 8883 when calling client.begin:
+# client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID, port=8883)
 
 i=0
 timestamp = 0

setup.py

@@ -9,15 +9,15 @@
 with open(path.join(here, 'README.rst'), encoding='utf-8') as readme:
     long_description = readme.read()
 
-classifiers = ['Development Status :: 3 - Alpha',
+classifiers = ['Development Status :: 5 - Production/Stable',
                'Operating System :: MacOS :: MacOS X',
                'Operating System :: Microsoft :: Windows',
                'Operating System :: POSIX',
                'Programming Language :: Python',
                'License :: OSI Approved :: MIT License',
                'Intended Audience :: Developers',
                'Programming Language :: Python :: 2.7',
-               'Programming Language :: Python :: 3',
+               'Programming Language :: Python :: 3.4',
                'Topic :: Software Development',
                'Topic :: Communications',
                'Topic :: Internet',
@@ -36,6 +36,6 @@
       classifiers      = classifiers,
       packages         = ['cayenne'],
       install_requires = [
-        'paho-mqtt >= 1.0',
+        'paho-mqtt >= 1.3.0',
       ],
       )