Merge pull request #5209 from ryanpetrello/fix-5204

catch and log LDAP auth plugin misconfigurations
This commit is contained in:
Ryan Petrello 2017-02-06 16:39:11 -05:00 committed by GitHub
commit 71dd48c97f

View File

@ -10,6 +10,7 @@ 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
@ -75,7 +76,11 @@ class LDAPBackend(BaseLDAPBackend):
if not feature_enabled('ldap'):
logger.error("Unable to authenticate, license does not support LDAP authentication")
return None
return super(LDAPBackend, self).authenticate(username, password)
try:
return super(LDAPBackend, self).authenticate(username, password)
except ImproperlyConfigured:
logger.error("Unable to authenticate, LDAP is improperly configured")
return None
def get_user(self, user_id):
if not self.settings.SERVER_URI: