- tor-commits - lists.torproject.org

[tor/release-0.2.8] Remove redundant descriptor checks for OR/Dir reachability
by nickm＠torproject.org 17 May '16

17 May '16

commit 211e56ad87740da1303832d900bf2943ed702526 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:36:27 2016 +1000 Remove redundant descriptor checks for OR/Dir reachability The ORPort and DirPort must be reachable, or we won't publish a descriptor. --- src/or/router.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index a9d992f..86fd787 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port) return dir_port; if (net_is_disabled()) return 0; - /* redundant - if DirPort is unreachable, we don't publish a descriptor */ - if (!check_whether_dirport_reachable()) - return 0; if (!router_get_advertised_dir_port(options, dir_port)) return 0; @@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options, return 1; if (net_is_disabled()) return 0; - /* redundant - if ORPort is unreachable, we don't publish a descriptor */ - if (!check_whether_orport_reachable()) - return 0; if (!router_get_advertised_or_port(options)) return 0;

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
by nickm＠torproject.org 17 May '16

17 May '16

commit 548d14247e3c8a48e2efb2ca62ee7a05fca843ba Merge: 6cc3397 06031b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 10:48:12 2016 -0400 Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8 changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-) diff --cc src/or/router.c index 3f94703,57c0618..d70756f --- a/src/or/router.c +++ b/src/or/router.c @@@ -1570,15 -1625,9 +1627,15 @@@ decide_if_publishable_server(void return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!check_whether_orport_reachable()) - - return check_whether_orport_reachable(options) && - check_whether_dirport_reachable(options); ++ if (!check_whether_orport_reachable(options)) + return 0; + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { + /* All set: there are no exits in the consensus (maybe this is a tiny + * test network), so we can't check our DirPort reachability. */ + return 1; + } else { - return check_whether_dirport_reachable(); ++ return check_whether_dirport_reachable(options); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[tor/release-0.2.8] Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
by nickm＠torproject.org 17 May '16

17 May '16

commit d6a2fec05ebcc39773a2f6666e1378410c64f047 Merge: ff5eb7f 548d142 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 11:09:54 2016 -0400 Merge branch 'bug18616-v4-merged_028' into maint-0.2.8 changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-)

1 0

[tor/master] Decide to advertise begindir support like we decide to advertise DirPort
by nickm＠torproject.org 17 May '16

17 May '16

