May 2012 - tor-commits - lists.torproject.org

[tor/master] Reject an additional type of bad date in parse_http_time
by nickm＠torproject.org 16 May '12

16 May '12

commit 1abe533b3304619bd8c59f170097ab469af99dc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:09:34 2012 -0500 Reject an additional type of bad date in parse_http_time --- src/common/util.c | 5 ++++- src/test/test_util.c | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 391b02f..c44fe60 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1416,7 +1416,10 @@ parse_http_time(const char *date, struct tm *tm) /* First, try RFC1123 or RFC850 format: skip the weekday. */ if ((cp = strchr(date, ','))) { - cp += 2; + ++cp; + if (*cp != ' ') + return -1; + ++cp; if (tor_sscanf(cp, "%2u %3s %4u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { diff --git a/src/test/test_util.c b/src/test/test_util.c index 5845d77..e239326 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -101,6 +101,7 @@ test_util_parse_http_time(void *arg) test_eq(-1, parse_http_time("Sunday, 32-Aug-94 00:48:22 GMT", &a_time)); test_eq(-1, parse_http_time("Sunday, 3-Ago-04 00:48:22", &a_time)); test_eq(-1, parse_http_time("Sunday, August the third", &a_time)); + test_eq(-1, parse_http_time("Wednesday,,04 Aug 1994 00:48:22 GMT", &a_time)); test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time));

1 0

[tor/master] Fix month check in parse_http_time, add test
by nickm＠torproject.org 16 May '12

16 May '12

commit 679aa93e23f2c7f2e9c195f08834a7fc8c8d8b29 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 9 15:40:44 2012 +0100 Fix month check in parse_http_time, add test --- src/common/util.c | 2 ++ src/test/test_util.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5fa0896..a03a576 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1451,6 +1451,8 @@ parse_http_time(const char *date, struct tm *tm) month[3] = '\0'; /* Okay, now decode the month. */ + /* set tm->tm_mon to dummy value so the check below fails. */ + tm->tm_mon = -1; for (i = 0; i < 12; ++i) { if (!strcasecmp(MONTH_NAMES[i], month)) { tm->tm_mon = i; diff --git a/src/test/test_util.c b/src/test/test_util.c index e239326..cc0181c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -121,6 +121,10 @@ test_util_parse_http_time(void *arg) test_eq((time_t)775961302UL, tor_timegm(&a_time)); test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); + test_eq((time_t)1325376000UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); + test_eq((time_t)1356912000UL, tor_timegm(&a_time)); test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '12

16 May '12

commit d732b87e60ee9991f09dadcfed82d9b845fbc41d Merge: 3f55b76 75fc4db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:20:56 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5346 | 8 +++++ src/common/util.c | 26 +++++++++++------- src/test/test_util.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 10 deletions(-) diff --cc src/test/test_util.c index d9fc6a3,f9a83a3..99c5544 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -2921,13 -1384,8 +2991,14 @@@ test_util_set_env_var_in_sl(void *ptr struct testcase_t util_tests[] = { UTIL_LEGACY(time), + UTIL_TEST(parse_http_time, 0), UTIL_LEGACY(config_line), + UTIL_LEGACY(config_line_quotes), + UTIL_LEGACY(config_line_comment_character), + UTIL_LEGACY(config_line_escaped_content), +#ifndef _WIN32 + UTIL_LEGACY(expand_filename), +#endif UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip),

1 0

[tor/master] Merge branch 'bug5346_squashed' into maint-0.2.2
by nickm＠torproject.org 16 May '12

16 May '12

commit dd749798a436688cbbe3fc23fe6d4f5041a3e015 Merge: 3ed4c5d 679aa93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:15:35 2012 -0400 Merge branch 'bug5346_squashed' into maint-0.2.2 changes/bug5346 | 8 +++++++ src/common/util.c | 26 +++++++++++++++--------- src/test/test_util.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-)

1 0

[tor/master] Make the succeeding parse_http_time tests more obviously right
by nickm＠torproject.org 16 May '12

16 May '12

commit 75fc4dbbcabaedc715f0f9e883ccab1c9634e787 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:19:56 2012 -0400 Make the succeeding parse_http_time tests more obviously right (When the correct answer is given in terms of seconds since the epoch, it's hard to be sure that it really is the right answer just by reading the code.) --- src/test/test_util.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cc0181c..f9a83a3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -90,9 +90,15 @@ static void test_util_parse_http_time(void *arg) { struct tm a_time; - + char b[ISO_TIME_LEN+1]; (void)arg; +#define T(s) do { \ + format_iso_time(b, tor_timegm(&a_time)); \ + tt_str_op(b, ==, (s)); \ + b[0]='\0'; \ + } while (0) + /* Test parse_http_time */ test_eq(-1, parse_http_time("", &a_time)); @@ -105,26 +111,37 @@ test_util_parse_http_time(void *arg) test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1325376000UL, tor_timegm(&a_time)); + T("2012-01-01 00:00:00"); test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1356912000UL, tor_timegm(&a_time)); + T("2012-12-31 00:00:00"); test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time)); @@ -134,6 +151,7 @@ test_util_parse_http_time(void *arg) test_eq(-1, parse_http_time("2011-00-30 23:59:59 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 23:59", &a_time)); +#undef T done: ; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug5139'
by nickm＠torproject.org 16 May '12

16 May '12

commit 3f55b76360e849fcb6e7f4af7f21be3583c97dc9 Merge: 70ffd3b 7c8032c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:47:13 2012 -0400 Merge remote-tracking branch 'public/bug5139' changes/bug5139 | 6 ++++++ src/or/router.c | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)

1 0

[tor/master] Bridges should never set the send_unencrypted flag on any of their descs
by nickm＠torproject.org 16 May '12

16 May '12

commit 7c8032c22ba6270444d84604f33509a892293fcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 11:51:48 2012 -0400 Bridges should never set the send_unencrypted flag on any of their descs Fix for bug 5139. --- changes/bug5139 | 6 ++++++ src/or/router.c | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/changes/bug5139 b/changes/bug5139 new file mode 100644 index 0000000..5cebc76 --- /dev/null +++ b/changes/bug5139 @@ -0,0 +1,6 @@ + o Minor features (bridges): + - Tag a bridge's descriptor as "never to be sent + unencrypted". This shouldn't matter, since bridges don't open + non-anonymous connections to the bridge authority and don't + allow unencrypted directory connections from clients, but we + might as well make sure. Closes bug 5139. diff --git a/src/or/router.c b/src/or/router.c index 4cdfd02..cba827d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1672,12 +1672,15 @@ router_rebuild_descriptor(int force) ri->purpose = options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL; - ri->cache_info.send_unencrypted = 1; - /* Let bridges serve their own descriptors unencrypted, so they can - * pass reachability testing. (If they want to be harder to notice, - * they can always leave the DirPort off). */ - if (ei && !options->BridgeRelay) - ei->cache_info.send_unencrypted = 1; + if (options->BridgeRelay) { + /* Bridges shouldn't be able to send their descriptors unencrypted, + anyway, since they don't have a DirPort, and always connect to the + bridge authority anonymously. But just in case they somehow think of + sending them on an unencrypted connection, don't allow them to try. */ + ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 0; + } else { + ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 1; + } router_get_router_hash(ri->cache_info.signed_descriptor_body, strlen(ri->cache_info.signed_descriptor_body),

1 0

[tor/maint-0.2.2] Make the succeeding parse_http_time tests more obviously right
by nickm＠torproject.org 16 May '12

16 May '12

commit 75fc4dbbcabaedc715f0f9e883ccab1c9634e787 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:19:56 2012 -0400 Make the succeeding parse_http_time tests more obviously right (When the correct answer is given in terms of seconds since the epoch, it's hard to be sure that it really is the right answer just by reading the code.) --- src/test/test_util.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cc0181c..f9a83a3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -90,9 +90,15 @@ static void test_util_parse_http_time(void *arg) { struct tm a_time; - + char b[ISO_TIME_LEN+1]; (void)arg; +#define T(s) do { \ + format_iso_time(b, tor_timegm(&a_time)); \ + tt_str_op(b, ==, (s)); \ + b[0]='\0'; \ + } while (0) + /* Test parse_http_time */ test_eq(-1, parse_http_time("", &a_time)); @@ -105,26 +111,37 @@ test_util_parse_http_time(void *arg) test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1325376000UL, tor_timegm(&a_time)); + T("2012-01-01 00:00:00"); test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1356912000UL, tor_timegm(&a_time)); + T("2012-12-31 00:00:00"); test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time)); @@ -134,6 +151,7 @@ test_util_parse_http_time(void *arg) test_eq(-1, parse_http_time("2011-00-30 23:59:59 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 23:59", &a_time)); +#undef T done: ; }

1 0

[tor/maint-0.2.2] changes file for branch bug5346
by nickm＠torproject.org 16 May '12

16 May '12

commit 7ae798ac3850008942472a0e9ad4f0c691433c8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:26:48 2012 -0500 changes file for branch bug5346 --- changes/bug5346 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug5346 b/changes/bug5346 new file mode 100644 index 0000000..490eb35 --- /dev/null +++ b/changes/bug5346 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct parsing of certain date types in parse_http_time(). + Without this patch, If-Modified-Since would behave + incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from + Esteban Manchado Velázques. +

1 0

[tor/maint-0.2.2] Remove more dubiosity in struct tm handling. related to bug5346
by nickm＠torproject.org 16 May '12

16 May '12

commit 801923ac2112d1a54eaf4126800724bea90055eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 9 10:24:40 2012 -0500 Remove more dubiosity in struct tm handling. related to bug5346 --- changes/bug5346 | 2 ++ src/common/util.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changes/bug5346 b/changes/bug5346 index 490eb35..3d21f90 100644 --- a/changes/bug5346 +++ b/changes/bug5346 @@ -3,4 +3,6 @@ Without this patch, If-Modified-Since would behave incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from Esteban Manchado Velázques. + - Reject out-of-range times like 23:59:61. Fix for bug 5346; + bugfix on 0.0.8pre3. diff --git a/src/common/util.c b/src/common/util.c index c44fe60..5fa0896 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1268,7 +1268,7 @@ format_rfc1123_time(char *buf, time_t t) tor_assert(tm.tm_wday >= 0); tor_assert(tm.tm_wday <= 6); memcpy(buf, WEEKDAY_NAMES[tm.tm_wday], 3); - tor_assert(tm.tm_wday >= 0); + tor_assert(tm.tm_mon >= 0); tor_assert(tm.tm_mon <= 11); memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3); } @@ -1298,7 +1298,8 @@ parse_rfc1123_time(const char *buf, time_t *t) tor_free(esc); return -1; } - if (tm_mday > 31 || tm_hour > 23 || tm_min > 59 || tm_sec > 61) { + if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 || + tm_sec > 60) { char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc); tor_free(esc); @@ -1368,7 +1369,7 @@ int parse_iso_time(const char *cp, time_t *t) { struct tm st_tm; - unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100; + unsigned int year=0, month=0, day=0, hour=0, minute=0, second=0; if (tor_sscanf(cp, "%u-%2u-%2u %2u:%2u:%2u", &year, &month, &day, &hour, &minute, &second) < 6) { char *esc = esc_for_log(cp); @@ -1377,7 +1378,7 @@ parse_iso_time(const char *cp, time_t *t) return -1; } if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 || - hour > 23 || minute > 59 || second > 61) { + hour > 23 || minute > 59 || second > 60) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc); tor_free(esc); @@ -1457,11 +1458,11 @@ parse_http_time(const char *date, struct tm *tm) } if (tm->tm_year < 0 || - tm->tm_mon < 1 || tm->tm_mon > 12 || - tm->tm_mday < 0 || tm->tm_mday > 31 || + tm->tm_mon < 0 || tm->tm_mon > 11 || + tm->tm_mday < 1 || tm->tm_mday > 31 || tm->tm_hour < 0 || tm->tm_hour > 23 || tm->tm_min < 0 || tm->tm_min > 59 || - tm->tm_sec < 0 || tm->tm_sec > 61) + tm->tm_sec < 0 || tm->tm_sec > 60) return -1; /* Out of range, or bad month. */ return 0;

1 0