From: Daniel Stenberg Date: Tue, 19 Aug 2014 19:11:20 +0000 (+0200) Subject: cookies: reject incoming cookies set for TLDs X-Git-Tag: curl-7_38_0~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a76825a5efa6b4;p=curl cookies: reject incoming cookies set for TLDs Test 61 was modified to verify this. CVE-2014-3620 Reported-by: Tim Ruehsen URL: http://curl.haxx.se/docs/adv_20140910B.html --- diff --git a/lib/cookie.c b/lib/cookie.c index 46904ac57..375485f54 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -463,6 +463,7 @@ Curl_cookie_add(struct SessionHandle *data, } else if(Curl_raw_equal("domain", name)) { bool is_ip; + const char *dotp; /* Now, we make sure that our host is within the given domain, or the given domain is not valid and thus cannot be set. */ @@ -472,6 +473,11 @@ Curl_cookie_add(struct SessionHandle *data, is_ip = isip(domain ? domain : whatptr); + /* check for more dots */ + dotp = strchr(whatptr, '.'); + if(!dotp) + domain=":"; + if(!domain || (is_ip && !strcmp(whatptr, domain)) || (!is_ip && tailmatch(whatptr, domain))) { diff --git a/tests/data/test61 b/tests/data/test61 index d2de2790a..e6dbbb901 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -23,6 +23,7 @@ Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure Set-Cookie: test5=name; domain=anything.com; path=/ ; secure Set-Cookie: fake=fooledyou; domain=..com; path=/; +Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M Content-Length: 4 boo