commit 692828bea558295b2480eab473f9131e85d1eb9e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:30:55 2016 +1000 Decide to advertise begindir support like we decide to advertise DirPort Decide to advertise begindir support in a similar way to how we decide to advertise DirPort. Fix up the associated descriptor-building unit tests. Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in 0.2.8.1-alpha. --- src/or/config.c | 5 ++--- src/or/dirserv.c | 7 +++++-- src/or/router.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ src/test/test_dir.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 11 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5d938d1..f07ca64 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7005,9 +7005,8 @@ get_first_listener_addrport_string(int listener_type) int get_first_advertised_port_by_type_af(int listener_type, int address_family) { - if (!configured_ports) - return 0; - SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + const smartlist_t *conf_ports = get_configured_ports(); + SMARTLIST_FOREACH_BEGIN(conf_ports, const port_cfg_t *, cfg) { if (cfg->type == listener_type && !cfg->server_cfg.no_advertise && (tor_addr_family(&cfg->addr) == address_family || diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a045f3a..5f848bd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1131,8 +1131,11 @@ directory_caches_unknown_auth_certs(const or_options_t *options) return dir_server_mode(options) || options->BridgeRelay; } -/** Return 1 if we want to keep descriptors, networkstatuses, etc around - * and we're willing to serve them to others. Else return 0. +/** Return 1 if we want to keep descriptors, networkstatuses, etc around. + * Else return 0. + * Check get_options()->DirPort_set and directory_permits_begindir_requests() + * to see if we are willing to serve these directory documents to others via + * the DirPort and begindir over ORPort, respectively. */ int directory_caches_dir_info(const or_options_t *options) diff --git a/src/or/router.c b/src/or/router.c index 68bcf13..545753c 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1148,10 +1148,11 @@ router_should_be_directory_server(const or_options_t *options, int dir_port) "seconds long. Raising to 1."); interval_length = 1; } - log_info(LD_GENERAL, "Calculating whether to disable dirport: effective " + log_info(LD_GENERAL, "Calculating whether to advertise %s: effective " "bwrate: %u, AccountingMax: "U64_FORMAT", " - "accounting interval length %d", effective_bw, - U64_PRINTF_ARG(options->AccountingMax), + "accounting interval length %d", + dir_port ? "dirport" : "begindir", + effective_bw, U64_PRINTF_ARG(options->AccountingMax), interval_length); acc_bytes = options->AccountingMax; @@ -1218,6 +1219,7 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port) return dir_port; if (net_is_disabled()) return 0; + /* redundant - if DirPort is unreachable, we don't publish a descriptor */ if (!check_whether_dirport_reachable()) return 0; if (!router_get_advertised_dir_port(options, dir_port)) @@ -1229,6 +1231,39 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port) return router_should_be_directory_server(options, dir_port) ? dir_port : 0; } +/** Look at a variety of factors, and return 0 if we don't want to + * advertise the fact that we support begindir requests, else return 1. + * + * Log a helpful message if we change our mind about whether to advertise + * support for begindir. + */ +static int +decide_to_advertise_begindir(const or_options_t *options, + int supports_tunnelled_dir_requests) +{ + /* Part one: reasons to publish or not publish that aren't + * worth mentioning to the user, either because they're obvious + * or because they're normal behavior. */ + + /* short circuit the rest of the function */ + if (!supports_tunnelled_dir_requests) + return 0; + if (authdir_mode(options)) /* always publish */ + return 1; + if (net_is_disabled()) + return 0; + /* redundant - if ORPort is unreachable, we don't publish a descriptor */ + if (!check_whether_orport_reachable()) + return 0; + if (!router_get_advertised_or_port(options)) + return 0; + + /* Part two: reasons to publish or not publish that the user + * might find surprising. router_should_be_directory_server() + * considers config options that make us choose not to publish. */ + return router_should_be_directory_server(options, 0); +} + /** Allocate and return a new extend_info_t that can be used to build * a circuit to or through the router <b>r</b>. Use the primary * address of the router unless <b>for_direct_connect</b> is true, in @@ -1924,8 +1959,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); ri->dir_port = router_get_advertised_dir_port(options, 0); - ri->supports_tunnelled_dir_requests = dir_server_mode(options) && - router_should_be_directory_server(options, ri->dir_port); + ri->supports_tunnelled_dir_requests = + directory_permits_begindir_requests(options); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ @@ -2706,7 +2741,8 @@ router_dump_router_to_string(routerinfo_t *router, tor_free(p6); } - if (router->supports_tunnelled_dir_requests) { + if (decide_to_advertise_begindir(options, + router->supports_tunnelled_dir_requests)) { smartlist_add(chunks, tor_strdup("tunnelled-dir-server\n")); } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index ea179fb..401c7b2 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -85,6 +85,15 @@ test_dir_nicknames(void *arg) ; } +static smartlist_t *mocked_configured_ports = NULL; + +/** Returns mocked_configured_ports */ +static const smartlist_t * +mock_get_configured_ports(void) +{ + return mocked_configured_ports; +} + /** Run unit tests for router descriptor generation logic. */ static void test_dir_formats(void *arg) @@ -104,6 +113,7 @@ test_dir_formats(void *arg) or_options_t *options = get_options_mutable(); const addr_policy_t *p; time_t now = time(NULL); + port_cfg_t orport, dirport; (void)arg; pk1 = pk_generate(0); @@ -185,9 +195,31 @@ test_dir_formats(void *arg) /* XXXX025 router_dump_to_string should really take this from ri.*/ options->ContactInfo = tor_strdup("Magri White " "<magri(a)elsewhere.example.com>"); + /* Skip reachability checks for DirPort and tunnelled-dir-server */ + options->AssumeReachable = 1; + + /* Fake just enough of an ORPort and DirPort to get by */ + MOCK(get_configured_ports, mock_get_configured_ports); + mocked_configured_ports = smartlist_new(); + + memset(&orport, 0, sizeof(orport)); + orport.type = CONN_TYPE_OR_LISTENER; + orport.addr.family = AF_INET; + orport.port = 9000; + smartlist_add(mocked_configured_ports, &orport); + + memset(&dirport, 0, sizeof(dirport)); + dirport.type = CONN_TYPE_DIR_LISTENER; + dirport.addr.family = AF_INET; + dirport.port = 9003; + smartlist_add(mocked_configured_ports, &dirport); buf = router_dump_router_to_string(r1, pk2, NULL, NULL, NULL); + UNMOCK(get_configured_ports); + smartlist_free(mocked_configured_ports); + mocked_configured_ports = NULL; + tor_free(options->ContactInfo); tt_assert(buf); @@ -308,6 +340,16 @@ test_dir_formats(void *arg) strlcat(buf2, "tunnelled-dir-server\n", sizeof(buf2)); strlcat(buf2, "router-sig-ed25519 ", sizeof(buf2)); + /* Fake just enough of an ORPort to get by */ + MOCK(get_configured_ports, mock_get_configured_ports); + mocked_configured_ports = smartlist_new(); + + memset(&orport, 0, sizeof(orport)); + orport.type = CONN_TYPE_OR_LISTENER; + orport.addr.family = AF_INET; + orport.port = 9005; + smartlist_add(mocked_configured_ports, &orport); + buf = router_dump_router_to_string(r2, pk1, pk2, &r2_onion_keypair, &kp2); tt_assert(buf); buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same @@ -318,6 +360,10 @@ test_dir_formats(void *arg) buf = router_dump_router_to_string(r2, pk1, NULL, NULL, NULL); + UNMOCK(get_configured_ports); + smartlist_free(mocked_configured_ports); + mocked_configured_ports = NULL; + /* Reset for later */ cp = buf; rp2 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL,NULL);

