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

[tor/master] Ticket #17857: Apply padding off-switch to existing connections.
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 6d221c8f371a0c1809552b699f1afab8cde3bd31 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 23 18:34:41 2017 -0400 Ticket #17857: Apply padding off-switch to existing connections. --- src/or/channel.c | 30 ++++++++++++------- src/or/channelpadding.c | 26 ++++++++++++++--- src/or/channelpadding.h | 5 ++++ src/test/test_channelpadding.c | 65 +++++++++++++++++++++++++++++++++--------- 4 files changed, 98 insertions(+), 28 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 8348ffd64..17b2191b7 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -66,6 +66,7 @@ #include "scheduler.h" #include "compat_time.h" #include "networkstatus.h" +#include "rendservice.h" /* Global lists of channels */ @@ -2712,17 +2713,26 @@ channel_do_open_actions(channel_t *chan) /* Disable or reduce padding according to user prefs. */ if (chan->padding_enabled || get_options()->ConnectionPadding == 1) { - if (!get_options()->ConnectionPadding || - (get_options()->Tor2webMode && - !networkstatus_get_param(NULL, "nf_pad_tor2web", 1, 0, 1)) - || (get_options()->HiddenServiceSingleHopMode && - !networkstatus_get_param(NULL, "nf_pad_single_onion", 1, 0, 1))) { + if (!get_options()->ConnectionPadding) { + /* Disable if torrc disabled */ channelpadding_disable_padding_on_channel(chan); - } - - /* Padding can be forced and/or reduced by clients, regardless of if - * the channel supports it */ - if (get_options()->ReducedConnectionPadding) { + } else if (get_options()->Tor2webMode && + !networkstatus_get_param(NULL, + CHANNELPADDING_TOR2WEB_PARAM, + CHANNELPADDING_TOR2WEB_DEFAULT, 0, 1)) { + /* Disable if we're using tor2web and the consensus disabled padding + * for tor2web */ + channelpadding_disable_padding_on_channel(chan); + } else if (rend_service_allow_non_anonymous_connection(get_options()) && + !networkstatus_get_param(NULL, + CHANNELPADDING_SOS_PARAM, + CHANNELPADDING_SOS_DEFAULT, 0, 1)) { + /* Disable if we're using RSOS and the consensus disabled padding + * for RSOS*/ + channelpadding_disable_padding_on_channel(chan); + } else if (get_options()->ReducedConnectionPadding) { + /* Padding can be forced and/or reduced by clients, regardless of if + * the channel supports it */ channelpadding_reduce_padding_on_channel(chan); } } diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 9a2fdc4bb..ee6d29f7c 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -21,6 +21,7 @@ #include "router.h" #include "compat_time.h" #include <event2/event.h> +#include "rendservice.h" STATIC int channelpadding_get_netflow_inactive_timeout_ms(const channel_t *); STATIC int channelpadding_send_disable_command(channel_t *); @@ -136,10 +137,14 @@ channelpadding_new_consensus_params(networkstatus_t *ns) networkstatus_get_param(ns, "nf_pad_relays", 0, 0, 1); consensus_nf_pad_tor2web = - networkstatus_get_param(ns, "nf_pad_tor2web", 1, 0, 1); + networkstatus_get_param(ns, + CHANNELPADDING_TOR2WEB_PARAM, + CHANNELPADDING_TOR2WEB_DEFAULT, 0, 1); consensus_nf_pad_single_onion = - networkstatus_get_param(ns, "nf_pad_single_onion", 1, 0, 1); + networkstatus_get_param(ns, + CHANNELPADDING_SOS_PARAM, + CHANNELPADDING_SOS_DEFAULT, 0, 1); } /** @@ -717,11 +722,24 @@ channelpadding_decide_to_pad_channel(channel_t *chan) return CHANNELPADDING_WONTPAD; } - if (options->Tor2webMode && !consensus_nf_pad_tor2web) + if (options->Tor2webMode && !consensus_nf_pad_tor2web) { + /* If the consensus just changed values, this channel may still + * think padding is enabled. Negotiate it off. */ + if (chan->padding_enabled) + channelpadding_disable_padding_on_channel(chan); + return CHANNELPADDING_WONTPAD; + } + + if (rend_service_allow_non_anonymous_connection(options) && + !consensus_nf_pad_single_onion) { + /* If the consensus just changed values, this channel may still + * think padding is enabled. Negotiate it off. */ + if (chan->padding_enabled) + channelpadding_disable_padding_on_channel(chan); - if (options->HiddenServiceSingleHopMode && !consensus_nf_pad_single_onion) return CHANNELPADDING_WONTPAD; + } if (!chan->has_queued_writes(chan)) { int is_client_channel = 0; diff --git a/src/or/channelpadding.h b/src/or/channelpadding.h index 2708ee973..a227e27d5 100644 --- a/src/or/channelpadding.h +++ b/src/or/channelpadding.h @@ -13,6 +13,11 @@ #include "channelpadding_negotiation.h" +#define CHANNELPADDING_TOR2WEB_PARAM "nf_pad_tor2web" +#define CHANNELPADDING_TOR2WEB_DEFAULT 1 +#define CHANNELPADDING_SOS_PARAM "nf_pad_single_onion" +#define CHANNELPADDING_SOS_DEFAULT 1 + typedef enum { CHANNELPADDING_WONTPAD, CHANNELPADDING_PADLATER, diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 99f8880a4..998368cf4 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -371,6 +371,7 @@ test_channelpadding_killonehop(void *arg) timers_initialize(); setup_mock_consensus(); + setup_mock_network(); /* Do we disable padding if tor2webmode or rsos are enabled, and * the consensus says don't pad? */ @@ -380,7 +381,6 @@ test_channelpadding_killonehop(void *arg) smartlist_clear(current_md_consensus->net_params); channelpadding_new_consensus_params(current_md_consensus); - setup_mock_network(); tried_to_write_cell = 0; get_options_mutable()->Tor2webMode = 1; client_relay3->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; @@ -402,17 +402,35 @@ test_channelpadding_killonehop(void *arg) (void*)"nf_pad_tor2web=0"); channelpadding_new_consensus_params(current_md_consensus); - // Test client side (it should stop immediately) + // Before the client tries to pad, the relay will still pad: + tried_to_write_cell = 0; + relay3_client->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; + get_options_mutable()->ORPort_set = 1; + get_options_mutable()->Tor2webMode = 0; + decision = channelpadding_decide_to_pad_channel(relay3_client); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); + tt_assert(relay3_client->pending_padding_callback); + + // Wait for the timer + event_base_loop(tor_libevent_get_base(), 0); + tt_int_op(tried_to_write_cell, OP_EQ, 1); + tt_assert(!client_relay3->pending_padding_callback); + + // Test client side (it should stop immediately, but send a negotiate) + tried_to_write_cell = 0; + tt_assert(relay3_client->padding_enabled); + tt_assert(client_relay3->padding_enabled); + get_options_mutable()->Tor2webMode = 1; + /* For the relay to recieve the negotiate: */ + get_options_mutable()->ORPort_set = 1; decision = channelpadding_decide_to_pad_channel(client_relay3); tt_int_op(decision, OP_EQ, CHANNELPADDING_WONTPAD); + tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); - - // Reset connnections.. XXX: remove this requirement via client - // negotiation - free_mock_network(); - setup_mock_network(); + tt_assert(!relay3_client->padding_enabled); // Test relay side (it should have gotten the negotiation to disable) + get_options_mutable()->ORPort_set = 1; get_options_mutable()->Tor2webMode = 0; tt_int_op(channelpadding_decide_to_pad_channel(relay3_client), OP_EQ, CHANNELPADDING_WONTPAD); @@ -423,11 +441,13 @@ test_channelpadding_killonehop(void *arg) smartlist_clear(current_md_consensus->net_params); channelpadding_new_consensus_params(current_md_consensus); - // Reset connections - free_mock_network(); - setup_mock_network(); + relay3_client->padding_enabled = 1; + client_relay3->padding_enabled = 1; + tried_to_write_cell = 0; + get_options_mutable()->ORPort_set = 0; get_options_mutable()->HiddenServiceSingleHopMode = 1; + get_options_mutable()->HiddenServiceNonAnonymousMode = 1; client_relay3->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; decision = channelpadding_decide_to_pad_channel(client_relay3); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); @@ -447,17 +467,34 @@ test_channelpadding_killonehop(void *arg) (void*)"nf_pad_single_onion=0"); channelpadding_new_consensus_params(current_md_consensus); + // Before the client tries to pad, the relay will still pad: + tried_to_write_cell = 0; + relay3_client->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; + get_options_mutable()->ORPort_set = 1; + get_options_mutable()->HiddenServiceSingleHopMode = 0; + get_options_mutable()->HiddenServiceNonAnonymousMode = 0; + decision = channelpadding_decide_to_pad_channel(relay3_client); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); + tt_assert(relay3_client->pending_padding_callback); + + // Wait for the timer + event_base_loop(tor_libevent_get_base(), 0); + tt_int_op(tried_to_write_cell, OP_EQ, 1); + tt_assert(!client_relay3->pending_padding_callback); + // Test client side (it should stop immediately) + get_options_mutable()->HiddenServiceSingleHopMode = 1; + get_options_mutable()->HiddenServiceNonAnonymousMode = 1; + /* For the relay to recieve the negotiate: */ + get_options_mutable()->ORPort_set = 1; decision = channelpadding_decide_to_pad_channel(client_relay3); tt_int_op(decision, OP_EQ, CHANNELPADDING_WONTPAD); tt_assert(!client_relay3->pending_padding_callback); - // Reset connnections.. XXX: remove this requirement... - free_mock_network(); - setup_mock_network(); - // Test relay side (it should have gotten the negotiation to disable) + get_options_mutable()->ORPort_set = 1; get_options_mutable()->HiddenServiceSingleHopMode = 0; + get_options_mutable()->HiddenServiceNonAnonymousMode = 0; tt_int_op(channelpadding_decide_to_pad_channel(relay3_client), OP_EQ, CHANNELPADDING_WONTPAD); tt_assert(!relay3_client->padding_enabled);

