From 594443d1dc79a5ffe50050241752ae6257b4bd00 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 22 May 2016 13:24:45 -0700
Subject: [PATCH 1/5] Match port as well when retrieving pms url

---
 plexpy/plextv.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index ab0ed37a..3b5e34ae 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -108,7 +108,8 @@ def get_real_pms_url():
 
             if connections:
                 # Get connection with matching address, otherwise return first connection
-                conn = next((c for c in connections if c['address'] == plexpy.CONFIG.PMS_IP), connections[0])
+                conn = next((c for c in connections if c['address'] == plexpy.CONFIG.PMS_IP
+                             and c['port'] == plexpy.CONFIG.PMS_PORT), connections[0])
                 plexpy.CONFIG.__setattr__('PMS_URL', conn['uri'])
                 plexpy.CONFIG.write()
                 logger.info(u"PlexPy PlexTV :: Server URL retrieved.")

From f6a3bc57e2abb9994dda3fc4ce5d80505046d5ee Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 22 May 2016 13:24:52 -0700
Subject: [PATCH 2/5] Fix typos

---
 ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 9193aa24..631e3228 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,10 +1,10 @@
 <!---
 Reporting Issues:
-  * To ensure that a develpoer has enough information to work with please include all of the information below.
+  * To ensure that a developer has enough information to work with please include all of the information below.
     Please provide as much detail as possible. Screenshots can be very useful to see the problem.
   * Use proper markdown syntax to structure your post (i.e. code/log in code blocks).
     See: https://help.github.com/articles/basic-writing-and-formatting-syntax/
-  * Iclude a link to your **FULL** log file that has the error(not just a few lines!).
+  * Include a link to your **FULL** log file that has the error(not just a few lines!).
     Please use [Gist](http://gist.github.com) or [Pastebin](http://pastebin.com/).
 
 Feature Requests:

From 16cbfed20b127001a5a2a8f1c4e3bf79a304de9c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 22 May 2016 14:23:55 -0700
Subject: [PATCH 3/5] Option to use HTTP basic authentication

---
 PlexPy.py                             |  1 +
 data/interfaces/default/settings.html | 33 +++++++++++++++++++++++----
 plexpy/config.py                      |  1 +
 plexpy/webserve.py                    |  3 ++-
 plexpy/webstart.py                    | 20 ++++++++++++----
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/PlexPy.py b/PlexPy.py
index 5ea68130..82a91808 100755
--- a/PlexPy.py
+++ b/PlexPy.py
@@ -214,6 +214,7 @@ def main():
         'https_key': plexpy.CONFIG.HTTPS_KEY,
         'http_username': plexpy.CONFIG.HTTP_USERNAME,
         'http_password': plexpy.CONFIG.HTTP_PASSWORD,
+        'http_basic_auth': plexpy.CONFIG.HTTP_BASIC_AUTH
     }
     webstart.initialize(web_config)
 
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 169ab3d6..a6cedf9a 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -528,10 +528,17 @@
                             <label>
                                 <input type="checkbox" name="http_hash_password" id="http_hash_password" value="1" ${config['http_hash_password']} data-parsley-trigger="change"> Hash Password in the Config File
                             </label>
+                            <span id="hashPasswordCheck" style="color: #eb8600; padding-left: 10px;"></span>
                             <p class="help-block">Store a hashed password in the config file.<br />Warning: Your password cannot be recovered if forgotten!</p>
                         </div>
                         <input type="text" id="http_hashed_password" name="http_hashed_password" value="${config['http_hashed_password']}" style="display: none;" data-parsley-trigger="change" data-parsley-type="integer" data-parsley-range="[0, 1]" 
                                data-parsley-errors-container="#http_hash_password_error" data-parsley-error-message="Cannot un-hash password, please set a new password." data-parsley-no-focus required>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" class="auth-settings" name="http_basic_auth" id="http_basic_auth" value="1" ${config['http_basic_auth']} data-parsley-trigger="change"> Use Basic Authentication
+                            </label>
+                            <p class="help-block">Use basic HTTP authentication instead of the HTML login form.</p>
+                        </div>
 
 
                         <div class="padded-header">
