Merge pull request #98 from jpwsutton/mqtt-user-tls

Adding Settings for TLS and Username/Password to MQTT Example

Author: Gadgetoid

examples/mqtt-all.py

@@ -8,6 +8,7 @@
 import argparse
 import ST7735
 import time
+import ssl
 from bme280 import BME280
 from pms5003 import PMS5003, ReadTimeoutError, SerialTimeoutError
 from enviroplus import gas
@@ -38,6 +39,9 @@
 DEFAULT_MQTT_BROKER_PORT = 1883
 DEFAULT_MQTT_TOPIC = "enviroplus"
 DEFAULT_READ_INTERVAL = 5
+DEFAULT_TLS_MODE = False
+DEFAULT_USERNAME = None
+DEFAULT_PASSWORD = None
 
 # mqtt callbacks
 def on_connect(client, userdata, flags, rc):
@@ -165,19 +169,24 @@ def main():
         type=int,
         help="the read interval in seconds",
     )
+    parser.add_argument(
+        "--tls",
+        default=DEFAULT_TLS_MODE,
+        action='store_true',
+        help="enable TLS"
+    )
     parser.add_argument(
         "--username",
-        default=None,
+        default=DEFAULT_USERNAME,
         type=str,
-        help="mqtt username",
+        help="mqtt username"
     )
     parser.add_argument(
         "--password",
-        default=None,
+        default=DEFAULT_PASSWORD,
         type=str,
-        help="mqtt password",
+        help="mqtt password"
     )
-
     args = parser.parse_args()
 
     # Raspberry Pi ID
@@ -191,6 +200,7 @@ def main():
     client_id: {device_id}
     port: {args.port}
     topic: {args.topic}
+    tls: {args.tls}
     username: {args.username}
     password: {args.password}
 
@@ -204,6 +214,13 @@ def main():
         mqtt_client.username_pw_set(args.username, args.password)
     mqtt_client.on_connect = on_connect
     mqtt_client.on_publish = on_publish
+
+    if args.tls is True:
+        mqtt_client.tls_set(tls_version=ssl.PROTOCOL_TLSv1_2)
+
+    if args.username is not None:
+        mqtt_client.username_pw_set(args.username, password=args.password)
+
     mqtt_client.connect(args.broker, port=args.port)
 
     bus = SMBus(1)