1 0

[tor/master] Changes file for #17857.
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 6689c95d061d440ca16369583dac066cc35a6807 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 23 18:44:00 2017 -0400 Changes file for #17857. --- changes/bug17857 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug17857 b/changes/bug17857 new file mode 100644 index 000000000..6c8863823 --- /dev/null +++ b/changes/bug17857 @@ -0,0 +1,6 @@ + o Minor features (defensive programming): + - Create a pair of consensus parameters nf_pad_tor2web and + nf_pad_single_onion that allow us to disable netflow padding in the + consensus for non-anonymous connections, in case the overhead is high. + Closes #17857. +

1 0

[tor/maint-0.3.1] Merge branch 'ticket17857_squashed' into maint-0.3.1
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit befddf6d2a46cd25beeb46357bf6cc4fe21802ce Merge: 469189d84 6689c95d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 10:29:00 2017 -0400 Merge branch 'ticket17857_squashed' into maint-0.3.1 changes/bug17857 | 6 ++ src/or/channel.c | 25 ++++- src/or/channelpadding.c | 34 +++++++ src/or/channelpadding.h | 5 + src/test/test_channelpadding.c | 201 +++++++++++++++++++++++++++++++++++++---- 5 files changed, 246 insertions(+), 25 deletions(-)

1 0

