tor-commits April 2013

tor-commits@lists.torproject.org

19 participants
1496 discussions

[tor/release-0.2.4] Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2)
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 2c40138210fe934f687470fc4bd20513982bf424 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:27 2013 +0200 Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2) Since 7536c40 only DNS results for real SOCKS requests are added to the cache, but not DNS results for DNSPort queries or control connection RESOLVE queries. Only cache additions would trigger ADDRMAP events on successful resolve. Change it so that DNS results received after a RESOLVE command also generate ADDRMAP events. --- src/or/connection_edge.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5075c47..0519708 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2040,11 +2040,8 @@ tell_controller_about_resolved_result(entry_connection_t *conn, int ttl, time_t expires) { - - if (ttl >= 0 && (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_HOSTNAME)) { - return; /* we already told the controller. */ - } else if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { + expires = time(NULL) + ttl; + if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, cp, expires, NULL); @@ -2116,8 +2113,9 @@ connection_ap_handshake_socks_resolved(entry_connection_t *conn, conn->socks_request->has_finished = 1; return; } else { - /* This must be a request from the controller. We already sent - * a mapaddress if there's a ttl. */ + /* This must be a request from the controller. Since answers to those + * requests are not cached, they do not generate an ADDRMAP event on + * their own. */ tell_controller_about_resolved_result(conn, answer_type, answer_len, (char*)answer, ttl, expires); conn->socks_request->has_finished = 1;

1 0

[tor/release-0.2.4] Fix a wide line
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 33b7083f26e30304f6c9296e3cb7205f6bda0c95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 09:36:37 2013 -0400 Fix a wide line --- src/or/circuitbuild.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index df56877..31242f6 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2555,9 +2555,9 @@ pathbias_scale_use_rates(entry_guard_t *guard) guard->use_attempts += opened_attempts; log_info(LD_CIRC, - "Scaled pathbias use counts to %f/%f (%d open) for guard %s ($%s)", - guard->use_successes, guard->use_attempts, opened_attempts, - guard->nickname, hex_str(guard->identity, DIGEST_LEN)); + "Scaled pathbias use counts to %f/%f (%d open) for guard %s ($%s)", + guard->use_successes, guard->use_attempts, opened_attempts, + guard->nickname, hex_str(guard->identity, DIGEST_LEN)); /* Have the counts just become invalid by this scaling attempt? */ if (counts_are_sane && guard->use_attempts < guard->use_successes) {

1 0

[tor/release-0.2.4] test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit d1dc23c9386c6c85ec50c5b4d0a9077ffcb78683 Author: Peter Palfrader <peter(a)palfrader.org> Date: Thu Apr 4 18:05:14 2013 +0200 test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638) --- changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug8638 b/changes/bug8638 new file mode 100644 index 0000000..3a790e5 --- /dev/null +++ b/changes/bug8638 @@ -0,0 +1,3 @@ + o Minor features + In our testsuite, create temporary directories with a bit more entropy + in their name to make name collissions less likely. Fixes bug 8638. diff --git a/src/test/test.c b/src/test/test.c index d3d3bd5..0b55f7b 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -88,8 +88,14 @@ setup_directory(void) { static int is_setup = 0; int r; + char rnd[256], rnd32[256]; if (is_setup) return; +/* Due to base32 limitation needs to be a multiple of 5. */ +#define RAND_PATH_BYTES 5 + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + #ifdef _WIN32 { char buf[MAX_PATH]; @@ -98,11 +104,11 @@ setup_directory(void) if (!GetTempPathA(sizeof(buf),buf)) tmp = "c:\\windows\\temp"; tor_snprintf(temp_dir, sizeof(temp_dir), - "%s\\tor_test_%d", tmp, (int)getpid()); + "%s\\tor_test_%d_%s", tmp, (int)getpid(), rnd32); r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid()); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { @@ -2094,6 +2100,7 @@ main(int c, const char **v) return 1; } crypto_set_tls_dh_prime(NULL); + crypto_seed_rng(1); rep_hist_init(); network_init(); setup_directory(); @@ -2106,8 +2113,6 @@ main(int c, const char **v) return 1; } - crypto_seed_rng(1); - atexit(remove_directory); have_failed = (tinytest_main(c, v, testgroups) != 0);

1 0

[tor/release-0.2.4] Use option name --test-commandline in tor-fw-helper.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 03efe54027e214be51f5cb4bafcbbd57422da7a1 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 13 00:43:21 2013 -0700 Use option name --test-commandline in tor-fw-helper. It was previously --Test in the help output and --test-commandline in the getopt call. The man page already had --test. (Originally by David, who resolved the tie in favor of "--test"; I chose --test-commandline" instead so that nothing that depended on it could break. -Nick) --- changes/bug7768 | 4 ++-- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug7768 b/changes/bug7768 index f523b5b..e3f9600 100644 --- a/changes/bug7768 +++ b/changes/bug7768 @@ -1,3 +1,3 @@ o Documentation fixes: - - Update tor-fw-helper.1.txt to describe its options with their - correct names. Fixes bug 7768. + - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option + names match. Fixes bug 7768. diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index d92445e..488fe67 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -97,7 +97,7 @@ usage(void) { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" " [-p|--forward-port ([<external port>]:<internal port>])\n");

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 Merge: 60d1442 1827be0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:32:17 2013 -0400 Merge remote-tracking branch 'public/bug7950' into maint-0.2.4 changes/bug7950 | 4 ++++ src/common/util.c | 19 ++++++++++++++----- src/common/util.h | 7 +++++-- src/or/confparse.c | 5 ++++- 4 files changed, 27 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.4] Use --test-commandline name in tor-fw-helper manpage
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 6fe4e24645e820167322886f12d27e5e161e9228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:34 2013 -0400 Use --test-commandline name in tor-fw-helper manpage --- doc/tor-fw-helper.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index f51ffc4..1c103d9 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -14,7 +14,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- -**tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] +**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip] [-p __external port__:__internal_port__] DESCRIPTION @@ -33,7 +33,7 @@ OPTIONS **-v** or **--verbose**:: Display verbose output. -**-T** or **--test**:: +**-T** or **--test-commandline**:: Display test information and print the test information in tor-fw-helper.log

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 60d14421363bdbeee337ba69b21640058a26a6bd Merge: 8d29866 6fe4e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:47 2013 -0400 Merge remote-tracking branch 'public/bug7768' into maint-0.2.4 changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 14 +++++++------- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --cc src/tools/tor-fw-helper/tor-fw-helper.c index adeb63b,488fe67..bb6e70a --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@@ -97,10 -97,10 +97,10 @@@ usage(void { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" - " [-p|--forward-port ([<external port>]:<internal port>])\n"); + " [-p|--forward-port ([<external port>]:<internal port>)]\n"); } /** Log commandline options to a hardcoded file tor-fw-helper.log in the

1 0

[tor/release-0.2.4] Document the GuardLifetime option
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit aa040619d5d584d3dc1639b656f8ab6a619abe56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 21:25:37 2013 -0400 Document the GuardLifetime option --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5cf5a71..5639ad2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -959,7 +959,7 @@ The following options are useful only for clients (that is, if If UseEntryGuards is set to 1, we will try to pick a total of NUM routers as long-term entries for our circuits. (Default: 3) -**HeartbeatPeriod** __N__ **days**|**weeks**|**months**:: +**GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before picking a new one. If zero, we use the GuardLifetime parameter from the consensus directory. No value here may be less than 2 months or greater

1 0

[tor/release-0.2.4] Make the guard lifetime configurable and adjustable via the consensus
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 343f7aa05967df43c3f7e5b392b66e21c08b7cb1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 17:24:13 2013 -0500 Make the guard lifetime configurable and adjustable via the consensus Fixes 8240. (Don't actually increase the default guard lifetime. It seems likely to break too many things if done precipitiously.) --- changes/ticket8240 | 4 ++++ doc/tor.1.txt | 6 ++++++ src/common/util.h | 11 +++++++++++ src/or/circuitbuild.c | 36 ++++++++++++++++++++++++++++++++---- src/or/config.c | 1 + src/or/or.h | 3 +++ 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/changes/ticket8240 b/changes/ticket8240 new file mode 100644 index 0000000..91e6f8c --- /dev/null +++ b/changes/ticket8240 @@ -0,0 +1,4 @@ + o Major security fixes: + - Make the default guard lifetime controllable via a new + GuardLifetime torrc option and a GuardLifetime consensus + parameter. Start of a fix for bug 8240; bugfix on 0.1.1.11-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 773fccf..5cf5a71 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -959,6 +959,12 @@ The following options are useful only for clients (that is, if If UseEntryGuards is set to 1, we will try to pick a total of NUM routers as long-term entries for our circuits. (Default: 3) +**HeartbeatPeriod** __N__ **days**|**weeks**|**months**:: + If nonzero, and UseEntryGuards is set, minimum time to keep a guard before + picking a new one. If zero, we use the GuardLifetime parameter from the + consensus directory. No value here may be less than 2 months or greater + than 5 years; out-of-range values are clamped. (Default: 0) + **SafeSocks** **0**|**1**:: When this option is enabled, Tor will reject application connections that use unsafe variants of the socks protocol -- ones that only provide an IP diff --git a/src/common/util.h b/src/common/util.h index 8977d27..4642e40 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -173,6 +173,17 @@ int n_bits_set_u8(uint8_t v); * overflow. */ #define CEIL_DIV(a,b) (((a)+(b)-1)/(b)) +/* Return v if it's between min and max. Otherwise + * return min if v is smaller than min, or max if + * b is larger than max. + * + * Requires that min is no more than max. May evaluate any of + * its arguments more than once! */ +#define CLAMP(min,v,max) \ + ( ((v) < (min)) ? (min) : \ + ((v) > (max)) ? (max) : \ + (v) ) + /* String manipulation */ /** Allowable characters in a hexadecimal string. */ diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f8521c5..f07d428 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4203,6 +4203,9 @@ control_event_guard_deferred(void) #endif } +/** Largest amount that we'll backdate chosen_on_date */ +#define CHOSEN_ON_DATE_SLOP (30*86400) + /** Add a new (preferably stable and fast) router to our * entry_guards list. Return a pointer to the router if we succeed, * or NULL if we can't find any more suitable entries. @@ -4241,7 +4244,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend) * don't all select them on the same day, and b) avoid leaving a * precise timestamp in the state file about when we first picked * this guard. For details, see the Jan 2010 or-dev thread. */ - entry->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); + entry->chosen_on_date = time(NULL) - crypto_rand_int(CHOSEN_ON_DATE_SLOP); entry->chosen_by_version = tor_strdup(VERSION); if (prepend) smartlist_insert(entry_guards, 0, entry); @@ -4285,15 +4288,40 @@ entry_guard_free(entry_guard_t *e) tor_free(e); } +/** + * Return the minimum lifetime of working entry guard, in seconds, + * as given in the consensus networkstatus. + */ +static int32_t +guards_get_lifetime(void) +{ + const or_options_t *options = get_options(); +#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ + + if (options->GuardLifetime >= 1) { + return CLAMP(MIN_GUARD_LIFETIME, + options->GuardLifetime, + MAX_GUARD_LIFETIME) + CHOSEN_ON_DATE_SLOP; + } + + return networkstatus_get_param(NULL, "GuardLifetime", + DFLT_GUARD_LIFETIME, + MIN_GUARD_LIFETIME, + MAX_GUARD_LIFETIME) + CHOSEN_ON_DATE_SLOP; +} + /** 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, or which was selected more 2 months ago. */ + * entry guards badly, or which was selected a long time 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) { int changed = 0, i; + int32_t guard_lifetime = guards_get_lifetime(); for (i = 0; i < smartlist_len(entry_guards); ++i) { entry_guard_t *entry = smartlist_get(entry_guards, i); @@ -4324,8 +4352,8 @@ remove_obsolete_entry_guards(time_t now) } tor_free(tor_ver); } - if (!version_is_bad && entry->chosen_on_date + 3600*24*60 < now) { - /* It's been 2 months since the date listed in our state file. */ + if (!version_is_bad && entry->chosen_on_date + guard_lifetime < now) { + /* It's been too long since the date listed in our state file. */ msg = "was selected several months ago"; date_is_bad = 1; } diff --git a/src/or/config.c b/src/or/config.c index 90a5dfb..6ccd65a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -302,6 +302,7 @@ static config_var_t _option_vars[] = { #endif OBSOLETE("GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays"), OBSOLETE("Group"), + V(GuardLifetime, INTERVAL, "0 minutes"), V(HardwareAccel, BOOL, "0"), V(HeartbeatPeriod, INTERVAL, "6 hours"), V(AccelName, STRING, NULL), diff --git a/src/or/or.h b/src/or/or.h index 51c23d3..b54834d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3605,6 +3605,9 @@ typedef struct { int PathBiasScaleFactor; /** @} */ + /** How long (seconds) do we keep a guard before picking a new one? */ + int GuardLifetime; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/release-0.2.4] Drop the minimum guard lifetime back down to one month
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 18752bca5b57c11b6d843db671e1886ed0624848 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 22:16:25 2013 -0400 Drop the minimum guard lifetime back down to one month Mike believes that raising the default to 2 months with no way to lower it may create horrible load-balancing issues. --- doc/tor.1.txt | 2 +- src/or/circuitbuild.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5639ad2..0c13a5c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -962,7 +962,7 @@ The following options are useful only for clients (that is, if **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before picking a new one. If zero, we use the GuardLifetime parameter from the - consensus directory. No value here may be less than 2 months or greater + consensus directory. No value here may be less than 1 month or greater than 5 years; out-of-range values are clamped. (Default: 0) **SafeSocks** **0**|**1**:: diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f07d428..d3a29fd 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4290,13 +4290,15 @@ entry_guard_free(entry_guard_t *e) /** * Return the minimum lifetime of working entry guard, in seconds, - * as given in the consensus networkstatus. + * as given in the consensus networkstatus. (Plus CHOSEN_ON_DATE_SLOP, + * so that we can do the chosen_on_date randomization while achieving the + * desired minimum lifetime.) */ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ #define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2013