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

Merge pull request #5983 from ryanpetrello/release_3.1.3

Browse Source 
Be more restrictive in catching LDAP exceptions.
This commit is contained in:
Ryan Petrello 2017-04-11 16:52:53 -04:00 committed by GitHub
commit f6510dbd4a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/sso/backends.py
View File

@ -12,7 +12,6 @@ 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.core.exceptions import ImproperlyConfigured
# django-auth-ldap
from django_auth_ldap.backend import LDAPSettings as BaseLDAPSettings
@ -90,8 +89,8 @@ class LDAPBackend(BaseLDAPBackend):
return None
try:
return super(LDAPBackend, self).authenticate(username, password)
except ImproperlyConfigured:
logger.error("Unable to authenticate, LDAP is improperly configured")
except Exception:
logger.exception("Encountered an error authenticating to LDAP")
return None
def get_user(self, user_id):