[tor/master] Ticket #17857: Padding off-switch for single hop connections
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 79e2e4d3cbabff41675aa1f7defb67f4acba398c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 23 16:53:39 2017 -0400 Ticket #17857: Padding off-switch for single hop connections This doesn't apply to currently active connections.. yet... --- src/or/channel.c | 7 +- src/or/channelpadding.c | 16 ++++ src/test/test_channelpadding.c | 164 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 166 insertions(+), 21 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index df6d7d342..8348ffd64 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -65,6 +65,7 @@ #include "routerlist.h" #include "scheduler.h" #include "compat_time.h" +#include "networkstatus.h" /* Global lists of channels */ @@ -2711,7 +2712,11 @@ channel_do_open_actions(channel_t *chan) /* Disable or reduce padding according to user prefs. */ if (chan->padding_enabled || get_options()->ConnectionPadding == 1) { - if (!get_options()->ConnectionPadding) { + if (!get_options()->ConnectionPadding || + (get_options()->Tor2webMode && + !networkstatus_get_param(NULL, "nf_pad_tor2web", 1, 0, 1)) + || (get_options()->HiddenServiceSingleHopMode && + !networkstatus_get_param(NULL, "nf_pad_single_onion", 1, 0, 1))) { channelpadding_disable_padding_on_channel(chan); } diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index f5248e896..9a2fdc4bb 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -46,6 +46,10 @@ static int consensus_nf_conntimeout_clients; static int consensus_nf_pad_before_usage; /** Should we pad relay-to-relay connections? */ static int consensus_nf_pad_relays; +/** Should we pad tor2web connections? */ +static int consensus_nf_pad_tor2web; +/** Should we pad rosos connections? */ +static int consensus_nf_pad_single_onion; #define TOR_MSEC_PER_SEC 1000 #define TOR_USEC_PER_MSEC 1000 @@ -130,6 +134,12 @@ channelpadding_new_consensus_params(networkstatus_t *ns) consensus_nf_pad_relays = networkstatus_get_param(ns, "nf_pad_relays", 0, 0, 1); + + consensus_nf_pad_tor2web = + networkstatus_get_param(ns, "nf_pad_tor2web", 1, 0, 1); + + consensus_nf_pad_single_onion = + networkstatus_get_param(ns, "nf_pad_single_onion", 1, 0, 1); } /** @@ -707,6 +717,12 @@ channelpadding_decide_to_pad_channel(channel_t *chan) return CHANNELPADDING_WONTPAD; } + if (options->Tor2webMode && !consensus_nf_pad_tor2web) + return CHANNELPADDING_WONTPAD; + + if (options->HiddenServiceSingleHopMode && !consensus_nf_pad_single_onion) + return CHANNELPADDING_WONTPAD; + if (!chan->has_queued_writes(chan)) { int is_client_channel = 0; diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 0a70184f8..99f8880a4 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -26,6 +26,7 @@ void test_channelpadding_timers(void *arg); void test_channelpadding_consensus(void *arg); void test_channelpadding_negotiation(void *arg); void test_channelpadding_decide_to_pad_channel(void *arg); +void test_channelpadding_killonehop(void *arg); void dummy_nop_timer(void); @@ -111,8 +112,6 @@ setup_fake_connection_for_channel(channel_tls_t *chan) conn->base_.conn_array_index = smartlist_len(connection_array); smartlist_add(connection_array, conn); - connection_or_set_canonical(conn, 1); - conn->chan = chan; chan->conn = conn; @@ -127,6 +126,8 @@ setup_fake_connection_for_channel(channel_tls_t *chan) conn->tls = (tor_tls_t *)((void *)(&fake_tortls)); conn->link_proto = MIN_LINK_PROTO_FOR_CHANNEL_PADDING; + + connection_or_set_canonical(conn, 1); } static channel_tls_t * @@ -166,16 +167,30 @@ free_fake_channeltls(channel_tls_t *chan) } static void -setup_mock_network(void) +setup_mock_consensus(void) { - routerstatus_t *relay; - connection_array = smartlist_new(); - current_md_consensus = current_ns_consensus = tor_malloc_zero(sizeof(networkstatus_t)); current_md_consensus->net_params = smartlist_new(); current_md_consensus->routerstatus_list = smartlist_new(); channelpadding_new_consensus_params(current_md_consensus); +} + +static void +free_mock_consensus(void) +{ + SMARTLIST_FOREACH(current_md_consensus->routerstatus_list, void *, r, + tor_free(r)); + smartlist_free(current_md_consensus->routerstatus_list); + smartlist_free(current_ns_consensus->net_params); + tor_free(current_ns_consensus); +} + +static void +setup_mock_network(void) +{ + routerstatus_t *relay; + connection_array = smartlist_new(); relay1_relay2 = (channel_t*)new_fake_channeltls(2); relay1_relay2->write_cell = mock_channel_write_cell_relay1; @@ -202,6 +217,11 @@ setup_mock_network(void) client_relay3 = (channel_t*)new_fake_channeltls(3); client_relay3->write_cell = mock_channel_write_cell_client; channel_timestamp_active(client_relay3); + + channel_do_open_actions(relay1_relay2); + channel_do_open_actions(relay2_relay1); + channel_do_open_actions(relay3_client); + channel_do_open_actions(client_relay3); } static void @@ -212,12 +232,7 @@ free_mock_network(void) free_fake_channeltls((channel_tls_t*)relay3_client); free_fake_channeltls((channel_tls_t*)client_relay3); - SMARTLIST_FOREACH(current_md_consensus->routerstatus_list, void *, r, - tor_free(r)); - smartlist_free(current_md_consensus->routerstatus_list); - smartlist_free(current_ns_consensus->net_params); smartlist_free(connection_array); - tor_free(current_ns_consensus); } static void @@ -345,6 +360,118 @@ test_channelpadding_timers(void *arg) } void +test_channelpadding_killonehop(void *arg) +{ + channelpadding_decision_t decision; + (void)arg; + tor_libevent_postfork(); + + routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); + monotime_init(); + timers_initialize(); + + setup_mock_consensus(); + + /* Do we disable padding if tor2webmode or rsos are enabled, and + * the consensus says don't pad? */ + + /* Ensure we can kill tor2web and rsos padding if we want. */ + // First, test that padding works if either is enabled + smartlist_clear(current_md_consensus->net_params); + channelpadding_new_consensus_params(current_md_consensus); + + setup_mock_network(); + tried_to_write_cell = 0; + get_options_mutable()->Tor2webMode = 1; + client_relay3->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); + tt_assert(client_relay3->pending_padding_callback); + tt_int_op(tried_to_write_cell, OP_EQ, 0); + + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); + + // Wait for the timer + event_base_loop(tor_libevent_get_base(), 0); + tt_int_op(tried_to_write_cell, OP_EQ, 1); + tt_assert(!client_relay3->pending_padding_callback); + + // Then test disabling each via consensus param + smartlist_add(current_md_consensus->net_params, + (void*)"nf_pad_tor2web=0"); + channelpadding_new_consensus_params(current_md_consensus); + + // Test client side (it should stop immediately) + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_WONTPAD); + tt_assert(!client_relay3->pending_padding_callback); + + // Reset connnections.. XXX: remove this requirement via client + // negotiation + free_mock_network(); + setup_mock_network(); + + // Test relay side (it should have gotten the negotiation to disable) + get_options_mutable()->Tor2webMode = 0; + tt_int_op(channelpadding_decide_to_pad_channel(relay3_client), OP_EQ, + CHANNELPADDING_WONTPAD); + tt_assert(!relay3_client->padding_enabled); + + /* Repeat for SOS */ + // First, test that padding works if either is enabled + smartlist_clear(current_md_consensus->net_params); + channelpadding_new_consensus_params(current_md_consensus); + + // Reset connections + free_mock_network(); + setup_mock_network(); + tried_to_write_cell = 0; + get_options_mutable()->HiddenServiceSingleHopMode = 1; + client_relay3->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); + tt_assert(client_relay3->pending_padding_callback); + tt_int_op(tried_to_write_cell, OP_EQ, 0); + + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); + + // Wait for the timer + event_base_loop(tor_libevent_get_base(), 0); + tt_int_op(tried_to_write_cell, OP_EQ, 1); + tt_assert(!client_relay3->pending_padding_callback); + + // Then test disabling each via consensus param + smartlist_add(current_md_consensus->net_params, + (void*)"nf_pad_single_onion=0"); + channelpadding_new_consensus_params(current_md_consensus); + + // Test client side (it should stop immediately) + decision = channelpadding_decide_to_pad_channel(client_relay3); + tt_int_op(decision, OP_EQ, CHANNELPADDING_WONTPAD); + tt_assert(!client_relay3->pending_padding_callback); + + // Reset connnections.. XXX: remove this requirement... + free_mock_network(); + setup_mock_network(); + + // Test relay side (it should have gotten the negotiation to disable) + get_options_mutable()->HiddenServiceSingleHopMode = 0; + tt_int_op(channelpadding_decide_to_pad_channel(relay3_client), OP_EQ, + CHANNELPADDING_WONTPAD); + tt_assert(!relay3_client->padding_enabled); + + done: + free_mock_consensus(); + free_mock_network(); + tor_free(relay); + + timers_shutdown(); + channel_free_all(); +} + +void test_channelpadding_consensus(void *arg) { channelpadding_decision_t decision; @@ -379,11 +506,7 @@ test_channelpadding_consensus(void *arg) chan = (channel_t*)new_fake_channeltls(0); channel_timestamp_active(chan); - current_md_consensus = current_ns_consensus - = tor_malloc_zero(sizeof(networkstatus_t)); - current_md_consensus->net_params = smartlist_new(); - current_md_consensus->routerstatus_list = smartlist_new(); - channelpadding_new_consensus_params(current_md_consensus); + setup_mock_consensus(); get_options_mutable()->ORPort_set = 1; @@ -441,6 +564,7 @@ test_channelpadding_consensus(void *arg) channelpadding_new_consensus_params(current_md_consensus); tried_to_write_cell = 0; + chan->next_padding_time_ms = monotime_coarse_absolute_msec() + 100; decision = channelpadding_decide_to_pad_channel(chan); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); tt_assert(chan->pending_padding_callback); @@ -547,12 +671,9 @@ test_channelpadding_consensus(void *arg) tt_i64_op(val, OP_LE, 24*60*60*2); done: + free_mock_consensus(); free_fake_channeltls((channel_tls_t*)chan); smartlist_free(connection_array); - smartlist_free(current_md_consensus->routerstatus_list); - smartlist_free(current_ns_consensus->net_params); - tor_free(relay); - tor_free(current_ns_consensus); timers_shutdown(); channel_free_all(); @@ -579,6 +700,7 @@ test_channelpadding_negotiation(void *arg) */ monotime_init(); timers_initialize(); + setup_mock_consensus(); setup_mock_network(); /* Test case #1: Do the right things ignore negotiation? */ @@ -680,6 +802,7 @@ test_channelpadding_negotiation(void *arg) done: free_mock_network(); + free_mock_consensus(); timers_shutdown(); channel_free_all(); @@ -894,6 +1017,7 @@ struct testcase_t channelpadding_tests[] = { TEST_CHANNELPADDING(channelpadding_decide_to_pad_channel, TT_FORK), TEST_CHANNELPADDING(channelpadding_negotiation, TT_FORK), TEST_CHANNELPADDING(channelpadding_consensus, TT_FORK), + TEST_CHANNELPADDING(channelpadding_killonehop, TT_FORK), TEST_CHANNELPADDING(channelpadding_timers, TT_FORK), END_OF_TESTCASES };

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 5aef2aaff1ef59a1fa93cb4c85f881982230d675 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 14:19:35 2017 +0000 Update translations for tor-browser-manual --- uz/uz.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uz/uz.po b/uz/uz.po index 9cd6a66fa..72cb3748b 100644 --- a/uz/uz.po +++ b/uz/uz.po @@ -1,11 +1,12 @@ # Translators: # Umidjon Almasov <u.almasov(a)gmail.com>, 2016 +# Adham Kurbanov <x(a)ttaby.ch>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Umidjon Almasov <u.almasov(a)gmail.com>, 2016\n" +"Last-Translator: Adham Kurbanov <x(a)ttaby.ch>, 2017\n" "Language-Team: Uzbek (https://www.transifex.com/otf/teams/1519/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -789,7 +790,7 @@ msgstr "" #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" -msgstr "" +msgstr "Muammolarni bartaraf etish" #: onionsites.page:59 msgid ""

