- tor-commits - lists.torproject.org

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

10 May '12

commit c78a42685fd342ec961ede7a61e7b82bd40060b8 Merge: 1cf970c 79c4c81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 15:41:04 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/util.c src/test/test_util.c changes/bug5786_range | 8 ++++++++ src/common/util.c | 9 +++++++++ src/test/test_util.c | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --cc src/common/util.c index 276c6dd,7d2fc4d..30bf687 --- a/src/common/util.c +++ b/src/common/util.c @@@ -906,11 -803,7 +909,13 @@@ tor_parse_long(const char *s, int base char *endptr; long r; + if (base < 0) { + if (ok) + *ok = 0; + return 0; + } ++ + errno = 0; r = strtol(s, &endptr, base); CHECK_STRTOX_RESULT(); } @@@ -923,11 -816,7 +928,13 @@@ tor_parse_ulong(const char *s, int base char *endptr; unsigned long r; + if (base < 0) { + if (ok) + *ok = 0; + return 0; + } ++ + errno = 0; r = strtoul(s, &endptr, base); CHECK_STRTOX_RESULT(); } @@@ -952,15 -842,10 +960,16 @@@ tor_parse_uint64(const char *s, int bas char *endptr; uint64_t r; + if (base < 0) { + if (ok) + *ok = 0; + return 0; + } + + errno = 0; #ifdef HAVE_STRTOULL r = (uint64_t)strtoull(s, &endptr, base); -#elif defined(MS_WINDOWS) +#elif defined(_WIN32) #if defined(_MSC_VER) && _MSC_VER < 1300 tor_assert(base <= 10); r = (uint64_t)_atoi64(s); diff --cc src/test/test_util.c index 7a455e0,ee745c5..e8f043a --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -731,47 -263,51 +731,62 @@@ test_util_strmisc(void test_streq(cp, ""); test_assert(U64_LITERAL(0) == tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp)); - test_assert(i == 0); + test_eq(0, i); { - /* Test tor_parse_double. */ + /* Test parse_double */ double d = tor_parse_double("10", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); test_assert(DBL_TO_U64(d) == 10); d = tor_parse_double("0", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); test_assert(DBL_TO_U64(d) == 0); d = tor_parse_double(" ", 0, UINT64_MAX,&i,NULL); - test_assert(i == 0); + test_eq(0, i); d = tor_parse_double(".0a", 0, UINT64_MAX,&i,NULL); - test_assert(i == 0); + test_eq(0, i); d = tor_parse_double(".0a", 0, UINT64_MAX,&i,&cp); - test_assert(i == 1); + test_eq(1, i); d = tor_parse_double("-.0", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); + test_assert(DBL_TO_U64(d) == 0); + d = tor_parse_double("-10", -100.0, 100.0,&i,NULL); + test_eq(1, i); + test_eq(-10.0, d); } + { + /* Test tor_parse_* where we overflow/underflow the underlying type. */ + /* This string should overflow 64-bit ints. */ + #define TOOBIG "100000000000000000000000000" + test_eq(0L, tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(0L, tor_parse_long("-"TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(0UL, tor_parse_ulong(TOOBIG, 10, 0, ULONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(U64_LITERAL(0), tor_parse_uint64(TOOBIG, 10, + 0, UINT64_MAX, &i, NULL)); + test_eq(i, 0); + } + - /* Test failing snprintf cases */ + /* Test snprintf */ + /* Returning -1 when there's not enough room in the output buffer */ test_eq(-1, tor_snprintf(buf, 0, "Foo")); test_eq(-1, tor_snprintf(buf, 2, "Foo")); - - /* Test printf with uint64 */ + test_eq(-1, tor_snprintf(buf, 3, "Foo")); + test_neq(-1, tor_snprintf(buf, 4, "Foo")); + /* Always NUL-terminate the output */ + tor_snprintf(buf, 5, "abcdef"); + test_eq(0, buf[4]); + tor_snprintf(buf, 10, "abcdef"); + test_eq(0, buf[6]); + /* uint64 */ tor_snprintf(buf, sizeof(buf), "x!"U64_FORMAT"!x", U64_PRINTF_ARG(U64_LITERAL(12345678901))); - test_streq(buf, "x!12345678901!x"); + test_streq("x!12345678901!x", buf); - /* Test for strcmpstart and strcmpend. */ + /* Test str{,case}cmpstart */ test_assert(strcmpstart("abcdef", "abcdef")==0); test_assert(strcmpstart("abcdef", "abc")==0); test_assert(strcmpstart("abcdef", "abd")<0);

1 0

[tor/maint-0.2.2] Handle out-of-range values in tor_parse_* integer functions
by nickm＠torproject.org 10 May '12

10 May '12

commit 9b344628ed8f15543dc7780cc2a5cdd1b8f656cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 12:25:59 2012 -0400 Handle out-of-range values in tor_parse_* integer functions The underlying strtoX functions handle overflow by saturating and setting errno to ERANGE. If the min/max arguments to the tor_parse_* functions are equal to the minimum/maximum of the underlying type, then with the old approach, we wouldn't treat a too-large value as genuinely broken. Found this while looking at bug 5786; bugfix on 19da1f36 (in Tor 0.0.9), which introduced these functions. --- changes/bug5786_range | 8 ++++++++ src/common/util.c | 7 +++++++ src/test/test_util.c | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/changes/bug5786_range b/changes/bug5786_range new file mode 100644 index 0000000..40ac4d2 --- /dev/null +++ b/changes/bug5786_range @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Make our number-parsing functions always treat too-large values + as an error, even when those values exceed the width of the + underlying type. Previously, if the caller provided these + functions with minima or maxima set to the extreme values of the + underlying integer type, these functions would return those + values on overflow rather than treating overflow as an error. + Fix for part of bug 5786; bugfix on Tor 0.0.9. \ No newline at end of file diff --git a/src/common/util.c b/src/common/util.c index e3cd154..7d2fc4d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -764,6 +764,9 @@ tor_digest256_is_zero(const char *digest) /* Helper: common code to check whether the result of a strtol or strtoul or * strtoll is correct. */ #define CHECK_STRTOX_RESULT() \ + /* Did an overflow occur? */ \ + if (errno == ERANGE) \ + goto err; \ /* Was at least one character converted? */ \ if (endptr == s) \ goto err; \ @@ -800,6 +803,7 @@ tor_parse_long(const char *s, int base, long min, long max, char *endptr; long r; + errno = 0; r = strtol(s, &endptr, base); CHECK_STRTOX_RESULT(); } @@ -812,6 +816,7 @@ tor_parse_ulong(const char *s, int base, unsigned long min, char *endptr; unsigned long r; + errno = 0; r = strtoul(s, &endptr, base); CHECK_STRTOX_RESULT(); } @@ -823,6 +828,7 @@ tor_parse_double(const char *s, double min, double max, int *ok, char **next) char *endptr; double r; + errno = 0; r = strtod(s, &endptr); CHECK_STRTOX_RESULT(); } @@ -836,6 +842,7 @@ tor_parse_uint64(const char *s, int base, uint64_t min, char *endptr; uint64_t r; + errno = 0; #ifdef HAVE_STRTOULL r = (uint64_t)strtoull(s, &endptr, base); #elif defined(MS_WINDOWS) diff --git a/src/test/test_util.c b/src/test/test_util.c index 23cd059..ee745c5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -283,6 +283,21 @@ test_util_strmisc(void) test_assert(i == 1); } + { + /* Test tor_parse_* where we overflow/underflow the underlying type. */ + /* This string should overflow 64-bit ints. */ +#define TOOBIG "100000000000000000000000000" + test_eq(0L, tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(0L, tor_parse_long("-"TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(0UL, tor_parse_ulong(TOOBIG, 10, 0, ULONG_MAX, &i, NULL)); + test_eq(i, 0); + test_eq(U64_LITERAL(0), tor_parse_uint64(TOOBIG, 10, + 0, UINT64_MAX, &i, NULL)); + test_eq(i, 0); + } + /* Test failing snprintf cases */ test_eq(-1, tor_snprintf(buf, 0, "Foo")); test_eq(-1, tor_snprintf(buf, 2, "Foo"));

1 0

[tor/maint-0.2.2] Merge branch 'bug5786_range_022' into maint-0.2.2
by nickm＠torproject.org 10 May '12

10 May '12

commit 79c4c8195a9da15dc13866dd4a706807c79dba46 Merge: 5bbf04d 9b34462 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 15:38:57 2012 -0400 Merge branch 'bug5786_range_022' into maint-0.2.2 changes/bug5786_range | 8 ++++++++ src/common/util.c | 7 +++++++ src/test/test_util.c | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-)

1 0

[torspec/master] add key missing word
by arma＠torproject.org 10 May '12

10 May '12

commit b1be41c7337d3d642ed646b47970843ffffc7771 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 15:33:59 2012 -0400 add key missing word --- proposals/201-bridge-v3-reqs-stats.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proposals/201-bridge-v3-reqs-stats.txt b/proposals/201-bridge-v3-reqs-stats.txt index 7ac6e56..67d8c00 100644 --- a/proposals/201-bridge-v3-reqs-stats.txt +++ b/proposals/201-bridge-v3-reqs-stats.txt @@ -9,7 +9,7 @@ Overview: Our current approach [0] to estimate daily bridge users is based on unique IP addresses reported by bridges, and it is very likely broken. - A bridge can connect to two or more bridges, so that unique IP address + A bridge user can connect to two or more bridges, so that unique IP address sets overlap to an unknown extent. We should instead count requests for v3 network statuses, sum them up for all bridges, and divide by the average number of requests that a bridge client makes per day. This

1 0

[torbutton/master] Bug 5710: Remove all sessionstore data in TBB.
by mikeperry＠torproject.org 10 May '12

10 May '12

commit 39c6fc278cb9a5a00449400e6c47c5e5ca47671b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu May 10 12:26:05 2012 -0700 Bug 5710: Remove all sessionstore data in TBB. I think we got it this time. --- src/components/tbSessionStore.js | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/components/tbSessionStore.js b/src/components/tbSessionStore.js index 840b116..5ebc456 100644 --- a/src/components/tbSessionStore.js +++ b/src/components/tbSessionStore.js @@ -95,6 +95,17 @@ TBSessionBlocker.prototype = if (topic != "sessionstore-state-write") return; this.logger.log(3, "Got Session Store observe: "+topic); subject = subject.QueryInterface(Ci.nsISupportsString); + + // Simply block sessionstore writes entirely in Tor Browser + try { + if (this.prefs.getCharPref("torbrowser.version")) { + this.logger.log(3, "Blocking SessionStore write in Tor Browser"); + subject.data = null; + return; + } + } catch(e) { + } + this.logger.log(2, "Parsing JSON: "+subject); var state = this._safeJSONparse(subject);

