dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1895 from cccaballero/fix_ldap_bytes_error

Browse Source 
Fixed Python 3.x LDAP bug on user firstname and lastname part
This commit is contained in:
mdipierro
2018-04-18 21:59:44 -05:00
committed by GitHub
parent 1e450ed1d6 9b4b412239
commit 53c1f67195
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gluon/contrib/login_methods/ldap_auth.py
View File

@@ -398,17 +398,25 @@ def ldap_auth(server='ldap',
if manage_user:
logger.info('[%s] Manage user data' % str(username))
try:
user_firstname = result[user_firstname_attrib][0]
if user_firstname_part is not None:
store_user_firstname = result[user_firstname_attrib][0].split(' ', 1)[user_firstname_part]
store_user_firstname = user_firstname.split(
b' ' if isinstance(user_firstname, bytes) else ' ',
1
)[user_firstname_part]
else:
store_user_firstname = result[user_firstname_attrib][0]
store_user_firstname = user_firstname
except KeyError as e:
store_user_firstname = None
try:
user_lastname = result[user_lastname_attrib][0]
if user_lastname_part is not None:
store_user_lastname = result[user_lastname_attrib][0].split(' ', 1)[user_lastname_part]
store_user_lastname = user_lastname.split(
b' ' if isinstance(user_lastname, bytes) else ' ',
1
)[user_lastname_part]
else:
store_user_lastname = result[user_lastname_attrib][0]
store_user_lastname = user_lastname
except KeyError as e:
store_user_lastname = None
try: