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

[tor/master] Correct comment explaining why tor2web mode should disable entry guards
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit d1c4cf2f5adbfa3810164d18428ee06ccbed6451 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Sep 18 16:38:01 2012 -0400 Correct comment explaining why tor2web mode should disable entry guards --- src/or/config.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c77f7fb..affe238 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2523,15 +2523,13 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->Tor2webMode && options->UseEntryGuards) { - /* Tor2WebMode is incompatible with EntryGuards in two ways: - * - * - Tor2WebMode uses its guard nodes as rend and intro points. - * This makes tor2web users fingerprintable by their continued - * selection of the same 3 nodes for these circuits (their guard - * nodes). - * - * - Tor2WebMode makes unexpected use of circuit path lengths - * in ways that prevent us from applying the PathBias defense. + /* tor2web mode clients do not (and should not) use entry guards + * in any meaningful way. Further, tor2web mode causes the hidden + * service client code to do things which break the path bias + * detector, and it's far easier to turn off entry guards (and + * thus the path bias detector with it) than to figure out how to + * make a piece of code which cannot possibly help tor2web mode + * users compatible with tor2web mode. */ log_notice(LD_CONFIG, "Tor2WebMode is enabled; disabling UseEntryGuards.");

1 0

[tor/master] Bug 6866: Convert pathbias asserts into log messages.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 4bfed4378d3b101757e50b058e3d462fa88ecfd3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Sep 17 18:25:28 2012 -0700 Bug 6866: Convert pathbias asserts into log messages. Asserts were hit by Tor2Web mode. --- changes/bug6866 | 4 ++++ src/or/circuitbuild.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 new file mode 100644 index 0000000..561676b --- /dev/null +++ b/changes/bug6866 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Convert an assert in the pathbias code to a log message. Assert + appears to only be triggerable by Tor2Web mode. Fixes bug 6866; + bugfix on 0.2.3.17-beta. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9d52b5e..6bd1eb3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,8 +2646,24 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for inconsistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&first_hop_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return 0; } @@ -2740,8 +2756,24 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for consistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&success_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return; }

1 0

[tor/master] Whitespace fixes
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit aca325eb0c6b34ba0e1ef8df16c1cf44a98f9b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:16:17 2012 -0400 Whitespace fixes --- src/or/circuitbuild.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6bd1eb3..ffc7b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,11 +2646,11 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for inconsistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&first_hop_notice_limit, approx_time()))) { log_info(LD_BUG, @@ -2756,11 +2756,11 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for consistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&success_notice_limit, approx_time()))) { log_info(LD_BUG,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 920c76a2fcc843bc58b79195414d3ed4b693e76e Merge: f675e0a aca325e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:20:01 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6866 | 4 ++++ src/or/circuitbuild.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --cc src/or/circuitbuild.c index 515312f,ffc7b5e..840031d --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -2648,17 -2645,25 +2648,33 @@@ pathbias_count_first_hop(origin_circuit RATELIM_INIT(FIRST_HOP_NOTICE_INTERVAL); char *rate_msg = NULL; + /* We can't do path bias accounting without entry guards. + * Testing and controller circuits also have no guards. */ + if (get_options()->UseEntryGuards == 0 || + circ->_base.purpose == CIRCUIT_PURPOSE_TESTING || + circ->_base.purpose == CIRCUIT_PURPOSE_CONTROLLER) { + return 0; + } + /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for inconsistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&first_hop_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return 0; } @@@ -2750,17 -2755,25 +2766,33 @@@ pathbias_count_success(origin_circuit_ RATELIM_INIT(SUCCESS_NOTICE_INTERVAL); char *rate_msg = NULL; + /* We can't do path bias accounting without entry guards. + * Testing and controller circuits also have no guards. */ + if (get_options()->UseEntryGuards == 0 || + circ->_base.purpose == CIRCUIT_PURPOSE_TESTING || + circ->_base.purpose == CIRCUIT_PURPOSE_CONTROLLER) { + return; + } + /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for consistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&success_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return; }

1 0

[tor/master] Bump bug 6866 log messages back up to notice for 0.2.4
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 704fd8bb020bda2886eebd7c0b4a6192d4a6717c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:21:24 2012 -0400 Bump bug 6866 log messages back up to notice for 0.2.4 --- src/or/circuitbuild.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 840031d..09eef64 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2664,7 +2664,7 @@ pathbias_count_first_hop(origin_circuit_t *circ) !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&first_hop_notice_limit, approx_time()))) { - log_info(LD_BUG, + log_notice(LD_BUG, "One-hop circuit has length %d. Path state is %s. " "Circuit is a %s currently %s. %s", circ->build_state->desired_path_len, @@ -2782,7 +2782,7 @@ pathbias_count_success(origin_circuit_t *circ) !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&success_notice_limit, approx_time()))) { - log_info(LD_BUG, + log_notice(LD_BUG, "One-hop circuit has length %d. Path state is %s. " "Circuit is a %s currently %s. %s", circ->build_state->desired_path_len,

1 0

[tor/master] Disable Guard usage for Tor2webMode.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit acda1735fd62a8e2c90d6525049bc583f6049940 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Sep 17 18:45:10 2012 -0700 Disable Guard usage for Tor2webMode. Tor2webMode is fingerprintable by hidden services through repeated usage of the same three guard nodes for its rend and intro points. --- changes/bug6866 | 4 ++++ src/or/config.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 index 561676b..ee1e571 100644 --- a/changes/bug6866 +++ b/changes/bug6866 @@ -2,3 +2,7 @@ - Convert an assert in the pathbias code to a log message. Assert appears to only be triggerable by Tor2Web mode. Fixes bug 6866; bugfix on 0.2.3.17-beta. + - Disable the use of Guard nodes when in Tor2WebMode. Guard usage + by Tor2Web clients allows hidden services to identity tor2web + clients through their repeated selection of the same rendezvous + and introduction point circuit endpoints (their guards). diff --git a/src/or/config.c b/src/or/config.c index 4557853..c77f7fb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2522,6 +2522,22 @@ options_validate(or_options_t *old_options, or_options_t *options, options->LearnCircuitBuildTimeout = 0; } + if (options->Tor2webMode && options->UseEntryGuards) { + /* Tor2WebMode is incompatible with EntryGuards in two ways: + * + * - Tor2WebMode uses its guard nodes as rend and intro points. + * This makes tor2web users fingerprintable by their continued + * selection of the same 3 nodes for these circuits (their guard + * nodes). + * + * - Tor2WebMode makes unexpected use of circuit path lengths + * in ways that prevent us from applying the PathBias defense. + */ + log_notice(LD_CONFIG, + "Tor2WebMode is enabled; disabling UseEntryGuards."); + options->UseEntryGuards = 0; + } + if (!(options->LearnCircuitBuildTimeout) && options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { log_warn(LD_CONFIG,

1 0

[tor/master] Note a bug number for 6888
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 9d3e497edb25d8161ba166ae5cec8fabf8b462fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:22:12 2012 -0400 Note a bug number for 6888 --- changes/bug6866 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 index ee1e571..efaab98 100644 --- a/changes/bug6866 +++ b/changes/bug6866 @@ -5,4 +5,5 @@ - Disable the use of Guard nodes when in Tor2WebMode. Guard usage by Tor2Web clients allows hidden services to identity tor2web clients through their repeated selection of the same rendezvous - and introduction point circuit endpoints (their guards). + and introduction point circuit endpoints (their guards). Fixes + bug 6888.

1 0

[tor/maint-0.2.3] Whitespace fixes
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit aca325eb0c6b34ba0e1ef8df16c1cf44a98f9b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:16:17 2012 -0400 Whitespace fixes --- src/or/circuitbuild.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6bd1eb3..ffc7b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,11 +2646,11 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for inconsistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&first_hop_notice_limit, approx_time()))) { log_info(LD_BUG, @@ -2756,11 +2756,11 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for consistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&success_notice_limit, approx_time()))) { log_info(LD_BUG,

1 0

[tor/maint-0.2.3] Bug 6866: Convert pathbias asserts into log messages.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 4bfed4378d3b101757e50b058e3d462fa88ecfd3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Sep 17 18:25:28 2012 -0700 Bug 6866: Convert pathbias asserts into log messages. Asserts were hit by Tor2Web mode. --- changes/bug6866 | 4 ++++ src/or/circuitbuild.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 new file mode 100644 index 0000000..561676b --- /dev/null +++ b/changes/bug6866 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Convert an assert in the pathbias code to a log message. Assert + appears to only be triggerable by Tor2Web mode. Fixes bug 6866; + bugfix on 0.2.3.17-beta. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9d52b5e..6bd1eb3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,8 +2646,24 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for inconsistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&first_hop_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return 0; } @@ -2740,8 +2756,24 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for consistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&success_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return; }

1 0

[tor/master] Print the correct address family in log printout.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit a989dbc3dcf2d5dd80b279084053fff3e94d124d Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Sep 18 14:41:14 2012 +0200 Print the correct address family in log printout. Look at the address family of the preferred OR port rather than the node.ipv6_preferred flag since the logic has changed with new ClientUseIPv6 config option. Fixes ticket 6884. --- changes/6884 | 4 ++++ src/or/circuitbuild.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/6884 b/changes/6884 new file mode 100644 index 0000000..90585dc --- /dev/null +++ b/changes/6884 @@ -0,0 +1,4 @@ + o Minor bugfixes (client): + - Correct log printout about which address family is preferred + when connecting to a bridge with both an IPv4 and IPv6 OR port. + Fixes bug 6884. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index d496923..515312f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5641,7 +5641,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) "Bridge '%s' has both an IPv4 and an IPv6 address. " "Will prefer using its %s address (%s:%d).", ri->nickname, - node->ipv6_preferred ? "IPv6" : "IPv4", + tor_addr_family(&ap.addr) == AF_INET6 ? "IPv6" : "IPv4", fmt_addr(&ap.addr), ap.port); } }

1 0