External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2739 from ryanpetrello/fix-2738

Browse Source 
fix a bug in multi-LDAP authentication
This commit is contained in:
Ryan Petrello
2018-08-02 08:27:13 -04:00
committed by GitHub
parent c09a23f063 2102c1ef0a
commit a13712074f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/sso/backends.py
View File

@@ -110,12 +110,13 @@ class LDAPBackend(BaseLDAPBackend):
pass pass
try: try:
user = super(LDAPBackend, self).authenticate(username, password) user = super(LDAPBackend, self).authenticate(username, password)
try: if user and getattr(user, 'ldap_user', None):
user.ldap_user._get_groups().get_group_dns() try:
except ImproperlyConfigured: user.ldap_user._get_groups().get_group_dns()
logger.exception(_("Encountered an error populating user {} from LDAP").format(user.username)) except ImproperlyConfigured:
user.delete() logger.exception(_("Encountered an error populating user {} from LDAP").format(user.username))
raise user.delete()
raise
return user return user
except Exception: except Exception:
logger.exception("Encountered an error authenticating to LDAP") logger.exception("Encountered an error authenticating to LDAP")