From 7dec909254d06fc9227cae76685413ce08064c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Cesar=20Caballero=20D=C3=ADaz?= Date: Tue, 14 Mar 2017 13:00:32 -0400 Subject: [PATCH 1/2] fixed group mapping on ldap auth --- gluon/contrib/login_methods/ldap_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/contrib/login_methods/ldap_auth.py b/gluon/contrib/login_methods/ldap_auth.py index 89ee56ec..f66f9191 100644 --- a/gluon/contrib/login_methods/ldap_auth.py +++ b/gluon/contrib/login_methods/ldap_auth.py @@ -506,7 +506,7 @@ def ldap_auth(server='ldap', l = [] for group in ldap_groups_of_the_user: if group in group_mapping: - l += group_mapping[group] + l.append(group_mapping[group]) ldap_groups_of_the_user = l logging.info("User groups after remapping: %s" % str(l)) From 34f2825a494ce1524b51615722d5bcc7ceeb9de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Cesar=20Caballero=20D=C3=ADaz?= Date: Tue, 14 Mar 2017 13:09:29 -0400 Subject: [PATCH 2/2] fix ldap_auth logging info not shown --- gluon/contrib/login_methods/ldap_auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gluon/contrib/login_methods/ldap_auth.py b/gluon/contrib/login_methods/ldap_auth.py index f66f9191..56f618d7 100644 --- a/gluon/contrib/login_methods/ldap_auth.py +++ b/gluon/contrib/login_methods/ldap_auth.py @@ -508,7 +508,7 @@ def ldap_auth(server='ldap', if group in group_mapping: l.append(group_mapping[group]) 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 @@ -528,7 +528,7 @@ def ldap_auth(server='ldap', except AttributeError as e: db_user_id = db.auth_user.insert(email=username, first_name=username) if not db_user_id: - logging.error( + logger.error( 'There is no username or email for %s!' % username) raise # 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): db_group_id[group.role] = group.id 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 #