NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix for flask-ldap 2.0.0

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-05-10 11:30:47 +02:00
parent 2c37546598
commit 4911843146
2 changed files with 10 additions and 7 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:

12
optional-requirements.txt
View File

@ -5,8 +5,8 @@ greenlet>=0.4.17,<3.1.0
httplib2>=0.9.2,<0.23.0 httplib2>=0.9.2,<0.23.0
oauth2client>=4.0.0,<4.1.4 oauth2client>=4.0.0,<4.1.4
uritemplate>=3.0.0,<4.2.0 uritemplate>=3.0.0,<4.2.0
pyasn1-modules>=0.0.8,<0.4.0 pyasn1-modules>=0.0.8,<0.5.0
pyasn1>=0.1.9,<0.6.0 pyasn1>=0.1.9,<0.7.0
PyDrive2>=1.3.1,<1.20.0 PyDrive2>=1.3.1,<1.20.0
PyYAML>=3.12,<6.1 PyYAML>=3.12,<6.1
rsa>=3.4.2,<4.10.0 rsa>=3.4.2,<4.10.0
@ -21,18 +21,18 @@ 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
SQLAlchemy-Utils>=0.33.5,<0.42.0 SQLAlchemy-Utils>=0.33.5,<0.42.0
# metadata extraction # metadata extraction
rarfile>=3.2,<4.2 rarfile>=3.2,<5.0
scholarly>=1.2.0,<1.8 scholarly>=1.2.0,<1.8
markdown2>=2.0.0,<2.5.0 markdown2>=2.0.0,<2.5.0
html2text>=2020.1.16,<2024.2.26 html2text>=2020.1.16,<2024.2.26
python-dateutil>=2.1,<2.9.0 python-dateutil>=2.1,<2.10.0
beautifulsoup4>=4.0.1,<4.13.0 beautifulsoup4>=4.0.1,<4.13.0
faust-cchardet>=2.1.18,<2.1.20 faust-cchardet>=2.1.18,<2.1.20
py7zr>=0.15.0,<0.21.0 py7zr>=0.15.0,<0.21.0
@ -42,4 +42,4 @@ natsort>=2.2.0,<8.5.0
comicapi>=2.2.0,<3.3.0 comicapi>=2.2.0,<3.3.0
# Kobo integration # Kobo integration
jsonschema>=3.2.0,<4.22.0 jsonschema>=3.2.0,<4.23.0