paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

requirements: Upgrade django-auth-ldap to 1.6.0.

Browse Source 
The autenticate function now follows the signature of
Django 2.0 https://github.com/django-auth-ldap/
django-auth-ldap/commit/27a8052b26f1d3a43cdbcdfc8e7dc0322580adae

Also AUTH_LDAP_CACHE_GROUPS is depricated in favor of
AUTH_LDAP_CACHE_TIMEOUT.
This commit is contained in:
Vishnu Ks
2018-08-01 10:38:41 +00:00
committed by Tim Abbott
parent bcab6748ff
commit c0ed2283d3
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/common.in
View File

@@ -52,7 +52,7 @@ cryptography==2.3
defusedxml==0.5.0 defusedxml==0.5.0
# Needed for LDAP support # Needed for LDAP support
django-auth-ldap==1.5.0 django-auth-ldap==1.6.0
# Django extension providing bitfield support # Django extension providing bitfield support
-e git+https://github.com/zulip/django-bitfield@0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38#egg=django-bitfield==1.9.3+dev.0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38 -e git+https://github.com/zulip/django-bitfield@0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38#egg=django-bitfield==1.9.3+dev.0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38

4
requirements/dev.txt
View File

@@ -46,7 +46,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
disposable-email-domains==0.0.30 disposable-email-domains==0.0.30
django-auth-ldap==1.5.0 django-auth-ldap==1.6.0
django-formtools==2.1 # via django-two-factor-auth django-formtools==2.1 # via django-two-factor-auth
django-otp==0.4.1.1 # via django-two-factor-auth django-otp==0.4.1.1 # via django-two-factor-auth
django-phonenumber-field==1.3.0 # via django-two-factor-auth django-phonenumber-field==1.3.0 # via django-two-factor-auth
@@ -135,7 +135,7 @@ pysocks==1.6.7 # via twilio
python-dateutil==2.6.1 python-dateutil==2.6.1
python-digitalocean==1.13.2 python-digitalocean==1.13.2
python-gcm==0.4 python-gcm==0.4
python-ldap==3.0.0 # via django-auth-ldap, pyldap python-ldap==3.1.0 # via django-auth-ldap, pyldap
python-twitter==3.4.2 python-twitter==3.4.2
python3-openid==3.1.0 # via social-auth-core python3-openid==3.1.0 # via social-auth-core
pytz==2018.5 pytz==2018.5

4
requirements/prod.txt
View File

@@ -34,7 +34,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
disposable-email-domains==0.0.30 disposable-email-domains==0.0.30
django-auth-ldap==1.5.0 django-auth-ldap==1.6.0
django-formtools==2.1 # via django-two-factor-auth django-formtools==2.1 # via django-two-factor-auth
django-otp==0.4.1.1 # via django-two-factor-auth django-otp==0.4.1.1 # via django-two-factor-auth
django-phonenumber-field==1.3.0 # via django-two-factor-auth django-phonenumber-field==1.3.0 # via django-two-factor-auth
@@ -97,7 +97,7 @@ pyopenssl==17.3.0 # via ndg-httpsclient, requests
pysocks==1.6.7 # via twilio pysocks==1.6.7 # via twilio
python-dateutil==2.6.1 python-dateutil==2.6.1
python-gcm==0.4 python-gcm==0.4
python-ldap==3.0.0 # via django-auth-ldap python-ldap==3.1.0 # via django-auth-ldap
python-twitter==3.4.2 python-twitter==3.4.2
python3-openid==3.1.0 # via social-auth-core python3-openid==3.1.0 # via social-auth-core
pytz==2018.5 pytz==2018.5

2
version.py
View File

@@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.1+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '25.4' PROVISION_VERSION = '25.5'

1
zproject/backends.py
View File

@@ -292,6 +292,7 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
return None return None
return ZulipLDAPAuthBackendBase.authenticate(self, return ZulipLDAPAuthBackendBase.authenticate(self,
request=None,
username=username, username=username,
password=password) password=password)

2
zproject/settings.py
View File

@@ -138,7 +138,7 @@ DEFAULT_SETTINGS = {
'AUTH_LDAP_SERVER_URI': "", 'AUTH_LDAP_SERVER_URI': "",
'LDAP_EMAIL_ATTR': None, 'LDAP_EMAIL_ATTR': None,
# Disable django-auth-ldap caching, to prevent problems with OU changes. # Disable django-auth-ldap caching, to prevent problems with OU changes.
'AUTH_LDAP_GROUP_CACHE_TIMEOUT': 0, 'AUTH_LDAP_CACHE_TIMEOUT': 0,
# Social auth; we support providing values for some of these # Social auth; we support providing values for some of these
# settings in zulip-secrets.conf instead of settings.py in development. # settings in zulip-secrets.conf instead of settings.py in development.