Skip to content

Support TLS #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonnor merged 2 commits into from
Nov 22, 2017
Merged

Support TLS #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52ea7ca
mqtt: Support TLS connections
jonnor Nov 22, 2017
c00156e
mqtt: Also support PEM encoded client cert with privatekey
jonnor Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions msgflo/msgflo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@

try:
from urllib.parse import urlparse
from urllib.parse import parse_qsl
except ImportError:
from urlparse import urlparse
from urlparse import urlparse
from urlparse import parse_qsl

from optparse import OptionParser

Expand Down Expand Up @@ -248,6 +250,14 @@ def __init__(self, broker):
self.participants = []
self.connected = False

params = dict(parse_qsl(self.broker_info.query))
default_port = 1883
if self.broker_info.scheme == 'mqtts':
default_port = 8883
ca_certs = params.get('ca_certs')
certfile = params.get('certfile')
keyfile = params.get('keyfile')
self._client.tls_set(ca_certs=ca_certs, certfile=certfile, keyfile=keyfile)
if self.broker_info.username:
self._client.username_pw_set(self.broker_info.username, self.broker_info.password)

Expand All @@ -257,9 +267,7 @@ def __init__(self, broker):
self._client.on_subscribe = lambda c, u, m, q: self._on_subscribe(c, u, m, q)

host = self.broker_info.hostname
port = self.broker_info.port
if port is None:
port = 1883
port = self.broker_info.port or default_port
self._client.connect(host, port, 60)

def add_participant(self, participant, iips={}):
Expand Down Expand Up @@ -387,9 +395,9 @@ def run(participants, broker=None, done_cb=None, iips={}):

engine = None
broker_info = urlparse(broker)
if broker_info.scheme == 'amqp':
if broker_info.scheme in ('amqp', 'amqps'):
engine = AmqpEngine(broker)
elif broker_info.scheme == 'mqtt':
elif broker_info.scheme in ('mqtt', 'mqtts'):
engine = MqttEngine(broker)
else:
raise ValueError("msgflo: No engine implementation found for broker URL scheme %s" % (broker_info.scheme,))
Expand Down