From 61daedf1a5c18a6e7de00741f6b8eda4ea884657 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 17 Jul 2015 01:09:27 +0200 Subject: [PATCH] Add config option to force SSL connections to PMS. --- data/interfaces/default/config.html | 6 ++++++ plexpy/pmsconnect.py | 5 ++++- plexpy/webserve.py | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 095b74c1..b2c18b47 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -181,6 +181,12 @@

If you have media indexing enabled on your server, use these on the activity pane.

+
+
+ Force SSL +

Force PlexPy to connect to your Plex Server via SSL.

+
+

Plex Logs

diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 9da5b041..53317725 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -24,7 +24,10 @@ class PmsConnect(object): """ def __init__(self): - self.protocol = 'HTTP' + if plexpy.CONFIG.PMS_SSL: + self.protocol = 'HTTPS' + else: + self.protocol = 'HTTP' self.request_handler = http_handler.HTTPHandler(host=plexpy.CONFIG.PMS_IP, port=plexpy.CONFIG.PMS_PORT, token=plexpy.CONFIG.PMS_TOKEN) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index abde1c6f..b238563c 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -368,6 +368,7 @@ class WebInterface(object): "pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER, "pms_port": plexpy.CONFIG.PMS_PORT, "pms_token": plexpy.CONFIG.PMS_TOKEN, + "pms_ssl": checked(plexpy.CONFIG.PMS_SSL), "pms_use_bif": checked(plexpy.CONFIG.PMS_USE_BIF), "pms_uuid": plexpy.CONFIG.PMS_UUID, "plexwatch_database": plexpy.CONFIG.PLEXWATCH_DATABASE, @@ -410,7 +411,7 @@ class WebInterface(object): "pushover_enabled", "pushbullet_enabled", "twitter_enabled", "osx_notify_enabled", "boxcar_enabled", "email_enabled", "email_tls", - "grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", + "grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", "pms_ssl", "tv_notify_enable", "movie_notify_enable", "music_notify_enable", "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start", "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop",