Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Only expand paths if set

Browse source
This commit is contained in:
Fabio Manganiello 2020-08-27 16:29:21 +02:00
parent 0d182820e8
commit e77e5bb3d8
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
platypush/backend/mqtt.py
View file

@ -88,15 +88,9 @@ class MqttBackend(Backend):
self._client = None self._client = None
self._listeners = [] self._listeners = []
self.tls_cafile = os.path.abspath(os.path.expanduser(tls_cafile)) \ self.tls_cafile = self._expandpath(tls_cafile) if tls_cafile else None
if tls_cafile else None self.tls_certfile = self._expandpath(tls_certfile) if tls_certfile else None
self.tls_keyfile = self._expandpath(tls_keyfile) if tls_keyfile else None
self.tls_certfile = os.path.abspath(os.path.expanduser(tls_certfile)) \
if tls_certfile else None
self.tls_keyfile = os.path.abspath(os.path.expanduser(tls_keyfile)) \
if tls_keyfile else None
self.tls_version = MQTTPlugin.get_tls_version(tls_version) self.tls_version = MQTTPlugin.get_tls_version(tls_version)
self.tls_ciphers = tls_ciphers self.tls_ciphers = tls_ciphers
self.tls_insecure = tls_insecure self.tls_insecure = tls_insecure
@ -138,6 +132,10 @@ class MqttBackend(Backend):
return handler return handler
@staticmethod
def _expand_path(path: str) -> str:
return os.path.abspath(os.path.expanduser(path)) if path else path
def _initialize_listeners(self, listeners_conf): def _initialize_listeners(self, listeners_conf):
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
@ -153,7 +151,7 @@ class MqttBackend(Backend):
topics = listener.get('topics') topics = listener.get('topics')
username = listener.get('username') username = listener.get('username')
password = listener.get('password') password = listener.get('password')
tls_cafile = os.path.abspath(os.path.expanduser(listener.get('tls_cafile'))) tls_cafile = self._expandpath(listener.get('tls_cafile'))
if not host or not topics: if not host or not topics:
self.logger.warning('No host nor list of topics specified for ' + self.logger.warning('No host nor list of topics specified for ' +
@ -169,8 +167,8 @@ class MqttBackend(Backend):
if tls_cafile: if tls_cafile:
client.tls_set(ca_certs=tls_cafile, client.tls_set(ca_certs=tls_cafile,
certfile=os.path.abspath(os.path.expanduser(listener.get('tls_certfile'))), certfile=self._expandpath(listener.get('tls_certfile')),
keyfile=os.path.abspath(os.path.expanduser(listener.get('tls_keyfile'))), keyfile=self._expandpath(listener.get('tls_keyfile')),
tls_version=MQTTPlugin.get_tls_version(listener.get('tls_version')), tls_version=MQTTPlugin.get_tls_version(listener.get('tls_version')),
ciphers=listener.get('tls_ciphers')) ciphers=listener.get('tls_ciphers'))