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

Merge pull request #1591 from cccaballero/master

Browse Source 
Some fixes on ldap_auth
This commit is contained in:
mdipierro
2017-03-21 12:24:05 -05:00
committed by GitHub
parent 98dddee697 34f2825a49
commit 35f7caa2f0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/ldap_auth.py
+4 -4
View File
@@ -506,9 +506,9 @@ def ldap_auth(server='ldap',
l = [] l = []
for group in ldap_groups_of_the_user: for group in ldap_groups_of_the_user:
if group in group_mapping: if group in group_mapping:
l += group_mapping[group] l.append(group_mapping[group])
ldap_groups_of_the_user = l ldap_groups_of_the_user = l
logging.info("User groups after remapping: %s" % str(l)) logger.info("User groups after remapping: %s" % str(l))
# #
# Get all group name where the user is in actually in local db # Get all group name where the user is in actually in local db
@@ -528,7 +528,7 @@ def ldap_auth(server='ldap',
except AttributeError as e: except AttributeError as e:
db_user_id = db.auth_user.insert(email=username, first_name=username) db_user_id = db.auth_user.insert(email=username, first_name=username)
if not db_user_id: if not db_user_id:
logging.error( logger.error(
'There is no username or email for %s!' % username) 'There is no username or email for %s!' % username)
raise raise
# if old pydal version, assume this is a relational database which can do joins # if old pydal version, assume this is a relational database which can do joins
@@ -550,7 +550,7 @@ def ldap_auth(server='ldap',
for group in db_group_search.select(db.auth_group.id, db.auth_group.role, distinct=True): for group in db_group_search.select(db.auth_group.id, db.auth_group.role, distinct=True):
db_group_id[group.role] = group.id db_group_id[group.role] = group.id
db_groups_of_the_user.append(group.role) db_groups_of_the_user.append(group.role)
logging.debug('db groups of user %s: %s' % (username, str(db_groups_of_the_user))) logger.debug('db groups of user %s: %s' % (username, str(db_groups_of_the_user)))
auth_membership_changed = False auth_membership_changed = False
# #