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

Fix warning message on ldap import

Browse Source
This commit is contained in:
Ozzieisaacs 2020-12-03 17:08:51 +01:00
parent 68513b775b
commit a3ef53102d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/web.py
View File

@ -386,7 +386,7 @@ def extract_user_data_from_field(user, field):
if match: if match:
return match.group(1) return match.group(1)
else: else:
raise Exception("Could Not Parse LDAP User: %s", user) raise Exception("Could Not Parse LDAP User: {}".format(user))
# CN=Firstname LastName,OU=Laba,OU=...,DC=...,DC=... # CN=Firstname LastName,OU=Laba,OU=...,DC=...,DC=...
# CN=user displayname,OU=ouname1,OU=ouname2,OU=ouname3,DC=domain,DC=domain # CN=user displayname,OU=ouname1,OU=ouname2,OU=ouname3,DC=domain,DC=domain
@ -395,7 +395,7 @@ def extract_user_identifier(user, filter):
if match: if match:
dynamic_field = match.group(1) dynamic_field = match.group(1)
else: else:
raise Exception("Could Not Parse LDAP User: %s", user) raise Exception("Could Not Parse LDAP User: {}".format(user))
return extract_user_data_from_field(user, dynamic_field) return extract_user_data_from_field(user, dynamic_field)