1 0

[torspec/master] Add proposal 282
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit cb2960f6ba05c0543fb3ea42abe0db6833205c8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 10:13:43 2017 -0400 Add proposal 282 --- proposals/000-index.txt | 6 ++++-- proposals/282-remove-named-from-consensus.txt | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 18ff949..e184aab 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -200,8 +200,9 @@ Proposals by number: 277 Detect multiple relay instances running with same ID [OPEN] 278 Directory Compression Scheme Negotiation [FINISHED] 279 A Name System API for Tor Onion Services [DRAFT] -280 Privacy-Preseving Statistics with Privcount in Tor [DRAFT] +280 Privacy-Preserving Statistics with Privcount in Tor [DRAFT] 281 Downloading microdescriptors in bulk [DRAFT] +282 Remove "Named" and "Unnamed" handling from consensus voting [OPEN] Proposals by status: @@ -225,7 +226,7 @@ Proposals by status: 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope 273 Exit relay pinning for web services [for n/a] 279 A Name System API for Tor Onion Services - 280 Privacy-Preseving Statistics with Privcount in Tor + 280 Privacy-Preserving Statistics with Privcount in Tor 281 Downloading microdescriptors in bulk NEEDS-REVISION: 190 Bridge Client Authorization Based on a Shared Secret @@ -257,6 +258,7 @@ Proposals by status: 275 Stop including meaningful "published" time in microdescriptor consensus [for 0.3.1.x-alpha] 276 Report bandwidth with lower granularity in consensus documents [for 0.3.1.x-alpha] 277 Detect multiple relay instances running with same ID [for 0.3.??] + 282 Remove "Named" and "Unnamed" handling from consensus voting [for 0.3.3.x] ACCEPTED: 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion diff --git a/proposals/282-remove-named-from-consensus.txt b/proposals/282-remove-named-from-consensus.txt new file mode 100644 index 0000000..8903caa --- /dev/null +++ b/proposals/282-remove-named-from-consensus.txt @@ -0,0 +1,24 @@ +Filename: 282-remove-named-from-consensus.txt +Title: Remove "Named" and "Unnamed" handling from consensus voting +Author: Nick Mathewson +Created: 12-Sep-2017 +Status: Open +Target: 0.3.3.x + +1. Summary + + Authorities no longer vote for the "Named" and "Unnamed" flags, and we + have begun to remove the client code that supports them. (See proposal + 235). The next logical step is to remove the special handling from these + flags from the consensus voting algorithm. We specify this here. + +2. Proposal + + We add a new consensus method, here represented as M, to be allocated + when this proposal's implementation is merged. + + We specify that the Named and Unnamed flags are only handled + specially when the negotiated consensus method is earlier than M. If + the negotiated method is M or later, then the Named and Unnamed + flags are handled as if any they were any other consensus flags. +

