altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

chore: Remove django-cookie-delete-with-all-settings.patch

Browse source 
Patch no longer applies. Needed until Django 4.2.1, so bring it back
if we deploy something earlier than that to production.
This commit is contained in:
Jennifer Richards 2023-05-09 11:09:41 -03:00
parent 9fde845719
commit 2cf2a3dee6
No known key found for this signature in database
GPG key ID: 9B2BF5C5ADDA6A6E
2 changed files with 1 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/settings.py
View file

@ -76,7 +76,7 @@ MANAGERS = ADMINS
DATABASES = {
'default': {
'NAME': 'datatracker',
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'ENGINE': 'django.db.backends.postgresql',
'USER': 'ietf',
#'PASSWORD': 'somepassword',
},
@ -430,7 +430,6 @@ INSTALLED_APPS = [
'corsheaders',
'django_markup',
'django_password_strength',
'form_utils',
'oidc_provider',
'simple_history',
'tastypie',
@ -1123,7 +1122,6 @@ CHECKS_LIBRARY_PATCHES_TO_APPLY = [
'patch/fix-jwkest-jwt-logging.patch',
'patch/fix-django-password-strength-kwargs.patch',
'patch/add-django-http-cookie-value-none.patch',
'patch/django-cookie-delete-with-all-settings.patch',
'patch/tastypie-django22-fielderror-response.patch',
]
if DEBUG:

46
patch/django-cookie-delete-with-all-settings.patch
View file

@ -1,46 +0,0 @@
--- django/contrib/messages/storage/cookie.py.orig 2020-08-13 11:10:36.719177122 +0200
+++ django/contrib/messages/storage/cookie.py 2020-08-13 11:45:23.503463150 +0200
@@ -92,6 +92,8 @@
response.delete_cookie(
self.cookie_name,
domain=settings.SESSION_COOKIE_DOMAIN,
+ secure=settings.SESSION_COOKIE_SECURE or None,
+ httponly=settings.SESSION_COOKIE_HTTPONLY or None,
samesite=settings.SESSION_COOKIE_SAMESITE,
)
--- django/http/response.py.orig 2020-08-13 11:16:04.060627793 +0200
+++ django/http/response.py 2020-08-13 11:54:03.482476973 +0200
@@ -210,12 +210,18 @@
value = signing.get_cookie_signer(salt=key + salt).sign(value)
return self.set_cookie(key, value, **kwargs)
- def delete_cookie(self, key, path='/', domain=None, samesite=None):
+ def delete_cookie(self, key, path='/', domain=None, secure=False, httponly=False, samesite=None):
# Most browsers ignore the Set-Cookie header if the cookie name starts
# with __Host- or __Secure- and the cookie doesn't use the secure flag.
- secure = key.startswith(('__Secure-', '__Host-'))
+ if key in self.cookies:
+ domain = self.cookies[key].get('domain', domain)
+ secure = self.cookies[key].get('secure', secure)
+ httponly = self.cookies[key].get('httponly', httponly)
+ samesite = self.cookies[key].get('samesite', samesite)
+ else:
+ secure = secure or key.startswith(('__Secure-', '__Host-'))
self.set_cookie(
- key, max_age=0, path=path, domain=domain, secure=secure,
+ key, max_age=0, path=path, domain=domain, secure=secure, httponly=httponly,
expires='Thu, 01 Jan 1970 00:00:00 GMT', samesite=samesite,
)
--- django/contrib/sessions/middleware.py.orig 2020-08-13 12:12:12.401898114 +0200
+++ django/contrib/sessions/middleware.py 2020-08-13 12:14:52.690520659 +0200
@@ -39,6 +39,8 @@
settings.SESSION_COOKIE_NAME,
path=settings.SESSION_COOKIE_PATH,
domain=settings.SESSION_COOKIE_DOMAIN,
+ secure=settings.SESSION_COOKIE_SECURE or None,
+ httponly=settings.SESSION_COOKIE_HTTPONLY or None,
samesite=settings.SESSION_COOKIE_SAMESITE,
)
else: