Skip to content

Commit e7ae72b

Browse files
chore: Update django-cookie-delete-with-all-settings.patch
1 parent 76fa01b commit e7ae72b

1 file changed

Lines changed: 23 additions & 20 deletions

File tree

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- django/contrib/messages/storage/cookie.py.orig 2020-08-13 11:10:36.719177122 +0200
22
+++ django/contrib/messages/storage/cookie.py 2020-08-13 11:45:23.503463150 +0200
3-
@@ -108,6 +108,8 @@
3+
@@ -109,6 +109,8 @@
44
response.delete_cookie(
55
self.cookie_name,
66
domain=settings.SESSION_COOKIE_DOMAIN,
@@ -11,44 +11,47 @@
1111

1212
--- django/http/response.py.orig 2020-08-13 11:16:04.060627793 +0200
1313
+++ django/http/response.py 2020-08-13 11:54:03.482476973 +0200
14-
@@ -243,12 +243,18 @@
14+
@@ -261,20 +261,28 @@
1515
value = signing.get_cookie_signer(salt=key + salt).sign(value)
1616
return self.set_cookie(key, value, **kwargs)
17-
18-
- def delete_cookie(self, key, path='/', domain=None, samesite=None):
19-
+ def delete_cookie(self, key, path='/', domain=None, secure=False, httponly=False, samesite=None):
17+
18+
- def delete_cookie(self, key, path="/", domain=None, samesite=None):
19+
+ def delete_cookie(self, key, path="/", domain=None, secure=False, httponly=False, samesite=None):
2020
# Browsers can ignore the Set-Cookie header if the cookie doesn't use
2121
# the secure flag and:
2222
# - the cookie name starts with "__Host-" or "__Secure-", or
2323
# - the samesite is "none".
24-
- secure = (
25-
- key.startswith(('__Secure-', '__Host-')) or
26-
- (samesite and samesite.lower() == 'none')
24+
- secure = key.startswith(("__Secure-", "__Host-")) or (
25+
- samesite and samesite.lower() == "none"
2726
- )
2827
+ if key in self.cookies:
29-
+ domain = self.cookies[key].get('domain', domain)
30-
+ secure = self.cookies[key].get('secure', secure)
31-
+ httponly = self.cookies[key].get('httponly', httponly)
32-
+ samesite = self.cookies[key].get('samesite', samesite)
28+
+ domain = self.cookies[key].get("domain", domain)
29+
+ secure = self.cookies[key].get("secure", secure)
30+
+ httponly = self.cookies[key].get("httponly", httponly)
31+
+ samesite = self.cookies[key].get("samesite", samesite)
3332
+ else:
3433
+ secure = secure or (
35-
+ key.startswith(('__Secure-', '__Host-')) or
36-
+ (samesite and samesite.lower() == 'none')
34+
+ key.startswith(("__Secure-", "__Host-")) or
35+
+ (samesite and samesite.lower() == "none")
3736
+ )
3837
self.set_cookie(
39-
- key, max_age=0, path=path, domain=domain, secure=secure,
40-
+ key, max_age=0, path=path, domain=domain, secure=secure, httponly=httponly,
41-
expires='Thu, 01 Jan 1970 00:00:00 GMT', samesite=samesite,
38+
key,
39+
max_age=0,
40+
path=path,
41+
domain=domain,
42+
secure=secure,
43+
+ httponly=httponly,
44+
expires="Thu, 01 Jan 1970 00:00:00 GMT",
45+
samesite=samesite,
4246
)
43-
4447
--- django/contrib/sessions/middleware.py.orig 2020-08-13 12:12:12.401898114 +0200
4548
+++ django/contrib/sessions/middleware.py 2020-08-13 12:14:52.690520659 +0200
46-
@@ -40,6 +40,8 @@
49+
@@ -38,6 +38,8 @@
4750
settings.SESSION_COOKIE_NAME,
4851
path=settings.SESSION_COOKIE_PATH,
4952
domain=settings.SESSION_COOKIE_DOMAIN,
5053
+ secure=settings.SESSION_COOKIE_SECURE or None,
5154
+ httponly=settings.SESSION_COOKIE_HTTPONLY or None,
5255
samesite=settings.SESSION_COOKIE_SAMESITE,
5356
)
54-
patch_vary_headers(response, ('Cookie',))
57+
patch_vary_headers(response, ("Cookie",))

0 commit comments

Comments
 (0)