1 0

[tor/master] Remove networkstatus_nickname_is_unnamed()
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 42b5e3cbb76eb4a7e0dcca8945217351c3ef1bb4 Author: Neel Chauhan <neel(a)neelc.org> Date: Sat Sep 9 17:12:37 2017 -0400 Remove networkstatus_nickname_is_unnamed() --- src/or/networkstatus.c | 10 ---------- src/or/networkstatus.h | 1 - src/or/nodelist.c | 8 -------- 3 files changed, 19 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 76e8fe792..014f0f114 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -804,16 +804,6 @@ networkstatus_get_router_digest_by_nickname(const char *nickname) return strmap_get_lc(named_server_map, nickname); } -/** Return true iff nickname is disallowed from being the nickname - * of any server. */ -int -networkstatus_nickname_is_unnamed(const char *nickname) -{ - if (!unnamed_server_map) - return 0; - return strmap_get_lc(unnamed_server_map, nickname) != NULL; -} - /** How frequently do directory authorities re-download fresh networkstatus * documents? */ #define AUTHORITY_NS_CACHE_INTERVAL (10*60) diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 145be37d1..34643667a 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -63,7 +63,6 @@ MOCK_DECL(routerstatus_t *, router_get_mutable_consensus_status_by_descriptor_digest, (networkstatus_t *consensus, const char *digest)); const char *networkstatus_get_router_digest_by_nickname(const char *nickname); -int networkstatus_nickname_is_unnamed(const char *nickname); int we_want_to_fetch_flavor(const or_options_t *options, int flavor); int we_want_to_fetch_unknown_auth_certs(const or_options_t *options); void networkstatus_consensus_download_failed(int status_code, diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 00b8fb144..394c3ae73 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -859,14 +859,6 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) return node_get_by_id(named_id); } - /* Is it marked as owned-by-someone-else? */ - if (networkstatus_nickname_is_unnamed(nickname)) { - log_info(LD_GENERAL, "The name %s is listed as Unnamed: there is some " - "router that holds it, but not one listed in the current " - "consensus.", escaped(nickname)); - return NULL; - } - /* Okay, so the name is not canonical for anybody. */ { smartlist_t *matches = smartlist_new();

