mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 08:48:45 +01:00
9773b89a2f
(From OE-Core rev: eb415873caad54dbf332f9ebf5f3164da3459953) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
125 lines
5.5 KiB
Diff
125 lines
5.5 KiB
Diff
From e5123d81ffb3be35a1b2767d6ced1a097aaf77be Mon Sep 17 00:00:00 2001
|
|
From: "Miss Islington (bot)"
|
|
<31488909+miss-islington@users.noreply.github.com>
|
|
Date: Sat, 9 Mar 2019 18:58:25 -0800
|
|
Subject: [PATCH] bpo-35121: prefix dot in domain for proper subdomain
|
|
validation (GH-10258) (GH-12261)
|
|
|
|
Don't send cookies of domain A without Domain attribute to domain B when domain A is a suffix match of domain B while using a cookiejar with `http.cookiejar.DefaultCookiePolicy` policy. Patch by Karthikeyan Singaravelan.
|
|
(cherry picked from commit ca7fe5063593958e5efdf90f068582837f07bd14)
|
|
|
|
Co-authored-by: Xtreak <tir.karthi@gmail.com>
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2018-20852
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
Lib/http/cookiejar.py | 13 ++++++--
|
|
Lib/test/test_http_cookiejar.py | 30 +++++++++++++++++++
|
|
.../2018-10-31-15-39-17.bpo-35121.EgHv9k.rst | 4 +++
|
|
3 files changed, 45 insertions(+), 2 deletions(-)
|
|
create mode 100644 Misc/NEWS.d/next/Security/2018-10-31-15-39-17.bpo-35121.EgHv9k.rst
|
|
|
|
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
|
|
index e0f1032b2816..00cb1250a07e 100644
|
|
--- a/Lib/http/cookiejar.py
|
|
+++ b/Lib/http/cookiejar.py
|
|
@@ -1145,6 +1145,11 @@ def return_ok_domain(self, cookie, request):
|
|
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
|
|
@@ -1157,7 +1162,7 @@ def return_ok_domain(self, cookie, request):
|
|
_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
|
|
@@ -1171,7 +1176,11 @@ def domain_return_ok(self, domain, request):
|
|
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 abc625d672a7..6e1b30881310 100644
|
|
--- a/Lib/test/test_http_cookiejar.py
|
|
+++ b/Lib/test/test_http_cookiejar.py
|
|
@@ -415,6 +415,7 @@ def test_domain_return_ok(self):
|
|
("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 @@ def test_domain_return_ok(self):
|
|
("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 @@ def test_domain_block(self):
|
|
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 " ", "":
|
|
diff --git a/Misc/NEWS.d/next/Security/2018-10-31-15-39-17.bpo-35121.EgHv9k.rst b/Misc/NEWS.d/next/Security/2018-10-31-15-39-17.bpo-35121.EgHv9k.rst
|
|
new file mode 100644
|
|
index 000000000000..d2eb8f1f352c
|
|
--- /dev/null
|
|
+++ b/Misc/NEWS.d/next/Security/2018-10-31-15-39-17.bpo-35121.EgHv9k.rst
|
|
@@ -0,0 +1,4 @@
|
|
+Don't send cookies of domain A without Domain attribute to domain B
|
|
+when domain A is a suffix match of domain B while using a cookiejar
|
|
+with :class:`http.cookiejar.DefaultCookiePolicy` policy. Patch by
|
|
+Karthikeyan Singaravelan.
|