|
1 | 1 | --- django/contrib/messages/storage/cookie.py.orig 2020-08-13 11:10:36.719177122 +0200 |
2 | 2 | +++ django/contrib/messages/storage/cookie.py 2020-08-13 11:45:23.503463150 +0200 |
3 | | -@@ -108,6 +108,8 @@ |
| 3 | +@@ -109,6 +109,8 @@ |
4 | 4 | response.delete_cookie( |
5 | 5 | self.cookie_name, |
6 | 6 | domain=settings.SESSION_COOKIE_DOMAIN, |
|
11 | 11 |
|
12 | 12 | --- django/http/response.py.orig 2020-08-13 11:16:04.060627793 +0200 |
13 | 13 | +++ django/http/response.py 2020-08-13 11:54:03.482476973 +0200 |
14 | | -@@ -243,12 +243,18 @@ |
| 14 | +@@ -261,20 +261,28 @@ |
15 | 15 | value = signing.get_cookie_signer(salt=key + salt).sign(value) |
16 | 16 | 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): |
20 | 20 | # Browsers can ignore the Set-Cookie header if the cookie doesn't use |
21 | 21 | # the secure flag and: |
22 | 22 | # - the cookie name starts with "__Host-" or "__Secure-", or |
23 | 23 | # - 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" |
27 | 26 | - ) |
28 | 27 | + 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) |
33 | 32 | + else: |
34 | 33 | + 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") |
37 | 36 | + ) |
38 | 37 | 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, |
42 | 46 | ) |
43 | | - |
44 | 47 | --- django/contrib/sessions/middleware.py.orig 2020-08-13 12:12:12.401898114 +0200 |
45 | 48 | +++ django/contrib/sessions/middleware.py 2020-08-13 12:14:52.690520659 +0200 |
46 | | -@@ -40,6 +40,8 @@ |
| 49 | +@@ -38,6 +38,8 @@ |
47 | 50 | settings.SESSION_COOKIE_NAME, |
48 | 51 | path=settings.SESSION_COOKIE_PATH, |
49 | 52 | domain=settings.SESSION_COOKIE_DOMAIN, |
50 | 53 | + secure=settings.SESSION_COOKIE_SECURE or None, |
51 | 54 | + httponly=settings.SESSION_COOKIE_HTTPONLY or None, |
52 | 55 | samesite=settings.SESSION_COOKIE_SAMESITE, |
53 | 56 | ) |
54 | | - patch_vary_headers(response, ('Cookie',)) |
| 57 | + patch_vary_headers(response, ("Cookie",)) |
0 commit comments