1 0

[tor/master] Remove named_map and unnamed_map from networkstatus.c
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 035fe2d208633c600ee7164f2eba2e1c4b24c5db Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:56:42 2017 -0400 Remove named_map and unnamed_map from networkstatus.c --- src/or/networkstatus.c | 53 -------------------------------------------------- src/or/networkstatus.h | 1 - src/or/nodelist.c | 9 --------- src/or/router.c | 11 +++-------- src/or/routerlist.c | 12 ------------ src/or/routerlist.h | 1 - 6 files changed, 3 insertions(+), 84 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 014f0f114..8b07a8885 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -66,12 +66,6 @@ #include "torcert.h" #include "channelpadding.h" -/** Map from lowercase nickname to identity digest of named server, if any. */ -static strmap_t *named_server_map = NULL; -/** Map from lowercase nickname to (void*)1 for all names that are listed - * as unnamed for some server in the consensus. */ -static strmap_t *unnamed_server_map = NULL; - /** Most recently received and validated v3 "ns"-flavored consensus network * status. */ STATIC networkstatus_t *current_ns_consensus = NULL; @@ -142,7 +136,6 @@ static int have_warned_about_old_version = 0; * listed by the authorities. */ static int have_warned_about_new_version = 0; -static void routerstatus_list_update_named_server_map(void); static void update_consensus_bootstrap_multiple_downloads( time_t now, const or_options_t *options); @@ -250,13 +243,6 @@ router_reload_consensus_networkstatus(void) } } - if (!networkstatus_get_latest_consensus()) { - if (!named_server_map) - named_server_map = strmap_new(); - if (!unnamed_server_map) - unnamed_server_map = strmap_new(); - } - update_certificate_downloads(time(NULL)); routers_update_all_from_networkstatus(time(NULL), 3); @@ -794,16 +780,6 @@ router_get_consensus_status_by_id(const char *digest) return router_get_mutable_consensus_status_by_id(digest); } -/** Return the identity digest that's mapped to officially by - * nickname. */ -const char * -networkstatus_get_router_digest_by_nickname(const char *nickname) -{ - if (!named_server_map) - return NULL; - return strmap_get_lc(named_server_map, nickname); -} - /** How frequently do directory authorities re-download fresh networkstatus * documents? */ #define AUTHORITY_NS_CACHE_INTERVAL (10*60) @@ -1960,7 +1936,6 @@ networkstatus_set_current_consensus(const char *consensus, update_consensus_networkstatus_fetch_time(now); dirvote_recalculate_timing(options, now); - routerstatus_list_update_named_server_map(); /* Update ewma and adjust policy if needed; first cache the old value */ old_ewma_enabled = cell_ewma_enabled(); @@ -2129,31 +2104,6 @@ routers_update_all_from_networkstatus(time_t now, int dir_version) } } -/** Update our view of the list of named servers from the most recently - * retrieved networkstatus consensus. */ -static void -routerstatus_list_update_named_server_map(void) -{ - networkstatus_t *ns = networkstatus_get_latest_consensus(); - if (!ns) - return; - - strmap_free(named_server_map, tor_free_); - named_server_map = strmap_new(); - strmap_free(unnamed_server_map, NULL); - unnamed_server_map = strmap_new(); - smartlist_t *rslist = ns->routerstatus_list; - SMARTLIST_FOREACH_BEGIN(rslist, const routerstatus_t *, rs) { - if (rs->is_named) { - strmap_set_lc(named_server_map, rs->nickname, - tor_memdup(rs->identity_digest, DIGEST_LEN)); - } - if (rs->is_unnamed) { - strmap_set_lc(unnamed_server_map, rs->nickname, (void*)1); - } - } SMARTLIST_FOREACH_END(rs); -} - /** Given a list routers of routerinfo_t *, update each status field * according to our current consensus networkstatus. May re-order * routers. */ @@ -2639,8 +2589,5 @@ networkstatus_free_all(void) } tor_free(waiting->body); } - - strmap_free(named_server_map, tor_free_); - strmap_free(unnamed_server_map, NULL); } diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 34643667a..adaa10890 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -62,7 +62,6 @@ const routerstatus_t *router_get_consensus_status_by_descriptor_digest( MOCK_DECL(routerstatus_t *, router_get_mutable_consensus_status_by_descriptor_digest, (networkstatus_t *consensus, const char *digest)); -const char *networkstatus_get_router_digest_by_nickname(const char *nickname); int we_want_to_fetch_flavor(const or_options_t *options, int flavor); int we_want_to_fetch_unknown_auth_certs(const or_options_t *options); void networkstatus_consensus_download_failed(int status_code, diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 394c3ae73..01a0e9e85 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -850,15 +850,6 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) if (!strcasecmp(nickname, UNNAMED_ROUTER_NICKNAME)) return NULL; - /* Okay, so if we get here, the nickname is just a nickname. Is there - * a binding for it in the consensus? */ - { - const char *named_id = - networkstatus_get_router_digest_by_nickname(nickname); - if (named_id) - return node_get_by_id(named_id); - } - /* Okay, so the name is not canonical for anybody. */ { smartlist_t *matches = smartlist_new(); diff --git a/src/or/router.c b/src/or/router.c index 665e95d3a..2bc7a875f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -3497,7 +3497,7 @@ router_get_description(char *buf, const routerinfo_t *ri) return "<null>"; return format_node_description(buf, ri->cache_info.identity_digest, - router_is_named(ri), + 0, ri->nickname, NULL, ri->addr); @@ -3623,21 +3623,16 @@ extend_info_describe(const extend_info_t *ei) * verbose representation of the identity of router. The format is: * A dollar sign. * The upper-case hexadecimal encoding of the SHA1 hash of router's identity. - * A "=" if the router is named; a "~" if it is not. + * A "=" if the router is named (no longer implemented); a "~" if it is not. * The router's nickname. **/ void router_get_verbose_nickname(char *buf, const routerinfo_t *router) { - const char *good_digest = networkstatus_get_router_digest_by_nickname( - router->nickname); - int is_named = good_digest && tor_memeq(good_digest, - router->cache_info.identity_digest, - DIGEST_LEN); buf[0] = '$'; base16_encode(buf+1, HEX_DIGEST_LEN+1, router->cache_info.identity_digest, DIGEST_LEN); - buf[1+HEX_DIGEST_LEN] = is_named ? '=' : '~'; + buf[1+HEX_DIGEST_LEN] = '~'; strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1); } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index cc4c19624..9111d93c3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2957,18 +2957,6 @@ hex_digest_nickname_matches(const char *hexdigest, const char *identity_digest, return tor_memeq(digest, identity_digest, DIGEST_LEN); } -/** Return true iff router is listed as named in the current - * consensus. */ -int -router_is_named(const routerinfo_t *router) -{ - const char *digest = - networkstatus_get_router_digest_by_nickname(router->nickname); - - return (digest && - tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN)); -} - /** Return true iff digest is the digest of the identity key of a * trusted directory matching at least one bit of type. If type * is zero (NO_DIRINFO), or ALL_DIRINFO, any authority is okay. */ diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 931373f5c..27c8d88f0 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -80,7 +80,6 @@ const node_t *router_choose_random_node(smartlist_t *excludedsmartlist, struct routerset_t *excludedset, router_crn_flags_t flags); -int router_is_named(const routerinfo_t *router); int router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type); #define router_digest_is_trusted_dir(d) \

