Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

auth: Move LDAP check for whether backend is enabled earlier. 

The previous logic felt fairly convoluted.
This commit is contained in:
Tim Abbott 2017-11-21 12:45:32 -08:00
parent 195a78ad11
commit e100935527
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/backends.py
View File

@ -447,6 +447,8 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
if realm is None:
return None
self._realm = realm
if not ldap_auth_enabled(realm):
return None
try:
username = self.django_to_ldap_username(username)
@ -475,8 +477,6 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
user_profile = get_user_profile_by_email(username)
if not user_profile.is_active or user_profile.realm.deactivated:
raise ZulipLDAPException("Realm has been deactivated")
if not ldap_auth_enabled(user_profile.realm):
raise ZulipLDAPException("LDAP Authentication is not enabled")
return user_profile, False
except UserProfile.DoesNotExist:
if self._realm is None: