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

django-auth-ldap: Upgrade to 1.2.15. 

In 1.2.15 version of django-auth-ldap, the authenticate() function of
LDAPBackend takes username and password as keyword arguments. This
commit updates the code to match this change.

Fixes #6588
This commit is contained in:
Umair Khan 2017-10-02 10:24:25 +05:00 committed by Tim Abbott
parent c5b7e3f1ab
commit 4ed182ef44
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/common.txt
View File

@ -55,7 +55,7 @@ defusedxml==0.5.0
diff-match-patch==20121119 diff-match-patch==20121119
# Needed for LDAP support # Needed for LDAP support
django-auth-ldap==1.2.12 django-auth-ldap==1.2.15
# Django extension providing bitfield support # Django extension providing bitfield support
django-bitfield==1.9.3 django-bitfield==1.9.3

2
requirements/dev_lock.txt
View File

@ -45,7 +45,7 @@ decorator==4.1.2 # via ipython, traitlets
defusedxml==0.5.0 defusedxml==0.5.0
dicttoxml==1.7.4 # via moto dicttoxml==1.7.4 # via moto
diff-match-patch==20121119 diff-match-patch==20121119
django-auth-ldap==1.2.12 django-auth-ldap==1.2.15
django-bitfield==1.9.3 django-bitfield==1.9.3
django-pipeline==1.6.13 django-pipeline==1.6.13
django-statsd-mozilla==0.4.0 django-statsd-mozilla==0.4.0

2
requirements/prod_lock.txt
View File

@ -30,7 +30,7 @@ cssutils==1.0.2 # via premailer
decorator==4.1.2 # via ipython, traitlets decorator==4.1.2 # via ipython, traitlets
defusedxml==0.5.0 defusedxml==0.5.0
diff-match-patch==20121119 diff-match-patch==20121119
django-auth-ldap==1.2.12 django-auth-ldap==1.2.15
django-bitfield==1.9.3 django-bitfield==1.9.3
django-pipeline==1.6.13 django-pipeline==1.6.13
django-statsd-mozilla==0.4.0 django-statsd-mozilla==0.4.0

4
zproject/backends.py
View File

@ -426,7 +426,9 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
try: try:
self._realm = get_realm(realm_subdomain) self._realm = get_realm(realm_subdomain)
username = self.django_to_ldap_username(username) username = self.django_to_ldap_username(username)
user_profile = ZulipLDAPAuthBackendBase.authenticate(self, username, password) user_profile = ZulipLDAPAuthBackendBase.authenticate(self,
username=username,
password=password)
if user_profile is None: if user_profile is None:
return None return None
if not check_subdomain(realm_subdomain, user_profile.realm.subdomain): if not check_subdomain(realm_subdomain, user_profile.realm.subdomain):