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

Merge pull request #944 from stephenrauch/ldap_auth-fix-nosql

Browse Source 
Fix ldap_auth for NoSQL databases
This commit is contained in:
mdipierro
2015-04-26 08:29:26 -05:00
parent 970e2ed35c 0ad50630f2
commit 756aec7206
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/ldap_auth.py
+11 -3
View File
@@ -521,9 +521,17 @@ def ldap_auth(server='ldap', port=None,
logging.error(
'There is no username or email for %s!' % username)
raise
db_group_search = db((db.auth_membership.user_id == db_user_id) &
(db.auth_user.id == db.auth_membership.user_id) &
(db.auth_group.id == db.auth_membership.group_id))
if not db.can_join():
# no joins on NoSQL databases, perform two queries
db_group_search = db(db.auth_membership.user_id == db_user_id)
group_ids = [x.group_id for x in db_group_search.select(
db.auth_membership.group_id, distinct=True)]
db_group_search = db(db.auth_group.id == group_ids)
else:
db_group_search = db(
(db.auth_membership.user_id == db_user_id) &
(db.auth_user.id == db.auth_membership.user_id) &
(db.auth_group.id == db.auth_membership.group_id))
db_groups_of_the_user = list()
db_group_id = dict()