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

[tor/maint-0.2.2] 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/maint-0.2.2] 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/maint-0.2.2] Fix parse_http_time and add tests
by nickm＠torproject.org 16 May '12

16 May '12

commit d0d9c3d71e1fb88557d684c59cf8a920712b16f1 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 17:40:37 2012 +0100 Fix parse_http_time and add tests * It seems parse_http_time wasn't parsing correctly any date with commas (RFCs 1123 and 850). Fix that. * It seems parse_http_time was reporting the wrong month (they start at 0, not 1). Fix that. * Add some tests for parse_http_time, covering all three formats. --- src/common/util.c | 8 ++++---- src/test/test_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 7d2fc4d..391b02f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1416,13 +1416,13 @@ parse_http_time(const char *date, struct tm *tm) /* First, try RFC1123 or RFC850 format: skip the weekday. */ if ((cp = strchr(date, ','))) { - ++cp; - if (tor_sscanf(date, "%2u %3s %4u %2u:%2u:%2u GMT", + cp += 2; + if (tor_sscanf(cp, "%2u %3s %4u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { /* rfc1123-date */ tm_year -= 1900; - } else if (tor_sscanf(date, "%2u-%3s-%2u %2u:%2u:%2u GMT", + } else if (tor_sscanf(cp, "%2u-%3s-%2u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { /* rfc850-date */ @@ -1449,7 +1449,7 @@ parse_http_time(const char *date, struct tm *tm) /* Okay, now decode the month. */ for (i = 0; i < 12; ++i) { if (!strcasecmp(MONTH_NAMES[i], month)) { - tm->tm_mon = i+1; + tm->tm_mon = i; } } diff --git a/src/test/test_util.c b/src/test/test_util.c index ee745c5..5845d77 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -87,6 +87,53 @@ test_util_time(void) } static void +test_util_parse_http_time(void *arg) +{ + struct tm a_time; + + (void)arg; + + /* Test parse_http_time */ + + test_eq(-1, parse_http_time("", &a_time)); + test_eq(-1, parse_http_time("Sunday, 32 Aug 2004 00:48:22 GMT", &a_time)); + test_eq(-1, parse_http_time("Sunday, 3 Aug 1869 00:48:22 GMT", &a_time)); + 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(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + 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)); + 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)); + 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)); + 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)); + 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)); + test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time)); + 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(-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)); + test_eq(-1, parse_http_time("2011-03-30 23:60:00 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-30 23:59:62 GMT", &a_time)); + test_eq(-1, parse_http_time("1969-03-30 23:59:59 GMT", &a_time)); + 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)); + + done: + ; +} + +static void test_util_config_line(void) { char buf[1024]; @@ -1314,6 +1361,7 @@ test_util_di_ops(void) struct testcase_t util_tests[] = { UTIL_LEGACY(time), + UTIL_TEST(parse_http_time, 0), UTIL_LEGACY(config_line), UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2),

1 0

[tor/maint-0.2.2] 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] In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error
by nickm＠torproject.org 16 May '12

16 May '12

