traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-12144: Handle cookies with expires attribute in CookieJar.make_cookies (GH-13921) 

Handle time comparison for cookies with `expires` attribute when `CookieJar.make_cookies` is called.

Co-authored-by: Demian Brecht <demianbrecht@gmail.com>


https://bugs.python.org/issue12144



Automerge-Triggered-By: @asvetlov
This commit is contained in:
Xtreak 2019-09-13 12:29:00 +01:00 committed by Miss Islington (bot)
parent d31b31516c
commit bb41147eab
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/http/cookiejar.py
View File

@ -1593,6 +1593,7 @@ class CookieJar:
headers = response.info() headers = response.info()
rfc2965_hdrs = headers.get_all("Set-Cookie2", []) rfc2965_hdrs = headers.get_all("Set-Cookie2", [])
ns_hdrs = headers.get_all("Set-Cookie", []) ns_hdrs = headers.get_all("Set-Cookie", [])
self._policy._now = self._now = int(time.time())
rfc2965 = self._policy.rfc2965 rfc2965 = self._policy.rfc2965
netscape = self._policy.netscape netscape = self._policy.netscape
@ -1672,8 +1673,6 @@ class CookieJar:
_debug("extract_cookies: %s", response.info()) _debug("extract_cookies: %s", response.info())
self._cookies_lock.acquire() self._cookies_lock.acquire()
try: try:
self._policy._now = self._now = int(time.time())
for cookie in self.make_cookies(response, request): for cookie in self.make_cookies(response, request):
if self._policy.set_ok(cookie, request): if self._policy.set_ok(cookie, request):
_debug(" setting cookie: %s", cookie) _debug(" setting cookie: %s", cookie)

9
Lib/test/test_http_cookiejar.py
View File

@ -585,6 +585,15 @@ class CookieTests(unittest.TestCase):
# if expires is in future, keep cookie... # if expires is in future, keep cookie...
c = CookieJar() c = CookieJar()
future = time2netscape(time.time()+3600) future = time2netscape(time.time()+3600)
with test.support.check_no_warnings(self):
headers = [f"Set-Cookie: FOO=BAR; path=/; expires={future}"]
req = urllib.request.Request("http://www.coyote.com/")
res = FakeResponse(headers, "http://www.coyote.com/")
cookies = c.make_cookies(res, req)
self.assertEqual(len(cookies), 1)
self.assertEqual(time2netscape(cookies[0].expires), future)
interact_netscape(c, "http://www.acme.com/", 'spam="bar"; expires=%s' % interact_netscape(c, "http://www.acme.com/", 'spam="bar"; expires=%s' %
future) future)
self.assertEqual(len(c), 1) self.assertEqual(len(c), 1)

2
Misc/NEWS.d/next/Library/2019-06-08-23-26-58.bpo-12144.Z7mz-q.rst Normal file
View File

@ -0,0 +1,2 @@
Ensure cookies with ``expires`` attribute are handled in
:meth:`CookieJar.make_cookies`.