From f1d973b44626fe672f20f54f1954d7e87e761096 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Tue, 16 Nov 2021 14:06:31 +0100
Subject: [PATCH] [deps] Updated flask requirement

---
 flaschengeist/plugins/auth_ldap/__init__.py | 6 ++----
 setup.py                                    | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/flaschengeist/plugins/auth_ldap/__init__.py b/flaschengeist/plugins/auth_ldap/__init__.py
index ab001a2..dffbc3c 100644
--- a/flaschengeist/plugins/auth_ldap/__init__.py
+++ b/flaschengeist/plugins/auth_ldap/__init__.py
@@ -6,8 +6,7 @@ from typing import Optional
 from flask_ldapconn import LDAPConn
 from flask import current_app as app
 from ldap3.core.exceptions import LDAPPasswordIsMandatoryError, LDAPBindError
-from ldap3 import SUBTREE, MODIFY_REPLACE, MODIFY_ADD, MODIFY_DELETE, HASHED_SALTED_SHA
-from ldap3.utils.hashed import hashed
+from ldap3 import SUBTREE, MODIFY_REPLACE, MODIFY_ADD, MODIFY_DELETE
 from werkzeug.exceptions import BadRequest, InternalServerError, NotFound
 
 from flaschengeist import logger
@@ -30,7 +29,6 @@ class AuthLDAP(AuthPlugin):
             LDAP_TLS_VERSION=ssl.PROTOCOL_TLS,
             FORCE_ATTRIBUTE_VALUE_AS_LIST=True,
         )
-        logger.warning(app.config.get("LDAP_USE_SSL"))
         if "ca_cert" in config:
             app.config["LDAP_CA_CERTS_FILE"] = config["ca_cert"]
         else:
@@ -242,7 +240,7 @@ class AuthLDAP(AuthPlugin):
                 password_hash = base64.b64encode(pbkdf2_hmac("sha512", password.encode("utf-8"), salt, rounds)).decode()
                 return f"{{PBKDF2-SHA512}}{rounds}${base64.b64encode(salt).decode()}${password_hash}"
             else:
-                return hashed(HASHED_SALTED_SHA, password)
+                return f"{{SSHA}}{base64.b64encode(sha1(password.encode() + salt).digest() + salt)}"
 
     def _get_groups(self, uid):
         groups = []
diff --git a/setup.py b/setup.py
index adef712..d8ccc0f 100644
--- a/setup.py
+++ b/setup.py
@@ -33,9 +33,9 @@ setup(
     scripts=["run_flaschengeist"],
     python_requires=">=3.7",
     install_requires=[
-        "Flask >= 1.1",
+        "Flask >= 2.0",
         "toml",
-        "sqlalchemy>=1.4",
+        "sqlalchemy>=1.4.26",
         "flask_sqlalchemy>=2.5",
         "flask_cors",
         "Pillow>=8.4.0",