You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
93 lines
3.8 KiB
93 lines
3.8 KiB
diff --git a/Lib/cookielib.py b/Lib/cookielib.py |
|
index f9c8d2f..9144e1f 100644 |
|
--- a/Lib/cookielib.py |
|
+++ b/Lib/cookielib.py |
|
@@ -1123,6 +1123,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 |
|
@@ -1135,7 +1140,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 |
|
@@ -1149,7 +1154,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_cookielib.py b/Lib/test/test_cookielib.py |
|
index dd0ad32..b4f5ea0 100644 |
|
--- a/Lib/test/test_cookielib.py |
|
+++ b/Lib/test/test_cookielib.py |
|
@@ -353,6 +353,7 @@ class CookieTests(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), |
|
@@ -363,6 +364,8 @@ class CookieTests(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 = urllib2.Request(url) |
|
r = pol.domain_return_ok(domain, request) |
|
@@ -910,6 +913,33 @@ class CookieTests(TestCase): |
|
c.add_cookie_header(req) |
|
self.assertTrue(not req.has_header("Cookie")) |
|
|
|
+ c.clear() |
|
+ |
|
+ pol.set_blocked_domains([]) |
|
+ req = 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 = Request("http://acme.com/") |
|
+ c.add_cookie_header(req) |
|
+ self.assertTrue(req.has_header("Cookie")) |
|
+ |
|
+ req = 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 = Request("http://acme.com/") |
|
+ c.add_cookie_header(req) |
|
+ self.assertFalse(req.has_header("Cookie")) |
|
+ |
|
+ req = Request("http://badacme.com/") |
|
+ c.add_cookie_header(req) |
|
+ self.assertFalse(req.has_header("Cookie")) |
|
+ |
|
def test_secure(self): |
|
from cookielib import CookieJar, DefaultCookiePolicy |
|
|
|
|