mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
dependencies: Upgrade to Django 2.2.10.
Django 2.2.x is the next LTS release after Django 1.11.x; I expect we'll be on it for a while, as Django 3.x won't have an LTS release series out for a while. Because of upstream API changes in Django, this commit includes several changes beyond requirements and: * urls: django.urls.resolvers.RegexURLPattern has been replaced by django.urls.resolvers.URLPattern; affects OpenAPI code and related features which re-parse Django's internals. https://code.djangoproject.com/ticket/28593 * test_runner: Change number to suffix. Django changed the name in this ticket: https://code.djangoproject.com/ticket/28578 * Delete now-unnecessary SameSite cookie code (it's now the default). * forms: urlsafe_base64_encode returns string in Django 2.2. https://docs.djangoproject.com/en/2.2/ref/utils/#django.utils.http.urlsafe_base64_encode * upload: Django's File.size property replaces _get_size(). https://docs.djangoproject.com/en/2.2/_modules/django/core/files/base/ * process_queue: Migrate to new autoreload API. * test_messages: Add an extra query caused by .refresh_from_db() losing the .select_related() on the Realm object. * session: Sync SessionHostDomainMiddleware with Django 2.2. There's a lot more we can do to take advantage of the new release; this is tracked in #11341. Many changes by Tim Abbott, Umair Waheed, and Mateusz Mandera squashed are squashed into this commit. Fixes #10835.
This commit is contained in:
@@ -161,7 +161,6 @@ MIDDLEWARE = (
|
||||
'zerver.middleware.JsonErrorHandler',
|
||||
'zerver.middleware.RateLimitMiddleware',
|
||||
'zerver.middleware.FlushDisplayRecipientCache',
|
||||
'django_cookies_samesite.middleware.CookiesSameSite',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'zerver.middleware.SessionHostDomainMiddleware',
|
||||
'django.middleware.locale.LocaleMiddleware',
|
||||
@@ -379,6 +378,8 @@ REDIS_PASSWORD = get_secret('redis_password')
|
||||
# SECURITY SETTINGS
|
||||
########################################################################
|
||||
|
||||
SESSION_COOKIE_SAMESITE = 'Lax'
|
||||
|
||||
# Tell the browser to never send our cookies without encryption, e.g.
|
||||
# when executing the initial http -> https redirect.
|
||||
#
|
||||
@@ -392,9 +393,6 @@ if PRODUCTION:
|
||||
if domain is not None:
|
||||
CSRF_COOKIE_DOMAIN = '.' + domain
|
||||
|
||||
# Enable SameSite cookies (default in Django 2.1)
|
||||
SESSION_COOKIE_SAMESITE = 'Lax'
|
||||
|
||||
# Prevent Javascript from reading the CSRF token from cookies. Our code gets
|
||||
# the token from the DOM, which means malicious code could too. But hiding the
|
||||
# cookie will slow down some attackers.
|
||||
|
Reference in New Issue
Block a user