From 3ecd4749cf14d33240d3b6e89d7014699881b8a1 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 2 Feb 2007 01:36:08 +0000 Subject: [PATCH 1/5] fix test case 62 which was failing due to cookies expiring 1 Feb 2007 Signed-off-by: Kamil Dudka --- tests/data/test62 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/test62 b/tests/data/test62 index 6d01f88..847a0ab 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -32,9 +32,9 @@ http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com" # http://www.netscape.com/newsref/std/cookie_spec.html # This file was generated by libcurl! Edit at your own risk. -.foo.com TRUE /we/want/ FALSE 1170327387 test yes -.host.foo.com TRUE /we/want/ FALSE 1170327387 test2 yes -.fake.host.foo.com TRUE /we/want/ FALSE 1170327387 test4 yes +.foo.com TRUE /we/want/ FALSE 2147483647 test yes +.host.foo.com TRUE /we/want/ FALSE 2147483647 test2 yes +.fake.host.foo.com TRUE /we/want/ FALSE 2147483647 test4 yes .foo.com TRUE /moo TRUE 0 test3 maybe -- 1.7.1 From 4feeba0a65d65a390a7d53e3212e3fe2b589e339 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 5 Feb 2007 02:38:25 +0000 Subject: [PATCH 2/5] Year 2038 has its own problems (32 bit integer overflow). So cookie expiration date is lowered to expire at most in 2035. Signed-off-by: Kamil Dudka --- tests/data/test62 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/test62 b/tests/data/test62 index 847a0ab..d3d0715 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -32,9 +32,9 @@ http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com" # http://www.netscape.com/newsref/std/cookie_spec.html # This file was generated by libcurl! Edit at your own risk. -.foo.com TRUE /we/want/ FALSE 2147483647 test yes -.host.foo.com TRUE /we/want/ FALSE 2147483647 test2 yes -.fake.host.foo.com TRUE /we/want/ FALSE 2147483647 test4 yes +.foo.com TRUE /we/want/ FALSE 2054030187 test yes +.host.foo.com TRUE /we/want/ FALSE 2054030187 test2 yes +.fake.host.foo.com TRUE /we/want/ FALSE 2054030187 test4 yes .foo.com TRUE /moo TRUE 0 test3 maybe -- 1.7.1 From d12cbcf4a507fd57976c3a877ab1e629a1e24677 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sat, 13 Apr 2013 14:11:12 +0200 Subject: [PATCH 3/5] test1216: test tailmatching cookie domains This test is an attempt to repeat the problem YAMADA Yasuharu reported at http://curl.haxx.se/mail/lib-2013-04/0108.html Conflicts: tests/data/Makefile.am Signed-off-by: Kamil Dudka --- tests/data/Makefile.am | 2 +- tests/data/test1216 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) create mode 100644 tests/data/test1216 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 233bf03..ae555c6 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -34,5 +34,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test250 test251 test252 test253 test254 test255 test521 test522 test523 \ test256 test257 test258 test259 test260 test261 test262 test263 test264 \ test265 test266 test267 test268 test269 test270 test271 test272 test273 \ - test274 test275 test524 test276 test277 + test274 test275 test524 test276 test277 test1216 diff --git a/tests/data/test1216 b/tests/data/test1216 new file mode 100644 index 0000000..a87b812 --- /dev/null +++ b/tests/data/test1216 @@ -0,0 +1,62 @@ + + +HTTP +HTTP GET +HTTP proxy +cookies + + + +# Server-side + + +HTTP/1.1 200 OK +Server: Microsoft-IIS/4.0 +Date: Tue, 25 Sep 2001 19:37:44 GMT +Content-Type: text/html +Connection: close +Content-Length: 21 + +This server says moo + + + +# Client-side + + +http + + +HTTP cookie domains tailmatching the host name + + +http://example.fake/c/1216 http://bexample.fake/c/1216 -b log/injar1216 -x %HOSTIP:%HTTPPORT + + +example.fake FALSE /a FALSE 2139150993 mooo indeed +example.fake FALSE /b FALSE 0 moo1 indeed +example.fake FALSE /c FALSE 2139150993 moo2 indeed + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET http://example.fake/c/1216 HTTP/1.1 +Host: example.fake +Pragma: no-cache +Accept: */* +Proxy-Connection: Keep-Alive +Cookie: moo2=indeed + +GET http://bexample.fake/c/1216 HTTP/1.1 +Host: bexample.fake +Pragma: no-cache +Accept: */* +Proxy-Connection: Keep-Alive + + + -- 1.7.1 From e489a51084884148bd9c014f5fa4d9f4189a86a0 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sat, 13 Apr 2013 14:12:13 +0200 Subject: [PATCH 4/5] cookie: fix tailmatching to prevent cross-domain leakage Cookies set for 'example.com' could accidentaly also be sent by libcurl to the 'bexample.com' (ie with a prefix to the first domain name). This is a security vulnerabilty, CVE-2013-1944. Bug: http://curl.haxx.se/docs/adv_20130412.html Conflicts: lib/cookie.c Signed-off-by: Kamil Dudka --- lib/cookie.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/cookie.c b/lib/cookie.c index 779ca4c..ddd10a6 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -124,15 +124,29 @@ static void freecookie(struct Cookie *co) free(co); } -static bool tailmatch(const char *little, const char *bigone) +static bool tailmatch(const char *cooke_domain, const char *hostname) { - size_t littlelen = strlen(little); - size_t biglen = strlen(bigone); + size_t cookie_domain_len = strlen(cooke_domain); + size_t hostname_len = strlen(hostname); - if(littlelen > biglen) + if(hostname_len < cookie_domain_len) return FALSE; - return (bool)strequal(little, bigone+biglen-littlelen); + if(!strequal(cooke_domain, hostname+hostname_len-cookie_domain_len)) + return FALSE; + + /* A lead char of cookie_domain is not '.'. + RFC6265 4.1.2.3. The Domain Attribute says: + For example, if the value of the Domain attribute is + "example.com", the user agent will include the cookie in the Cookie + header when making HTTP requests to example.com, www.example.com, and + www.corp.example.com. + */ + if(hostname_len == cookie_domain_len) + return TRUE; + if('.' == *(hostname + hostname_len - cookie_domain_len - 1)) + return TRUE; + return FALSE; } /* -- 1.7.1 From 9f76a41483fa6737a58e32d9bca3cab1d56e5d58 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sat, 13 Apr 2013 14:13:15 +0200 Subject: [PATCH 5/5] test1218: another cookie tailmatch test These tests verify commit 3604fde3d3c9b0d, the fix for the "cookie domain tailmatch" vulnerability. See http://curl.haxx.se/docs/adv_20130412.html Conflicts: tests/data/Makefile.am Signed-off-by: Kamil Dudka --- tests/data/Makefile.am | 2 +- tests/data/test1218 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) create mode 100644 tests/data/test1218 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index ae555c6..8f2e83e 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -34,5 +34,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test250 test251 test252 test253 test254 test255 test521 test522 test523 \ test256 test257 test258 test259 test260 test261 test262 test263 test264 \ test265 test266 test267 test268 test269 test270 test271 test272 test273 \ - test274 test275 test524 test276 test277 test1216 + test274 test275 test524 test276 test277 test1216 test1218 diff --git a/tests/data/test1218 b/tests/data/test1218 new file mode 100644 index 0000000..9e2d63b --- /dev/null +++ b/tests/data/test1218 @@ -0,0 +1,62 @@ + + +HTTP +HTTP GET +HTTP proxy +cookies + + + +# This test is very similar to 1216, only that it sets the cookies from the +# first site instead of reading from a file + + +HTTP/1.1 200 OK +Date: Tue, 25 Sep 2001 19:37:44 GMT +Set-Cookie: domain=.example.fake; bug=fixed; +Content-Length: 21 + +This server says moo + + + +# Client-side + + +http + + +HTTP cookies and domains with same prefix + + +http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/1218 -b nonexisting -x %HOSTIP:%HTTPPORT + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET http://example.fake/c/1218 HTTP/1.1 +Host: example.fake +Pragma: no-cache +Accept: */* +Proxy-Connection: Keep-Alive + +GET http://example.fake/c/1218 HTTP/1.1 +Host: example.fake +Pragma: no-cache +Accept: */* +Proxy-Connection: Keep-Alive +Cookie: bug=fixed + +GET http://bexample.fake/c/1218 HTTP/1.1 +Host: bexample.fake +Pragma: no-cache +Accept: */* +Proxy-Connection: Keep-Alive + + + -- 1.7.1