From e99db76a92558a04f749e1079e79f5bc6888c66c Mon Sep 17 00:00:00 2001 From: kidburglar Date: Sat, 17 Aug 2019 21:28:47 +0200 Subject: [PATCH] Use ca configuration if defined --- syncplay/client.py | 5 +++++ syncplay/ui/ConfigurationGetter.py | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 8a42bc8..9822b23 100755 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -129,6 +129,11 @@ class SyncplayClient(object): self._serverSupportsTLS = True + """Override certPath if defined in the configuration""" + if config['ca']: + certPath = config['ca'] + os.environ['SSL_CERT_FILE'] = certPath + if constants.LIST_RELATIVE_CONFIGS and 'loadedRelativePaths' in self._config and self._config['loadedRelativePaths']: paths = "; ".join(self._config['loadedRelativePaths']) self.ui.showMessage(getMessage("relative-config-notification").format(paths), noPlayer=True, noTimestamp=True) diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index 720dfc0..b606048 100755 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -92,7 +92,8 @@ class ConfigurationGetter(object): "notificationTimeout": 3, "alertTimeout": 5, "chatTimeout": 7, - "publicServers": [] + "publicServers": [], + "ca": None } self._defaultConfig = self._config.copy() @@ -191,7 +192,7 @@ class ConfigurationGetter(object): "autoplayInitialState", "mediaSearchDirectories", "sharedPlaylistEnabled", "loopAtEndOfPlaylist", "loopSingleFiles", - "onlySwitchToTrustedDomains", "trustedDomains", "publicServers"], + "onlySwitchToTrustedDomains", "trustedDomains", "publicServers", "ca"], "gui": [ "showOSD", "showOSDWarnings", "showSlowdownOSD", "showDifferentRoomOSD", "showSameRoomOSD",