Merge pull request #2739 from ryanpetrello/fix-2738

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
commit a13712074f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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