1 0

[tor/master] Explain TransportProxy within doc/state-contents.txt.
by nickm＠torproject.org 10 May '12

10 May '12

commit 31ed10f6c250659fbc4593f539fec5f3ef8859ee Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:33:11 2012 +0200 Explain TransportProxy within doc/state-contents.txt. --- doc/state-contents.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/state-contents.txt b/doc/state-contents.txt index 730e2fb..44716ef 100644 --- a/doc/state-contents.txt +++ b/doc/state-contents.txt @@ -60,10 +60,10 @@ Recognized fields are: One or more of these may be present. - The format is "transportname addr:port", to remember the address at - which a pluggable transport was listening. - - [XXXX why?] + The format is "transportname addr:port", to remember the address + at which a pluggable transport was listening. Tor bridges use + this information to spawn pluggable transport listeners in the + same IP address and TCP port even after tor client restarts. BWHistoryReadEnds (ISO time) BWHistoryReadInterval (integer, number of seconds)

1 0

[tor/master] Merge remote-tracking branch 'asn/bug5540'
by nickm＠torproject.org 10 May '12

10 May '12

commit 1cf970c3dbbdbdf2b2fb162bbeeb6890e9b6c5c4 Merge: e30a431 31ed10f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 14:24:17 2012 -0400 Merge remote-tracking branch 'asn/bug5540' doc/state-contents.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Ignore [::] when building descriptors.
by nickm＠torproject.org 10 May '12

10 May '12

commit 6b4af1071668028b367f185121688758988ff489 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 3 22:19:38 2012 +0200 Ignore [::] when building descriptors. This is how IPv6 says "0.0.0.0" and something we will have to translate into a globally reachable address before putting it in a descriptor. The fix is a short term solution until a real one is implemented. Closes #5146. --- src/or/router.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 4cdfd02..c51bb5d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1530,10 +1530,18 @@ router_rebuild_descriptor(int force) if (p->type == CONN_TYPE_OR_LISTENER && ! p->no_advertise && ! p->ipv4_only && - tor_addr_family(&p->addr) == AF_INET6 && - ! tor_addr_is_internal(&p->addr, 1)) { - ipv6_orport = p; - break; + tor_addr_family(&p->addr) == AF_INET6) { + if (! tor_addr_is_internal(&p->addr, 0)) { + ipv6_orport = p; + break; + } else { + char addrbuf[TOR_ADDR_BUF_LEN]; + log_warn(LD_CONFIG, + "Unable to use configured IPv6 address \"%s\" in a " + "descriptor. Skipping it. " + "Try specifying a globally reachable address explicitly. ", + tor_addr_to_str(addrbuf, &p->addr, sizeof(addrbuf), 1)); + } } } SMARTLIST_FOREACH_END(p); if (ipv6_orport) {

1 0

[tor/master] Merge remote-tracking branch 'linus/bug5146'
by nickm＠torproject.org 10 May '12

10 May '12

commit e30a4311e2ebf2f33eea1228e2fc08e2b96cc094 Merge: 8c09923 6b4af10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 14:07:23 2012 -0400 Merge remote-tracking branch 'linus/bug5146' src/or/router.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)

1 0

[torspec/master] Document requirement for use of TOR_PT_EXTENDED_SERVER_PORT.
by nickm＠torproject.org 10 May '12

10 May '12

commit 00e515a56bb9cb67d37a05f3697436abacd1daad Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 10 13:57:21 2012 -0400 Document requirement for use of TOR_PT_EXTENDED_SERVER_PORT. --- proposals/180-pluggable-transport.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 307b820..e5e4ee7 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -286,9 +286,12 @@ Managed proxy interface {Server only} - "TOR_PT_EXTENDED_SERVER_PORT" -- An addr:port (probably on localhost) - that speaks the extended server protocol. (See the "The extended - ORPort protocol" section below.) + "TOR_PT_EXTENDED_SERVER_PORT" -- An <address>:<port> where tor + should be listening for connections speaking the extended + ORPort protocol (See the "The extended ORPort protocol" section + below). If tor does not support the extended ORPort protocol, + it MUST use the empty string as the value of this environment + variable. Example: TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200 "TOR_PT_ORPORT" -- Our regular ORPort in a form suitable

1 0