February 2015 - tor-commits - lists.torproject.org

[tor/master] Additional paranoia: do not even build tor2web stuff if not using.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 0899f51bc6abf535c6c55b81b98b959235b0f7c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 14:54:16 2015 -0500 Additional paranoia: do not even build tor2web stuff if not using. (That is, don't build it unless we're building for tor2web, or we are building for tests.) --- src/or/circuitbuild.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 38be827..7662ef2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1735,6 +1735,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) return NULL; } +#if defined(ENABLE_TOR2WEB_MODE) || defined(TOR_UNIT_TESTS) /* The config option Tor2webRendezvousPoints has been set and we need * to pick an RP out of that set. Make sure that the RP we choose is * alive, and return it. Return NULL if no usable RP could be found in @@ -1786,6 +1787,7 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags, return rp_node; } +#endif /* Pick a Rendezvous Point for our HS circuits according to flags. */ static const node_t * @@ -1796,6 +1798,7 @@ pick_rendezvous_node(router_crn_flags_t flags) if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS) flags |= CRN_ALLOW_INVALID; +#ifdef ENABLE_TOR2WEB_MODE /* The user wants us to pick specific RPs. */ if (options->Tor2webRendezvousPoints) { const node_t *tor2web_rp = pick_tor2web_rendezvous_node(flags, options); @@ -1804,6 +1807,7 @@ pick_rendezvous_node(router_crn_flags_t flags) } /* Else, if no tor2web RP was found, fall back to choosing a random node */ } +#endif return router_choose_random_node(NULL, options->ExcludeNodes, flags); }

1 0

