Skip to content

[3.14] gh-61366: Read session cookies written by curl and Wget (GH-11792) #155604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Aug 12, 2026
+34 −2
Merged

[3.14] gh-61366: Read session cookies written by curl and Wget (GH-11792) #155604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/http/cookiejar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,8 @@ def _really_load(self, f, filename, ignore_discard, ignore_expires):
assert domain_specified == initial_dot

discard = False
if expires == "":
# curl and Wget set expires to 0 for session cookies.
if expires == "0" or expires == "":
expires = None
discard = True

Expand Down
30 changes: 29 additions & 1 deletion Lib/test/test_http_cookiejar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
CookieJar, DefaultCookiePolicy, LWPCookieJar, MozillaCookieJar,
LoadError, lwp_cookie_str, DEFAULT_HTTP_PORT, escape_path,
reach, is_HDN, domain_match, user_domain_match, request_path,
request_port, request_host)
request_port, request_host, NETSCAPE_HEADER_TEXT)

mswindows = (sys.platform == "win32")

Expand Down Expand Up @@ -2048,6 +2048,34 @@ def test_session_cookies(self):
# we didn't have session cookies in the first place
self.assertNotEqual(counter["session_before"], 0)

def test_load_session_cookies(self):
# curl and Wget write 0 in the expires field for session cookies,
# while we write an empty field. Both should be read (gh-61366).
filename = os_helper.TESTFN
self.addCleanup(os_helper.unlink, filename)
expires = int(time.time() + 3600)
with open(filename, "w") as f:
f.write(NETSCAPE_HEADER_TEXT)
f.write("www.foo.com\tFALSE\t/\tFALSE\t%u\tperm\tbar\n" % expires)
f.write("www.foo.com\tFALSE\t/\tFALSE\t0\tcurl_session\tbar\n")
f.write("www.foo.com\tFALSE\t/\tFALSE\t\tour_session\tbar\n")

c = MozillaCookieJar()
c.revert(filename)
self.assertEqual([cookie.name for cookie in c], ["perm"])

c = MozillaCookieJar()
c.revert(filename, ignore_discard=True)
self.assertEqual(sorted(cookie.name for cookie in c),
["curl_session", "our_session", "perm"])
for cookie in c:
if cookie.name == "perm":
self.assertEqual(cookie.expires, expires)
self.assertFalse(cookie.discard)
else:
self.assertIsNone(cookie.expires)
self.assertTrue(cookie.discard)


if __name__ == "__main__":
unittest.main()
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2019-02-08-17-33-49.gh-issue-61366.k6W5Sp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:class:`http.cookiejar.MozillaCookieJar` now reads session cookies written
by curl and Wget, which use ``0`` in the expiration time field.
Contributed by Jérémie Detrey.
Loading