commit 2888644a9f268683ab70cc972b36efbbbe466a25 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Sun Sep 25 16:32:43 2011 +0200 In connection_ap_handshake_process_socks(), mark the socks request as finished if a reply is send after a parse error Silences the log message: [warn] {BUG} _connection_mark_unattached_ap(): Bug: stream (marked at connection_edge.c:2224) sending two socks replies? after the client triggered the "Tor is not an HTTP Proxy" response. No additional socks reply was sent, though. --- src/or/connection_edge.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3b053c7..ca4bf3f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2319,6 +2319,11 @@ connection_ap_handshake_process_socks(entry_connection_t *conn) connection_write_to_buf((const char*)socks->reply, socks->replylen, base_conn); socks->replylen = 0; + if (sockshere == -1) { + /* An invalid request just got a reply, no additional + * one is necessary. */ + socks->has_finished = 1; + } } if (sockshere == 0) {

1 0

[tor/master] Add changes file for bug 4108
by nickm＠torproject.org 16 May '12

16 May '12

commit 70ffd3bc20d2ab4ce9e3f4e57b3728e644d584ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:44:12 2012 -0400 Add changes file for bug 4108 --- changes/bug4108 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4108 b/changes/bug4108 new file mode 100644 index 0000000..6ef451a --- /dev/null +++ b/changes/bug4108 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid a "double-reply" warning when replying to a SOCKS request + with a parse error. Patch from Fabian Keil. Fix for bug 4108; + bugfix on 0.2.3.4-alpha.

1 0

[tor/master] Improve our documentation for the NT Service command line options
by nickm＠torproject.org 16 May '12

16 May '12

commit dc60b5d6a725955847082a24ff0b65d183e60c18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 13:10:35 2012 -0400 Improve our documentation for the NT Service command line options We explain the --options option, document --nt-service as an internal-use-only thing (which it is), fix a URL, and generally improve the prose. --- changes/bug3964 | 4 ++++ doc/tor.1.txt | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug3964 b/changes/bug3964 new file mode 100644 index 0000000..34cad50 --- /dev/null +++ b/changes/bug3964 @@ -0,0 +1,4 @@ + o Documentation fixes: + - Improve the manual's documentation for the NT Service command-line + options. Addresses bug 3964. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e73377b..ff46472 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -45,10 +45,16 @@ OPTIONS **--verify-config**:: Verify the configuration file is valid. +**--service install** [**--options** __command-line options__]:: + Install an instance of Tor as a Windows service, with the provided + command-line options. Current instructions can be found at + https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#HowdoIrunmyTorrela… + +**--service** **remove**|**start**|**stop**:: + Remove, start, or stop a configured Tor Windows service. + **--nt-service**:: - **--service [install|remove|start|stop]** Manage the Tor Windows - NT/2000/XP service. Current instructions can be found at - https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService + Used internally to implement a Windows service. **--list-torrc-options**:: List all valid options.

1 0

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

16 May '12

commit 82ce43a70676013eb4b694465a826b9d469905aa Merge: 2cdd631 dc60b5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:33:52 2012 -0400 Merge remote-tracking branch 'public/bug3964' changes/bug3964 | 4 ++++ doc/tor.1.txt | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/master] Correct documentation for remove_obsolete_entry_guards.
by nickm＠torproject.org 16 May '12

16 May '12

commit a6cb07bd9e332205d55010c8386746096f78fc91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:18:21 2012 -0400 Correct documentation for remove_obsolete_entry_guards. --- src/or/circuitbuild.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 3b82ed7..19be77e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3737,7 +3737,9 @@ entry_guard_free(entry_guard_t *e) /** Remove any entry guard which was selected by an unknown version of Tor, * or which was selected by a version of Tor that's known to select - * entry guards badly. */ + * entry guards badly, or which was selected more 2 months ago. */ +/* XXXX The "obsolete guards" and "chosen long ago guards" things should + * probably be different functions. */ static int remove_obsolete_entry_guards(time_t now) {

1 0

[tor/master] Remove over-two-months-old entry guards even while running.
by nickm＠torproject.org 16 May '12

16 May '12

commit f89de0a79fe02727d40a051eba0e96f7324e68ab Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 16 11:28:36 2012 -0400 Remove over-two-months-old entry guards even while running. Previously, we only did this check at startup, which could lead to us holding a guard indefinitely, and give weird results. Fixes bug 5380; bugfix on 0.2.1.14-rc. (Patch by Roger; changes file and commit message by Nick) --- changes/bug5380 | 5 +++++ src/or/circuitbuild.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug5380 b/changes/bug5380 new file mode 100644 index 0000000..4bb17bc --- /dev/null +++ b/changes/bug5380 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Check our entry guards for having been picked too long ago when + we get a new consensus. (Previously, we only did this check at + startup, which could lead to us holding a guard indefinitely, + and give weird results.) Fixes bug 5380; bugfix on 0.2.1.14-rc. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 19be77e..403f65f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3868,6 +3868,8 @@ entry_guards_compute_status(const or_options_t *options, time_t now) if (remove_dead_entry_guards(now)) changed = 1; + if (remove_obsolete_entry_guards(now)) + changed = 1; if (changed) { SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) {

1 0