94 lines
3.9 KiB
Diff
94 lines
3.9 KiB
Diff
|
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
|
||
|
|
index adf956d..97599d4 100644
|
||
|
|
--- a/Lib/http/cookiejar.py
|
||
|
|
+++ b/Lib/http/cookiejar.py
|
||
|
|
@@ -1148,6 +1148,11 @@ class DefaultCookiePolicy(CookiePolicy):
|
||
|
|
req_host, erhn = eff_request_host(request)
|
||
|
|
domain = cookie.domain
|
||
|
|
|
||
|
|
+ if domain and not domain.startswith("."):
|
||
|
|
+ dotdomain = "." + domain
|
||
|
|
+ else:
|
||
|
|
+ dotdomain = domain
|
||
|
|
+
|
||
|
|
# strict check of non-domain cookies: Mozilla does this, MSIE5 doesn't
|
||
|
|
if (cookie.version == 0 and
|
||
|
|
(self.strict_ns_domain & self.DomainStrictNonDomain) and
|
||
|
|
@@ -1160,7 +1165,7 @@ class DefaultCookiePolicy(CookiePolicy):
|
||
|
|
_debug(" effective request-host name %s does not domain-match "
|
||
|
|
"RFC 2965 cookie domain %s", erhn, domain)
|
||
|
|
return False
|
||
|
|
- if cookie.version == 0 and not ("."+erhn).endswith(domain):
|
||
|
|
+ if cookie.version == 0 and not ("."+erhn).endswith(dotdomain):
|
||
|
|
_debug(" request-host %s does not match Netscape cookie domain "
|
||
|
|
"%s", req_host, domain)
|
||
|
|
return False
|
||
|
|
@@ -1174,7 +1179,11 @@ class DefaultCookiePolicy(CookiePolicy):
|
||
|
|
req_host = "."+req_host
|
||
|
|
if not erhn.startswith("."):
|
||
|
|
erhn = "."+erhn
|
||
|
|
- if not (req_host.endswith(domain) or erhn.endswith(domain)):
|
||
|
|
+ if domain and not domain.startswith("."):
|
||
|
|
+ dotdomain = "." + domain
|
||
|
|
+ else:
|
||
|
|
+ dotdomain = domain
|
||
|
|
+ if not (req_host.endswith(dotdomain) or erhn.endswith(dotdomain)):
|
||
|
|
#_debug(" request domain %s does not match cookie domain %s",
|
||
|
|
# req_host, domain)
|
||
|
|
return False
|
||
|
|
diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py
|
||
|
|
index abc625d..6e1b308 100644
|
||
|
|
--- a/Lib/test/test_http_cookiejar.py
|
||
|
|
+++ b/Lib/test/test_http_cookiejar.py
|
||
|
|
@@ -415,6 +415,7 @@ class CookieTests(unittest.TestCase):
|
||
|
|
("http://foo.bar.com/", ".foo.bar.com", True),
|
||
|
|
("http://foo.bar.com/", "foo.bar.com", True),
|
||
|
|
("http://foo.bar.com/", ".bar.com", True),
|
||
|
|
+ ("http://foo.bar.com/", "bar.com", True),
|
||
|
|
("http://foo.bar.com/", "com", True),
|
||
|
|
("http://foo.com/", "rhubarb.foo.com", False),
|
||
|
|
("http://foo.com/", ".foo.com", True),
|
||
|
|
@@ -425,6 +426,8 @@ class CookieTests(unittest.TestCase):
|
||
|
|
("http://foo/", "foo", True),
|
||
|
|
("http://foo/", "foo.local", True),
|
||
|
|
("http://foo/", ".local", True),
|
||
|
|
+ ("http://barfoo.com", ".foo.com", False),
|
||
|
|
+ ("http://barfoo.com", "foo.com", False),
|
||
|
|
]:
|
||
|
|
request = urllib.request.Request(url)
|
||
|
|
r = pol.domain_return_ok(domain, request)
|
||
|
|
@@ -959,6 +962,33 @@ class CookieTests(unittest.TestCase):
|
||
|
|
c.add_cookie_header(req)
|
||
|
|
self.assertFalse(req.has_header("Cookie"))
|
||
|
|
|
||
|
|
+ c.clear()
|
||
|
|
+
|
||
|
|
+ pol.set_blocked_domains([])
|
||
|
|
+ req = urllib.request.Request("http://acme.com/")
|
||
|
|
+ res = FakeResponse(headers, "http://acme.com/")
|
||
|
|
+ cookies = c.make_cookies(res, req)
|
||
|
|
+ c.extract_cookies(res, req)
|
||
|
|
+ self.assertEqual(len(c), 1)
|
||
|
|
+
|
||
|
|
+ req = urllib.request.Request("http://acme.com/")
|
||
|
|
+ c.add_cookie_header(req)
|
||
|
|
+ self.assertTrue(req.has_header("Cookie"))
|
||
|
|
+
|
||
|
|
+ req = urllib.request.Request("http://badacme.com/")
|
||
|
|
+ c.add_cookie_header(req)
|
||
|
|
+ self.assertFalse(pol.return_ok(cookies[0], req))
|
||
|
|
+ self.assertFalse(req.has_header("Cookie"))
|
||
|
|
+
|
||
|
|
+ p = pol.set_blocked_domains(["acme.com"])
|
||
|
|
+ req = urllib.request.Request("http://acme.com/")
|
||
|
|
+ c.add_cookie_header(req)
|
||
|
|
+ self.assertFalse(req.has_header("Cookie"))
|
||
|
|
+
|
||
|
|
+ req = urllib.request.Request("http://badacme.com/")
|
||
|
|
+ c.add_cookie_header(req)
|
||
|
|
+ self.assertFalse(req.has_header("Cookie"))
|
||
|
|
+
|
||
|
|
def test_secure(self):
|
||
|
|
for ns in True, False:
|
||
|
|
for whitespace in " ", "":
|