[tor/master] Write some unittests for Tor2webRendezvousPoints.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit bc80b0a50c1fe9c3d127d54507cb87e4d80c1890 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:51:49 2014 +0300 Write some unittests for Tor2webRendezvousPoints. --- src/test/test_hs.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 99ef7dd..1513793 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -7,9 +7,15 @@ **/ #define CONTROL_PRIVATE +#define CIRCUITBUILD_PRIVATE + #include "or.h" #include "test.h" #include "control.h" +#include "testhelper.h" +#include "config.h" +#include "routerset.h" +#include "circuitbuild.h" /* mock ID digest and longname for node that's in nodelist */ #define HSDIR_EXIST_ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" \ @@ -121,9 +127,83 @@ test_hs_desc_event(void *arg) tor_free(received_msg); } +/* Make sure we always pick the right RP, given a well formatted + * Tor2webRendezvousPoints value. */ +static void +test_pick_tor2web_rendezvous_node(void *arg) +{ + or_options_t *options = get_options_mutable(); + const node_t *chosen_rp = NULL; + router_crn_flags_t flags = CRN_NEED_DESC; + int retval, i; + const char *tor2web_rendezvous_str = "test003r"; + + (void) arg; + + /* Setup fake routerlist. */ + helper_setup_fake_routerlist(); + + /* Parse Tor2webRendezvousPoints as a routerset. */ + options->Tor2webRendezvousPoints = routerset_new(); + retval = routerset_parse(options->Tor2webRendezvousPoints, + tor2web_rendezvous_str, + "test_tor2web_rp"); + tt_int_op(retval, >=, 0); + + /* Pick rendezvous point. Make sure the correct one is + picked. Repeat many times to make sure it works properly. */ + for (i = 0; i < 50 ; i++) { + chosen_rp = pick_tor2web_rendezvous_node(flags, options); + tt_assert(chosen_rp); + tt_str_op(chosen_rp->ri->nickname, ==, tor2web_rendezvous_str); + } + + done: + routerset_free(options->Tor2webRendezvousPoints); +} + +/* Make sure we never pick an RP if Tor2webRendezvousPoints doesn't + * correspond to an actual node. */ +static void +test_pick_bad_tor2web_rendezvous_node(void *arg) +{ + or_options_t *options = get_options_mutable(); + const node_t *chosen_rp = NULL; + router_crn_flags_t flags = CRN_NEED_DESC; + int retval, i; + const char *tor2web_rendezvous_str = "dummy"; + + (void) arg; + + /* Setup fake routerlist. */ + helper_setup_fake_routerlist(); + + /* Parse Tor2webRendezvousPoints as a routerset. */ + options->Tor2webRendezvousPoints = routerset_new(); + retval = routerset_parse(options->Tor2webRendezvousPoints, + tor2web_rendezvous_str, + "test_tor2web_rp"); + tt_int_op(retval, >=, 0); + + /* Pick rendezvous point. Since Tor2webRendezvousPoints was set to a + dummy value, we shouldn't find any eligible RPs. */ + for (i = 0; i < 50 ; i++) { + chosen_rp = pick_tor2web_rendezvous_node(flags, options); + tt_assert(!chosen_rp); + } + + done: + routerset_free(options->Tor2webRendezvousPoints); +} + struct testcase_t hs_tests[] = { { "hs_desc_event", test_hs_desc_event, TT_FORK, NULL, NULL }, + { "pick_tor2web_rendezvous_node", test_pick_tor2web_rendezvous_node, TT_FORK, + NULL, NULL }, + { "pick_bad_tor2web_rendezvous_node", + test_pick_bad_tor2web_rendezvous_node, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'bug12844'
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc Merge: 0c81dfa 0899f51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 15:06:04 2015 -0500 Merge branch 'bug12844' Conflicts: src/or/circuituse.c src/test/include.am src/test/test_entrynodes.c changes/feature12844 | 5 +++ doc/tor.1.txt | 16 ++++++++ src/or/circuitbuild.c | 87 ++++++++++++++++++++++++++++++++++++++++++-- src/or/circuitbuild.h | 3 ++ src/or/circuituse.c | 12 +++++- src/or/config.c | 13 ++++++- src/or/or.h | 3 ++ src/or/routerlist.c | 2 +- src/or/routerlist.h | 4 ++ src/test/include.am | 5 ++- src/test/test_entrynodes.c | 68 +++------------------------------- src/test/test_hs.c | 80 ++++++++++++++++++++++++++++++++++++++++ src/test/testhelper.c | 67 ++++++++++++++++++++++++++++++++++ src/test/testhelper.h | 10 +++++ 14 files changed, 305 insertions(+), 70 deletions(-) diff --cc src/or/circuituse.c index 612b536,6304a4d..c463b0a --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1676,14 -1646,11 +1676,15 @@@ circuit_launch_by_extend_info(uint8_t p { origin_circuit_t *circ; int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0; + int have_path = have_enough_path_info(! (flags & CIRCLAUNCH_IS_INTERNAL) ); + int need_specific_rp = 0; - if (!onehop_tunnel && !router_have_minimum_dir_info()) { - log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling " - "circuit launch."); + if (!onehop_tunnel && (!router_have_minimum_dir_info() || !have_path)) { + log_debug(LD_CIRC,"Haven't %s yet; canceling " + "circuit launch.", + !router_have_minimum_dir_info() ? + "fetched enough directory info" : + "received a consensus with exits"); return NULL; } diff --cc src/or/config.c index de0baa4,999b134..ad4fd45 --- a/src/or/config.c +++ b/src/or/config.c @@@ -78,8 -63,10 +78,9 @@@ static config_abbrev_t option_abbrevs_[ PLURAL(AuthDirBadExitCC), PLURAL(AuthDirInvalidCC), PLURAL(AuthDirRejectCC), - PLURAL(ExitNode), PLURAL(EntryNode), PLURAL(ExcludeNode), + PLURAL(Tor2webRendezvousPoint), PLURAL(FirewallPort), PLURAL(LongLivedPort), PLURAL(HiddenServiceNode), @@@ -400,10 -401,14 +401,11 @@@ static config_var_t option_vars_[] = OBSOLETE("StrictEntryNodes"), OBSOLETE("StrictExitNodes"), V(StrictNodes, BOOL, "0"), - V(Support022HiddenServices, AUTOBOOL, "auto"), - OBSOLETE("SysLog"), + OBSOLETE("Support022HiddenServices"), V(TestSocks, BOOL, "0"), - OBSOLETE("TestVia"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), + V(Tor2webRendezvousPoints, ROUTERSET, NULL), V(TLSECGroup, STRING, NULL), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), diff --cc src/test/include.am index 595be0b,28f3a83..71041b1 --- a/src/test/include.am +++ b/src/test/include.am @@@ -54,24 -39,17 +54,25 @@@ src_test_test_SOURCES = src/test/test_relaycell.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_routerlist.c \ + src/test/test_routerset.c \ + src/test/test_scheduler.c \ src/test/test_socks.c \ - src/test/test_util.c \ - src/test/test_config.c \ - src/test/test_hs.c \ - src/test/test_nodelist.c \ - src/test/test_policy.c \ src/test/test_status.c \ - src/test/test_routerset.c \ + src/test/test_threads.c \ + src/test/test_util.c \ + src/test/testing_common.c \ + src/test/testhelper.c \ src/ext/tinytest.c +src_test_test_slow_SOURCES = \ + src/test/test_slow.c \ + src/test/test_crypto_slow.c \ + src/test/test_util_slow.c \ + src/test/testing_common.c \ + src/ext/tinytest.c + + src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) @@@ -117,13 -74,11 +118,15 @@@ src_test_test_workqueue_LDADD = src/or/ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ noinst_HEADERS+= \ + src/test/fakechans.h \ src/test/test.h \ + src/test/testhelper.h \ + src/test/test_descriptors.inc \ + src/test/example_extrainfo.inc \ + src/test/failing_routerdescs.inc \ - src/test/ed25519_vectors.inc ++ src/test/ed25519_vectors.inc \ + src/test/test_descriptors.inc -if CURVE25519_ENABLED noinst_PROGRAMS+= src/test/test-ntor-cl src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ diff --cc src/test/test_entrynodes.c index 19071a1,1298159..5f2051c --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@@ -197,7 -141,7 +141,7 @@@ populate_live_entry_guards_test_helper( /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(our_nodelist), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@@ -206,10 -150,10 +150,10 @@@ } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(all_entry_guards), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); /* Ensure that all the possible entry guards are enough to satisfy us. */ - tt_int_op(smartlist_len(all_entry_guards), >=, num_needed); + tt_int_op(smartlist_len(all_entry_guards), OP_GE, num_needed); /* Walk the entry guard list for some sanity checking */ SMARTLIST_FOREACH_BEGIN(all_entry_guards, const entry_guard_t *, entry) { @@@ -647,7 -590,7 +591,7 @@@ test_entry_is_live(void *arg /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(our_nodelist), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@@ -659,7 -602,7 +603,7 @@@ } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(all_entry_guards), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); /* Now get a random test entry that we will use for this unit test. */ which_node = 3; /* (chosen by fair dice roll) */

1 0

[tor/master] Scrub from logs the name of the RP we picked.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit d9968dd0ab146b0d8db348c267c45241fa73bd67 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 22 19:14:50 2014 +0100 Scrub from logs the name of the RP we picked. --- src/or/circuitbuild.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5de6f3c..38be827 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1841,7 +1841,8 @@ choose_good_exit_server(uint8_t purpose, { /* Pick a new RP */ const node_t *rendezvous_node = pick_rendezvous_node(flags); - log_info(LD_REND, "Picked new RP: %s", node_describe(rendezvous_node)); + log_info(LD_REND, "Picked new RP: %s", + safe_str_client(node_describe(rendezvous_node))); return rendezvous_node; } }

1 0

[tor/master] Implement Tor2webRendezvousPoints functionality.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 24a7726955f415564412582602271de9de3164de Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:28:11 2014 +0300 Implement Tor2webRendezvousPoints functionality. --- src/or/circuitbuild.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++-- src/or/circuitbuild.h | 3 ++ src/or/routerlist.c | 2 +- src/or/routerlist.h | 4 +++ 4 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index edf7d28..5de6f3c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1735,6 +1735,79 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) return NULL; } +/* The config option Tor2webRendezvousPoints has been set and we need + * to pick an RP out of that set. Make sure that the RP we choose is + * alive, and return it. Return NULL if no usable RP could be found in + * Tor2webRendezvousPoints. */ +STATIC const node_t * +pick_tor2web_rendezvous_node(router_crn_flags_t flags, + const or_options_t *options) +{ + const node_t *rp_node = NULL; + const int allow_invalid = (flags & CRN_ALLOW_INVALID) != 0; + const int need_desc = (flags & CRN_NEED_DESC) != 0; + + smartlist_t *whitelisted_live_rps = smartlist_new(); + smartlist_t *all_live_nodes = smartlist_new(); + + tor_assert(options->Tor2webRendezvousPoints); + + /* Add all running nodes to all_live_nodes */ + router_add_running_nodes_to_smartlist(all_live_nodes, + allow_invalid, + 0, 0, 0, + need_desc); + + /* Filter all_live_nodes to only add live *and* whitelisted RPs to + * the list whitelisted_live_rps. */ + SMARTLIST_FOREACH_BEGIN(all_live_nodes, node_t *, live_node) { + if (routerset_contains_node(options->Tor2webRendezvousPoints, live_node)) { + smartlist_add(whitelisted_live_rps, live_node); + } + } SMARTLIST_FOREACH_END(live_node); + + /* Honor ExcludeNodes */ + if (options->ExcludeNodes) { + routerset_subtract_nodes(whitelisted_live_rps, options->ExcludeNodes); + } + + /* Now pick randomly amongst the whitelisted RPs. No need to waste time + doing bandwidth load balancing, for most use cases + 'whitelisted_live_rps' contains a single OR anyway. */ + rp_node = smartlist_choose(whitelisted_live_rps); + + if (!rp_node) { + log_warn(LD_REND, "Could not find a Rendezvous Point that suits " + "the purposes of Tor2webRendezvousPoints. Choosing random one."); + } + + smartlist_free(whitelisted_live_rps); + smartlist_free(all_live_nodes); + + return rp_node; +} + +/* Pick a Rendezvous Point for our HS circuits according to flags. */ +static const node_t * +pick_rendezvous_node(router_crn_flags_t flags) +{ + const or_options_t *options = get_options(); + + if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS) + flags |= CRN_ALLOW_INVALID; + + /* The user wants us to pick specific RPs. */ + if (options->Tor2webRendezvousPoints) { + const node_t *tor2web_rp = pick_tor2web_rendezvous_node(flags, options); + if (tor2web_rp) { + return tor2web_rp; + } + /* Else, if no tor2web RP was found, fall back to choosing a random node */ + } + + return router_choose_random_node(NULL, options->ExcludeNodes, flags); +} + /** Return a pointer to a suitable router to be the exit node for the * circuit of purpose purpose that we're about to build (or NULL * if no router is suitable). @@ -1765,9 +1838,12 @@ choose_good_exit_server(uint8_t purpose, else return choose_good_exit_server_general(need_uptime,need_capacity); case CIRCUIT_PURPOSE_C_ESTABLISH_REND: - if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS) - flags |= CRN_ALLOW_INVALID; - return router_choose_random_node(NULL, options->ExcludeNodes, flags); + { + /* Pick a new RP */ + const node_t *rendezvous_node = pick_rendezvous_node(flags); + log_info(LD_REND, "Picked new RP: %s", node_describe(rendezvous_node)); + return rendezvous_node; + } } log_warn(LD_BUG,"Unhandled purpose %d", purpose); tor_fragile_assert(); diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 71caea9..99411c0 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -60,6 +60,9 @@ const node_t *choose_good_entry_server(uint8_t purpose, #ifdef CIRCUITBUILD_PRIVATE STATIC circid_t get_unique_circ_id_by_chan(channel_t *chan); +STATIC const node_t *pick_tor2web_rendezvous_node(router_crn_flags_t flags, + const or_options_t *options); + #endif #endif diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1faa05f..5fc30f1 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1732,7 +1732,7 @@ routerlist_add_node_and_family(smartlist_t *sl, const routerinfo_t *router) /** Add every suitable node from our nodelist to sl, so that * we can pick a node for a circuit. */ -static void +void router_add_running_nodes_to_smartlist(smartlist_t *sl, int allow_invalid, int need_uptime, int need_capacity, int need_guard, int need_desc) diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 52f2303..83fea78 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -58,6 +58,10 @@ const routerstatus_t *router_pick_fallback_dirserver(dirinfo_type_t type, int router_get_my_share_of_directory_requests(double *v3_share_out); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); +void router_add_running_nodes_to_smartlist(smartlist_t *sl, int allow_invalid, + int need_uptime, int need_capacity, + int need_guard, int need_desc); + const routerinfo_t *routerlist_find_my_routerinfo(void); uint32_t router_get_advertised_bandwidth(const routerinfo_t *router); uint32_t router_get_advertised_bandwidth_capped(const routerinfo_t *router);

1 0

[tor/master] Introduce the Tor2webRendezvousPoints torrc option.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit e02138eb65a71af8eb0de9077a82aa25eb0ac03e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:26:42 2014 +0300 Introduce the Tor2webRendezvousPoints torrc option. --- doc/tor.1.txt | 16 ++++++++++++++++ src/or/config.c | 11 ++++++++++- src/or/or.h | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d6b1432..171193b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1322,6 +1322,22 @@ The following options are useful only for clients (that is, if To enable this option the compile time flag --enable-tor2webmode must be specified. (Default: 0) +[[Tor2webRendezvousPoints]] **Tor2webRendezvousPoints** __node__,__node__,__...__:: + A list of identity fingerprints, nicknames, country codes and + address patterns of nodes that are allowed to be used as RPs + in HS circuits; any other nodes will not be used as RPs. + (Example: + Tor2webRendezvousPoints Fastyfasty, ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + + + This feature can only be used if Tor2webMode is also enabled. + + + ExcludeNodes have higher priority than Tor2webRendezvousPoints, + which means that nodes specified in ExcludeNodes will not be + picked as RPs. + + + If no nodes in Tor2webRendezvousPoints are currently available for + use, Tor will choose a random node when building HS circuits. + [[UseMicrodescriptors]] **UseMicrodescriptors** **0**|**1**|**auto**:: Microdescriptors are a smaller version of the information that Tor needs in order to build its circuits. Using microdescriptors makes Tor clients diff --git a/src/or/config.c b/src/or/config.c index 10af92a..fb48e1e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -66,6 +66,7 @@ static config_abbrev_t option_abbrevs_[] = { PLURAL(ExitNode), PLURAL(EntryNode), PLURAL(ExcludeNode), + PLURAL(Tor2webRendezvousPoint), PLURAL(FirewallPort), PLURAL(LongLivedPort), PLURAL(HiddenServiceNode), @@ -407,6 +408,7 @@ static config_var_t option_vars_[] = { OBSOLETE("TestVia"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), + V(Tor2webRendezvousPoints, ROUTERSET, NULL), V(TLSECGroup, STRING, NULL), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), @@ -1242,7 +1244,8 @@ options_need_geoip_info(const or_options_t *options, const char **reason_out) routerset_needs_geoip(options->EntryNodes) || routerset_needs_geoip(options->ExitNodes) || routerset_needs_geoip(options->ExcludeExitNodes) || - routerset_needs_geoip(options->ExcludeNodes); + routerset_needs_geoip(options->ExcludeNodes) || + routerset_needs_geoip(options->Tor2webRendezvousPoints); if (routerset_usage && reason_out) { *reason_out = "We've been configured to use (or avoid) nodes in certain " @@ -1623,6 +1626,8 @@ options_act(const or_options_t *old_options) options->ExcludeExitNodes) || !routerset_equal(old_options->EntryNodes, options->EntryNodes) || !routerset_equal(old_options->ExitNodes, options->ExitNodes) || + !routerset_equal(old_options->Tor2webRendezvousPoints, + options->Tor2webRendezvousPoints) || options->StrictNodes != old_options->StrictNodes) { log_info(LD_CIRC, "Changed to using entry guards or bridges, or changed " @@ -2958,6 +2963,10 @@ options_validate(or_options_t *old_options, or_options_t *options, options->UseEntryGuards = 0; } + if (options->Tor2webRendezvousPoints && !options->Tor2webMode) { + REJECT("Tor2webRendezvousPoints cannot be set without Tor2webMode."); + } + if (!(options->UseEntryGuards) && (options->RendConfigLines != NULL)) { log_warn(LD_CONFIG, diff --git a/src/or/or.h b/src/or/or.h index 06d4e3c..be6480a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3593,6 +3593,9 @@ typedef struct { * circuits.) */ int Tor2webMode; + /** A routerset that should be used when picking RPs for HS circuits. */ + routerset_t *Tor2webRendezvousPoints; + /** Close hidden service client circuits immediately when they reach * the normal circuit-build timeout, even if they have already sent * an INTRODUCE1 cell on its way to the service. */

1 0

[tor/master] Block circuit canibalization when Tor2webRendezvousPoints is active.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 3e7c5e9f4464e5ca5f33f1206af72580b9dc4e20 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:27:27 2014 +0300 Block circuit canibalization when Tor2webRendezvousPoints is active. --- src/or/circuituse.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bd42bd3..6304a4d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1646,6 +1646,7 @@ circuit_launch_by_extend_info(uint8_t purpose, { origin_circuit_t *circ; int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0; + int need_specific_rp = 0; if (!onehop_tunnel && !router_have_minimum_dir_info()) { log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling " @@ -1653,8 +1654,17 @@ circuit_launch_by_extend_info(uint8_t purpose, return NULL; } + /* If Tor2webRendezvousPoints is enabled and we are dealing with an + RP circuit, we want a specific RP node so we shouldn't canibalize + an already existing circuit. */ + if (get_options()->Tor2webRendezvousPoints && + purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND) { + need_specific_rp = 1; + } + if ((extend_info || purpose != CIRCUIT_PURPOSE_C_GENERAL) && - purpose != CIRCUIT_PURPOSE_TESTING && !onehop_tunnel) { + purpose != CIRCUIT_PURPOSE_TESTING && + !onehop_tunnel && !need_specific_rp) { /* see if there are appropriate circs available to cannibalize. */ /* XXX if we're planning to add a hop, perhaps we want to look for * internal circs rather than exit circs? -RD */

1 0

[tor/master] Fix a tor2web log message that referenced the wrong configure switch.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 6c512d2f634c5688ca6ce5d4bfbe1ee2d263f212 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:28:27 2014 +0300 Fix a tor2web log message that referenced the wrong configure switch. --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index fb48e1e..999b134 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1378,7 +1378,7 @@ options_act(const or_options_t *old_options) log_err(LD_CONFIG, "This copy of Tor was not compiled to run in " "'tor2web mode'. It cannot be run with the Tor2webMode torrc " "option enabled. To enable Tor2webMode recompile with the " - "--enable-tor2webmode option."); + "--enable-tor2web-mode option."); return -1; } #endif

1 0

[webwml/master] Update bandwidth requirements
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 35be4c37b22e95ee879e9ed0509c9ed0bb02a63b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:45:56 2015 +0100 Update bandwidth requirements --- docs/en/faq.wml | 2 +- docs/en/tor-doc-relay.wml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index c946740..3883def 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2295,7 +2295,7 @@ too. BandwidthRate is the maximum long-term bandwidth allowed (bytes per second). For example, you might want to choose "BandwidthRate 10 MBytes" for 10 megabytes per second (a fast connection), or "BandwidthRate 500 - KBytes" for 500 kilobytes per second (a pretty good cable connection). + KBytes" for 500 kilobytes per second (a decent cable connection). The minimum BandwidthRate setting is 20 kilobytes per second. </li> <li> diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index 7d48782..e2053bf 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -18,12 +18,12 @@ The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 250 kilobytes/s each way, please help out Tor by configuring your - Tor to be a relay too. + at least 2 megabits/s for both upload and download, please help out + Tor by configuring your Tor to be a relay too. You can run a Tor relay on pretty much any operating system. Tor relays - work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and + work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later.

1 0

[webwml/master] underscore means default. ouch
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 7cd8071c909d5b365f19a2042c39abef90050d02 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:16:03 2015 +0100 underscore means default. ouch --- docs/en/debian.wml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 9869735..95c93ea 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,7 +11,7 @@ // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. var sources = {}; var software = { -'tor': { 'stable': { 'squeeze': [ 'squeeze' ], +'tor': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -30,7 +30,7 @@ var software = { 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, }, -'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -89,16 +89,19 @@ function update() { if (package != pkg.prev) { while (ver.firstChild) ver.removeChild(ver.firstChild); + var selected; for (version in software[package]) { option = document.createElement('option'); if (version[0] == '_') { version = version.slice(1); + selected = version; } option.appendChild(document.createTextNode(version)); option.value = version = version.replace(/ $.*$/,''); //alert(version); ver.appendChild(option); } + ver.value = version = selected || version; pkg.prev = package } try {

1 0