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

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

Browse source
This commit is contained in:
Jennifer Richards 2023-05-16 13:58:06 -03:00
parent 76fa01b817
commit e7ae72bce5
No known key found for this signature in database
GPG key ID: 9B2BF5C5ADDA6A6E
1 changed files with 23 additions and 20 deletions

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

@ -1,6 +1,6 @@
--- 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
@@ -108,6 +108,8 @@
@@ -109,6 +109,8 @@
response.delete_cookie(
self.cookie_name,
domain=settings.SESSION_COOKIE_DOMAIN,
@ -11,39 +11,42 @@
--- 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
@@ -243,12 +243,18 @@
@@ -261,20 +261,28 @@
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):
- def delete_cookie(self, key, path="/", domain=None, samesite=None):
+ def delete_cookie(self, key, path="/", domain=None, secure=False, httponly=False, samesite=None):
# Browsers can ignore the Set-Cookie header if the cookie doesn't use
# the secure flag and:
# - the cookie name starts with "__Host-" or "__Secure-", or
# - the samesite is "none".
- secure = (
- key.startswith(('__Secure-', '__Host-')) or
- (samesite and samesite.lower() == 'none')
- secure = key.startswith(("__Secure-", "__Host-")) or (
- samesite and samesite.lower() == "none"
- )
+ 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)
+ 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-')) or
+ (samesite and samesite.lower() == 'none')
+ key.startswith(("__Secure-", "__Host-")) or
+ (samesite and samesite.lower() == "none")
+ )
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,
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
@@ -40,6 +40,8 @@
@@ -38,6 +38,8 @@
settings.SESSION_COOKIE_NAME,
path=settings.SESSION_COOKIE_PATH,
domain=settings.SESSION_COOKIE_DOMAIN,
@ -51,4 +54,4 @@
+ httponly=settings.SESSION_COOKIE_HTTPONLY or None,
samesite=settings.SESSION_COOKIE_SAMESITE,
)
patch_vary_headers(response, ('Cookie',))
patch_vary_headers(response, ("Cookie",))