mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 09:30:31 +00:00
Code Issues Releases Wiki Activity

Fix for Flask-SimpleLDAP 2.0.0

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-05-10 20:23:41 +02:00
parent c8c3b3cba3
commit 5c49c8cdd7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cps/admin.py
View File

@ -1631,7 +1631,10 @@ def import_ldap_users():
imported = 0 imported = 0
for username in new_users: for username in new_users:
user = username.decode('utf-8') if isinstance(username, bytes):
user = username.decode('utf-8')
else:
user = username
if '=' in user: if '=' in user:
# if member object field is empty take user object as filter # if member object field is empty take user object as filter
if config.config_ldap_member_user_object: if config.config_ldap_member_user_object:

2
optional-requirements.txt
View File

@ -21,7 +21,7 @@ python-Levenshtein>=0.12.0,<0.26.0
# ldap login # ldap login
python-ldap>=3.0.0,<3.5.0 python-ldap>=3.0.0,<3.5.0
Flask-SimpleLDAP>=1.4.0,<1.5.0 Flask-SimpleLDAP>=1.4.0,<2.1.0
# oauth # oauth
Flask-Dance>=2.0.0,<7.1.0 Flask-Dance>=2.0.0,<7.1.0