@@ -566,7 +573,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <p class="help-block">Current API key: <strong><br/>${config['api_key']}</strong></p>
+                            <p class="help-block">Current API key: <strong> ${config['api_key']}</strong></p>
                         </div>
 
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
@@ -2570,7 +2577,11 @@ $(document).ready(function() {
     });
 
     function allowGuestAccessCheck () {
-        if ($('#http_username').val() == '' || $('#http_password').val() == '') {
+        if ($("#http_basic_auth").is(":checked")) {
+            $("#allow_guest_access").attr("disabled", true);
+            $("#allow_guest_access").attr("checked", false);
+            $("#allowGuestCheck").html("Guest access cannot be enabled with basic authentication.");
+        } else if ($('#http_username').val() == '' || $('#http_password').val() == '') {
             $("#allow_guest_access").attr("disabled", true);
             $("#allow_guest_access").attr("checked", false);
             $("#allowGuestCheck").html("You must set an admin password above to allow guest access.");
@@ -2581,18 +2592,30 @@ $(document).ready(function() {
     }
     allowGuestAccessCheck();
 
-    $('#http_username, #http_password').change(function () {
+    $('#http_username, #http_password, #http_basic_auth').change(function () {
         allowGuestAccessCheck();
     });
 
-
-    $("#http_hash_password").click(function(){
+    function hashPasswordCheck () {
+        if ($("#http_basic_auth").is(":checked")) {
+            $("#http_hash_password").attr("checked", false);
+            $("#http_hash_password").attr("disabled", true);
+            $("#hashPasswordCheck").html("Password cannot be hashed with basic authentication.");
+        } else {
+            $("#http_hash_password").attr("disabled", false);
+            $("#hashPasswordCheck").html("");
+        }
         if (!($("#http_hash_password").is(":checked")) && $("#http_hashed_password").val() == "1" && $("#http_password").val() == "    ") {
             $("#http_hashed_password").val(-1);
         } else if ($("#http_hash_password").is(":checked") && $("#http_hashed_password").val() == "-1" && $("#http_password").val() == "    ") {
             $("#http_hashed_password").val(1);
             $("#http_hash_password_error").html("");
         }
+    }
+    hashPasswordCheck();
+
+    $('#http_password, #http_hash_password, #http_basic_auth').change(function () {
+        hashPasswordCheck();
     });
 
     $('#http_password').change(function () {
diff --git a/plexpy/config.py b/plexpy/config.py
index 02a89c4d..e1b70d53 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -185,6 +185,7 @@ _CONFIG_DEFINITIONS = {
     'HTTPS_KEY': (str, 'General', ''),
     'HTTPS_DOMAIN': (str, 'General', 'localhost'),
     'HTTPS_IP': (str, 'General', '127.0.0.1'),
+    'HTTP_BASIC_AUTH': (int, 'General', 0),
     'HTTP_ENVIRONMENT': (str, 'General', 'production'),
     'HTTP_HASH_PASSWORD': (int, 'General', 0),
     'HTTP_HASHED_PASSWORD': (int, 'General', 0),
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 008ee775..d5cbcb00 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2247,6 +2247,7 @@ class WebInterface(object):
 
         config = {
             "allow_guest_access": checked(plexpy.CONFIG.ALLOW_GUEST_ACCESS),
+            "http_basic_auth": checked(plexpy.CONFIG.HTTP_BASIC_AUTH),
             "http_hash_password": checked(plexpy.CONFIG.HTTP_HASH_PASSWORD),
             "http_hashed_password": plexpy.CONFIG.HTTP_HASHED_PASSWORD,
             "http_host": plexpy.CONFIG.HTTP_HOST,
@@ -2367,7 +2368,7 @@ class WebInterface(object):
             "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",
             "notify_consecutive", "notify_upload_posters", "notify_recently_added", "notify_recently_added_grandparent",
             "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
-            "allow_guest_access", "cache_images", "http_proxy"
+            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth"
         ]
         for checked_config in checked_configs:
             if checked_config not in kwargs:
diff --git a/plexpy/webstart.py b/plexpy/webstart.py
index d9197d39..e498ce29 100644
--- a/plexpy/webstart.py
+++ b/plexpy/webstart.py
@@ -66,8 +66,13 @@ def initialize(options):
 
     if options['http_password']:
         logger.info(u"PlexPy WebStart :: Web server authentication is enabled, username is '%s'", options['http_username'])
-        options_dict['tools.sessions.on'] = auth_enabled = session_enabled = True
-        cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth)
+        if options['http_basic_auth']:
+            auth_enabled = session_enabled = False
+            basic_auth_enabled = True
+        else:
+            options_dict['tools.sessions.on'] = auth_enabled = session_enabled = True
+            basic_auth_enabled = False
+            cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth)
     else:
         auth_enabled = session_enabled = False
 
@@ -88,7 +93,14 @@ def initialize(options):
                                       'application/javascript'],
             'tools.auth.on': auth_enabled,
             'tools.sessions.on': session_enabled,
-            'tools.sessions.timeout': 30 * 24 * 60  # 30 days
+            'tools.sessions.timeout': 30 * 24 * 60,  # 30 days
+            'tools.auth_basic.on': basic_auth_enabled,
+            'tools.auth_basic.realm': 'PlexPy web server',
+            'tools.auth_basic.checkpassword': cherrypy.lib.auth_basic.checkpassword_dict({
+                options['http_username']: options['http_password']})
+        },
+        '/api': {
+            'tools.auth_basic.on': False
         },
         '/interfaces': {
             'tools.staticdir.on': True,
@@ -199,7 +211,7 @@ def initialize(options):
             'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
             'tools.auth.on': False,
             'tools.sessions.on': False
-        },
+        }
     }
 
     # Prevent time-outs

From 1c627f464960ed47a132d54eb419faa059ec4a64 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 22 May 2016 14:54:44 -0700
Subject: [PATCH 4/5] Fix unable to save settings when checking http proxy

---
 data/interfaces/default/settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index a6cedf9a..415652a0 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -434,7 +434,7 @@
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" name="http_proxy http-settings" id="http_proxy" value="1" ${config['http_proxy']}> Enable HTTP Proxy
+                                <input type="checkbox" class="http-settings" name="http_proxy" id="http_proxy" value="1" ${config['http_proxy']}> Enable HTTP Proxy
                             </label>
                             <p class="help-block">Respect the X-Forwarded-Proto header. Used for reverse proxies with SSL.</p>
                         </div>

From cb0e65337fcaa46094fe97d1fc7669fb2bddc9b0 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 22 May 2016 15:04:17 -0700
Subject: [PATCH 5/5] v1.4.2

---
 CHANGELOG.md      | 7 +++++++
 plexpy/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ac584ed..70aef766 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.4.2 (2016-05-22)
+
+* New: Option to use HTTP basic authentication instead of the HTML login form.
+* Fix: Unable to save settings when enabling the HTTP proxy setting.
+* Change: Match the PMS port when retrieving the PMS url.
+
+
 ## v1.4.1 (2016-05-20)
 
 * New: HTTP Proxy checkbox in the settings. Enable this if using an SSL enabled reverse proxy in front of PlexPy.
diff --git a/plexpy/version.py b/plexpy/version.py
index 44483b96..c685b594 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.1"
+PLEXPY_RELEASE_VERSION = "1.4.2"