1 0

[tor/master] changes file for 22215
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 5238210da4a830ae3c5837dc903f1f115788949c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:58:07 2017 -0400 changes file for 22215 --- changes/ticket22215 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket22215 b/changes/ticket22215 new file mode 100644 index 000000000..4abeaf2c5 --- /dev/null +++ b/changes/ticket22215 @@ -0,0 +1,5 @@ + o Code simplification and refactoring: + - Remove some of the code that once supported "Named" and "Unnamed" + routers. Authorities no longer vote for these flags. Closes ticket + 23478. +

1 0

[torspec/master] Update "protocols" description to say it is obsolete
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 3ab467de6e107c44cc044374d5a2aaf3641f3f0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:48:02 2017 -0400 Update "protocols" description to say it is obsolete Closes ticket 23445. --- dir-spec.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 20416a6..212a2e8 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -692,13 +692,10 @@ [At most once.] - Both lists are space-separated sequences of numbers, to indicate which - protocols the server supports. As of 30 Mar 2008, specified - protocols are "Link 1 2 Circuit 1". See section 4.1 of tor-spec.txt - for more information about link protocol versions. - - [NOTE: No version of Tor uses this protocol list. It will be removed - in a future version of Tor.] + An obsolete list of protocol versions, superseded by the "proto" + entry. This list was never parsed, and has not been emitted + since Tor 0.2.9.4-alpha. New code should neither generate nor + parse this line. "allow-single-hop-exits" NL

1 0