External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 04:10:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2704 from ryanpetrello/fix-2465

Browse Source 
fix a bug that causes orphaned auth_user rows when LDAP is misconfigured
This commit is contained in:
Ryan Petrello 2018-07-30 12:28:20 -04:00 committed by GitHub
commit 4b0f99ab96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/sso/backends.py
View File

@ -13,11 +13,13 @@ from django.dispatch import receiver
from django.contrib.auth.models import User
from django.conf import settings as django_settings
from django.core.signals import setting_changed
from django.utils.translation import ugettext_lazy as _
# django-auth-ldap
from django_auth_ldap.backend import LDAPSettings as BaseLDAPSettings
from django_auth_ldap.backend import LDAPBackend as BaseLDAPBackend
from django_auth_ldap.backend import populate_user
from django.core.exceptions import ImproperlyConfigured
# radiusauth
from radiusauth.backends import RADIUSBackend as BaseRADIUSBackend
@ -107,7 +109,14 @@ class LDAPBackend(BaseLDAPBackend):
except User.DoesNotExist:
pass
try:
return super(LDAPBackend, self).authenticate(username, password)
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
return user
except Exception:
logger.exception("Encountered an error authenticating to LDAP")
return None