From ee1753417b4b9670254d8878fb55118a17c993bb Mon Sep 17 00:00:00 2001
From: root <no_mail>
Date: Mon, 17 Jun 2019 08:31:11 +0300
Subject: [PATCH 1/2] Non-working HTTP basic authentication was fixed

---
 root/app/nginx-ldap-auth-daemon.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/root/app/nginx-ldap-auth-daemon.py b/root/app/nginx-ldap-auth-daemon.py
index 28a9065..71339ff 100644
--- a/root/app/nginx-ldap-auth-daemon.py
+++ b/root/app/nginx-ldap-auth-daemon.py
@@ -9,6 +9,7 @@
 import sys, os, signal, base64, ldap, Cookie, argparse
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 from cryptography.fernet import Fernet
+from cryptography.fernet import InvalidToken
 
 #Listen = ('localhost', 8888)
 #Listen = "/tmp/auth.sock"    # Also uncomment lines in 'Requests are
@@ -74,11 +75,16 @@ class AuthHandler(BaseHTTPRequestHandler):
 
         try:
             cipher_suite = Fernet('REPLACEWITHFERNETKEY')
+            self.log_message('Trying to dechipher credentials...')
             auth_decoded = cipher_suite.decrypt(auth_header[6:])
             user, passwd = auth_decoded.split(':', 1)
-
-        except:
+        except InvalidToken:
+            self.log_message('Incorrect token. Trying to decode credentials from BASE64...')
+            auth_decoded = base64.b64decode(auth_header[6:])
+            user, passwd = auth_decoded.split(':', 1)
+        except Exception as e:
             self.auth_failed(ctx)
+            self.log_error(e)
             return True
 
         ctx['user'] = user
@@ -245,8 +251,10 @@ class LDAPAuthHandler(AuthHandler):
             self.send_response(200)
             self.end_headers()
 
-        except:
+        except Exception as e:
             self.auth_failed(ctx)
+            self.log_error(str(e))
+            raise
 
 def exit_handler(signal, frame):
     global Listen

From 0936855c8fb2ebc37caeb83ad0f0101d9ff06692 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Mon, 1 Jul 2019 21:28:11 -0400
Subject: [PATCH 2/2] update readme

---
 README.md       | 1 +
 readme-vars.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a1ffa2f..87041a5 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.07.19:** - Fall back to base64 encoding when basic http auth is used.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **22.02.19:** - Rebasing to alpine 3.9.
 * **18.09.18:** - Update pip
diff --git a/readme-vars.yml b/readme-vars.yml
index 90243d2..d5e2aa0 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -34,6 +34,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "01.07.19:", desc: "Fall back to base64 encoding when basic http auth is used." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
   - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
   - { date: "18.09.18:", desc: "Update pip" }