1 0

[tor/maint-0.2.8] Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
by nickm＠torproject.org 17 May '16

17 May '16

commit d6a2fec05ebcc39773a2f6666e1378410c64f047 Merge: ff5eb7f 548d142 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 11:09:54 2016 -0400 Merge branch 'bug18616-v4-merged_028' into maint-0.2.8 changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-)

1 0

[tor/master] Descriptors depend on more config options now they list begindir support
by nickm＠torproject.org 17 May '16

17 May '16

commit 75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:36:20 2016 +1000 Descriptors depend on more config options now they list begindir support Bugfix on #12538 in 0.2.8.1-alpha. --- src/or/config.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index f07ca64..0850013 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4343,8 +4343,10 @@ options_transition_affects_descriptor(const or_options_t *old_options, !opt_streq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || old_options->AccountingMax != new_options->AccountingMax || + old_options->AccountingRule != new_options->AccountingRule || public_server_mode(old_options) != public_server_mode(new_options) || - old_options->DirCache != new_options->DirCache) + old_options->DirCache != new_options->DirCache || + old_options->AssumeReachable != new_options->AssumeReachable) return 1; return 0;

1 0

[tor/master] Changes file for #18616
by nickm＠torproject.org 17 May '16

17 May '16

commit 2cfcf17cfc4377efcf10a036557fa3134bf8c1b1 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:43:44 2016 +1000 Changes file for #18616 --- changes/bug18616 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug18616 b/changes/bug18616 new file mode 100644 index 0000000..44695a1 --- /dev/null +++ b/changes/bug18616 @@ -0,0 +1,7 @@ + o Major bugfixes (directory mirrors): + - Fix broken DirPort self-checks. Decide to advertise begindir + support the same way we decide to advertise DirPorts. + Include additional config options in the list that might + change the content of a relay's descriptor. + Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in + 0.2.8.1-alpha. Patch by "teor".

1 0

[tor/master] Make mock function static to prevent future clashes
by nickm＠torproject.org 17 May '16

17 May '16

commit 05cf2867131eaa1dc017605f67cb7ac433ea263d Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:39:09 2016 +1000 Make mock function static to prevent future clashes --- src/test/test_policy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 48e8255..a939ebf 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -716,10 +716,9 @@ test_policies_reject_exit_address(void *arg) } static smartlist_t *test_configured_ports = NULL; -const smartlist_t *mock_get_configured_ports(void); /** Returns test_configured_ports */ -const smartlist_t * +static const smartlist_t * mock_get_configured_ports(void) { return test_configured_ports;

1 0

[tor/master] Avoid checking ORPort reachability when the network is disabled
by nickm＠torproject.org 17 May '16

17 May '16

commit d3c60f2bd7430ed319406f89ba6e758038ecd5eb Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:13:14 2016 +1000 Avoid checking ORPort reachability when the network is disabled This is consistent with existing DirPort reachability checks. --- changes/bug18616 | 5 +++-- src/or/router.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug18616 b/changes/bug18616 index 44695a1..d760f15 100644 --- a/changes/bug18616 +++ b/changes/bug18616 @@ -1,7 +1,8 @@ o Major bugfixes (directory mirrors): - Fix broken DirPort self-checks. Decide to advertise begindir support the same way we decide to advertise DirPorts. - Include additional config options in the list that might - change the content of a relay's descriptor. + Add additional config options that might change the content of + a relay's descriptor. + Avoid checking ORPort reachability when the network is disabled. Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in 0.2.8.1-alpha. Patch by "teor". diff --git a/src/or/router.c b/src/or/router.c index 545753c..1083e24 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1085,6 +1085,7 @@ check_whether_orport_reachable(void) { const or_options_t *options = get_options(); return options->AssumeReachable || + net_is_disabled() || can_reach_or_port; }

1 0

[tor/master] Remove redundant descriptor checks for OR/Dir reachability
by nickm＠torproject.org 17 May '16

17 May '16

commit 211e56ad87740da1303832d900bf2943ed702526 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:36:27 2016 +1000 Remove redundant descriptor checks for OR/Dir reachability The ORPort and DirPort must be reachable, or we won't publish a descriptor. --- src/or/router.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index a9d992f..86fd787 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port) return dir_port; if (net_is_disabled()) return 0; - /* redundant - if DirPort is unreachable, we don't publish a descriptor */ - if (!check_whether_dirport_reachable()) - return 0; if (!router_get_advertised_dir_port(options, dir_port)) return 0; @@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options, return 1; if (net_is_disabled()) return 0; - /* redundant - if ORPort is unreachable, we don't publish a descriptor */ - if (!check_whether_orport_reachable()) - return 0; if (!router_get_advertised_or_port(options)) return 0;

1 0