python · LamentXU123 · Jun 18, 2025 · Jun 18, 2025 · Jun 19, 2025 · Jun 20, 2025
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
@@ -656,10 +656,9 @@ def request_path(request):
     return path
 
 def request_port(request):
-    host = request.host
-    i = host.find(':')
-    if i >= 0:
-        port = host[i+1:]
+    match = cut_port_re.search(request.host)
+    if match:
+        port = match.group(0).removeprefix(':')
         try:
             int(port)
         except ValueError:

diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py
@@ -1262,6 +1262,59 @@ def test_missing_final_slash(self):
         c.add_cookie_header(req)
         self.assertTrue(req.has_header("Cookie"))
 
+    def test_set_ok_port(self):
+        pol = DefaultCookiePolicy(
+            rfc2965=True, blocked_domains=[])
+        c = CookieJar(policy=pol)
+        headers = ["Set-Cookie: CUSTOMER=WILE_E_COYOTE; path=/; port=1234"]
+        req = urllib.request.Request("http://127.0.0.1:1234")
+        res = FakeResponse(headers, "http://127.0.0.1:1234")
+        self.assertTrue(pol.set_ok_port(c.make_cookies(res, req)[0], req))
+
+        c.clear()
+
+        req = urllib.request.Request("http://acme.com:1234")
+        res = FakeResponse(headers, "http://acme.com:1234")
+        self.assertTrue(pol.set_ok_port(c.make_cookies(res, req)[0], req))
+
+        c.clear()
+
+        req = urllib.request.Request("http://[::1]:1234")
+        res = FakeResponse(headers, "http://[::1]:1234")
+        self.assertTrue(pol.set_ok_port(c.make_cookies(res, req)[0], req))
+
+        c.clear()
+
+        req = urllib.request.Request("http://[::1]:1235")
+        res = FakeResponse(headers, "http://[::1]:1235")
+        self.assertFalse(pol.set_ok_port(c.make_cookies(res, req)[0], req))
+
+    def test_return_ok_port(self):
+        pol = DefaultCookiePolicy(
+            rfc2965=True, blocked_domains=[])
+        c = CookieJar(policy=pol)
+        headers = ["Set-Cookie: CUSTOMER=WILE_E_COYOTE; path=/; port=1234"]
+        req = urllib.request.Request("http://127.0.0.1:1234")
+        res = FakeResponse(headers, "http://127.0.0.1:1234")
+        self.assertTrue(pol.return_ok_port(c.make_cookies(res, req)[0], req))
+
+        c.clear()
+
+        req = urllib.request.Request("http://acme.com:1234")
+        res = FakeResponse(headers, "http://acme.com:1234")
+        self.assertTrue(pol.return_ok_port(c.make_cookies(res, req)[0], req))
+        c.clear()
+
+        req = urllib.request.Request("http://[::1]:1234")
+        res = FakeResponse(headers, "http://[::1]:1234")
+        self.assertTrue(pol.return_ok_port(c.make_cookies(res, req)[0], req))
+
+        c.clear()
+
+        req = urllib.request.Request("http://[::1]:1235")
+        res = FakeResponse(headers, "http://[::1]:1235")
+        self.assertFalse(pol.return_ok_port(c.make_cookies(res, req)[0], req))
+
     def test_domain_mirror(self):
         pol = DefaultCookiePolicy(rfc2965=True)
 

diff --git a/Misc/NEWS.d/next/Library/2025-06-28-14-10-07.gh-issue-135993.Gmyux9.rst b/Misc/NEWS.d/next/Library/2025-06-28-14-10-07.gh-issue-135993.Gmyux9.rst
@@ -0,0 +1 @@
+:mod:`http.cookiejar` Fix the bug happens when trying to prase ports of a IPv6 address in :class:`~http.cookiejar.DefaultCookiePolicy`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		:mod:`http.cookiejar` Fix the bug happens when trying to prase ports of a IPv6 address in :class:`~http.cookiejar.DefaultCookiePolicy`
LamentXU123 marked this conversation as resolved. Show resolved Hide resolved