Merge pull request #47 from FlorianLudwig/ssl_argument_parsing

accept boolean as config argument for "ssl"
pull/8/head
Nicolas 2016-07-30 21:37:21 +02:00 zatwierdzone przez GitHub
commit f1df2701b6
1 zmienionych plików z 8 dodań i 2 usunięć

Wyświetl plik

@ -237,7 +237,13 @@ class Broker:
# SSL Context
sc = None
if 'ssl' in listener and listener['ssl'].upper() == 'ON':
# accept string "on" / "off" or boolean
ssl_active = listener.get('ssl', False)
if isinstance(ssl_active, str):
ssl_active = ssl_active.upper() == 'ON'
if ssl_active:
try:
sc = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
sc.load_cert_chain(listener['certfile'], listener['keyfile'])
@ -745,4 +751,4 @@ class Broker:
return self._sessions[client_id][1]
except KeyError:
pass
return None
return None