- tor-commits - lists.torproject.org

[tor/release-0.2.8] Use the consensus download schedule for authority certificates
by nickm＠torproject.org 12 May '16

12 May '16

commit 64b948f5fa0099ddabcf0c63e437cc8e7373ef38 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 4 13:05:18 2016 +1000 Use the consensus download schedule for authority certificates Previously, we were using the generic schedule for some downloads, and the consensus schedule for others. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. --- changes/bug18816 | 4 ++++ src/or/routerlist.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 new file mode 100644 index 0000000..7265f5a --- /dev/null +++ b/changes/bug18816 @@ -0,0 +1,4 @@ + o Minor bugfix (bootstrap): + - Consistently use the consensus download schedule for + authority certificates. + Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1c275a6..85e9e7d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -148,6 +148,22 @@ get_n_authorities(dirinfo_type_t type) return n; } +/** Initialise schedule, want_authority, and increment on in the download + * status dlstatus, then call download_status_reset() on it. + * It is safe to call this function or download_status_reset() multiple times + * on a new dlstatus. But it should *not* be called after a dlstatus has been + * used to count download attempts or failures. */ +static void +download_status_cert_init(download_status_t *dlstatus) +{ + dlstatus->schedule = DL_SCHED_CONSENSUS; + dlstatus->want_authority = DL_WANT_ANY_DIRSERVER; + dlstatus->increment_on = DL_SCHED_INCREMENT_FAILURE; + + /* Use the new schedule to set next_attempt_at */ + download_status_reset(dlstatus); +} + /** Reset the download status of a specified element in a dsmap */ static void download_status_reset_by_sk_in_cl(cert_list_t *cl, const char *digest) @@ -168,6 +184,7 @@ download_status_reset_by_sk_in_cl(cert_list_t *cl, const char *digest) /* Insert before we reset */ dlstatus = tor_malloc_zero(sizeof(*dlstatus)); dsmap_set(cl->dl_status_map, digest, dlstatus); + download_status_cert_init(dlstatus); } tor_assert(dlstatus); /* Go ahead and reset it */ @@ -206,7 +223,7 @@ download_status_is_ready_by_sk_in_cl(cert_list_t *cl, * too. */ dlstatus = tor_malloc_zero(sizeof(*dlstatus)); - download_status_reset(dlstatus); + download_status_cert_init(dlstatus); dsmap_set(cl->dl_status_map, digest, dlstatus); rv = 1; } @@ -225,7 +242,7 @@ get_cert_list(const char *id_digest) cl = digestmap_get(trusted_dir_certs, id_digest); if (!cl) { cl = tor_malloc_zero(sizeof(cert_list_t)); - cl->dl_status_by_id.schedule = DL_SCHED_CONSENSUS; + download_status_cert_init(&cl->dl_status_by_id); cl->certs = smartlist_new(); cl->dl_status_map = dsmap_new(); digestmap_set(trusted_dir_certs, id_digest, cl);

1 0

[tor/release-0.2.8] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 12 May '16

12 May '16

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 12 May '16

12 May '16

commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal". --- changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug18841.1 b/changes/bug18841.1 new file mode 100644 index 0000000..205ee5a --- /dev/null +++ b/changes/bug18841.1 @@ -0,0 +1,7 @@ + o Major bugfixes (compilation): + - Correctly detect compiler flags on systems where _FORTIFY_SOURCE + is predefined. Previously, our use of -D_FORTIFY_SOURCE would + cause a compiler warning, thereby making other checks fail. + Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from + "trudokal". + diff --git a/configure.ac b/configure.ac index 29ba2fd..2116b41 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #endif])], have_clang=yes, have_clang=no) if test x$enable_gcc_hardening != xno; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" if test x$have_clang = xyes; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit 50249c7cd97c982fe829a9e7a22e660658b4e217 Merge: 5cd5979 039fc84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:23:20 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index e4816fd,8107c90..a487948 --- a/configure.ac +++ b/configure.ac @@@ -760,9 -717,9 +760,9 @@@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], #error #endif])], have_clang=yes, have_clang=no) -if test x$enable_gcc_hardening != xno; then +if test "x$enable_gcc_hardening" != "xno"; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" - if test x$have_clang = xyes; then + if test "x$have_clang" = "xyes"; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi TOR_CHECK_CFLAGS(-fstack-protector-all, also_link)

1 0

[tor/release-0.2.8] Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.
by nickm＠torproject.org 12 May '16

12 May '16

commit b59d79134e1089d310278a70788401835c1e5c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:46:44 2016 -0400 Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN. Closes ticket 18761. Also fix a whitespace issue. --- changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changes/bug18761 b/changes/bug18761 new file mode 100644 index 0000000..78500a8 --- /dev/null +++ b/changes/bug18761 @@ -0,0 +1,3 @@ + o Minor feature (logging): + - When rejecting a misformed INTRODUCE2 cell, only log at PROTOCOL_WARN + severity. Closes ticket 18761. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 39e5831..6f41f3b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1445,6 +1445,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, int status = 0, result; const or_options_t *options = get_options(); char *err_msg = NULL; + int err_msg_severity = LOG_WARN; const char *stage_descr = NULL; int reason = END_CIRC_REASON_TORPROTOCOL; /* Service/circuit/key stuff we can learn before parsing */ @@ -1596,8 +1597,10 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /* Find the rendezvous point */ rp = find_rp_for_intro(parsed_req, &err_msg); - if (!rp) + if (!rp) { + err_msg_severity = LOG_PROTOCOL_WARN; goto log_error; + } /* Check if we'd refuse to talk to this router */ if (options->StrictNodes && @@ -1735,7 +1738,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, } } - log_warn(LD_REND, "%s on circ %u", err_msg, + log_fn(err_msg_severity, LD_REND, "%s on circ %u", err_msg, (unsigned)circuit->base_.n_circ_id); err: status = -1; @@ -1797,7 +1800,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro, if (!rp) { if (err_msg_out) { tor_asprintf(&err_msg, - "Could build extend_info_t for router %s named " + "Couldn't build extend_info_t for router %s named " "in INTRODUCE2 cell", escaped_safe_str_client(rp_nickname)); } @@ -1833,8 +1836,10 @@ find_rp_for_intro(const rend_intro_cell_t *intro, goto done; err: - if (err_msg_out) *err_msg_out = err_msg; - else tor_free(err_msg); + if (err_msg_out) + *err_msg_out = err_msg; + else + tor_free(err_msg); done: return rp;

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit e71dfb6344c0480523a1fef0a77bd3d270d62e26 Merge: 50249c7 92d7ee0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:28:37 2016 -0400 Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 changes/bug18816 | 6 ++++++ src/or/routerlist.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'bug18761_028_squashed' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.8] Confim we want certificates from fallbacks
by nickm＠torproject.org 12 May '16

12 May '16

commit 797ece042d9666beae3ffc801b148e8bebcd88c0 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 11 13:08:45 2016 -0400 Confim we want certificates from fallbacks Comment-only change --- src/or/routerlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 85e9e7d..d40d704 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -913,7 +913,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (smartlist_len(fps) > 1) { resource = smartlist_join_strings(fps, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ + /* We want certs from mirrors, because they will almost always succeed. + */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, DL_WANT_ANY_DIRSERVER); @@ -959,7 +960,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (smartlist_len(fp_pairs) > 1) { resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ + /* We want certs from mirrors, because they will almost always succeed. + */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, DL_WANT_ANY_DIRSERVER);

1 0

[tor/release-0.2.8] Revert "Switch between fallback and authority when auth cert fetch fails"
by nickm＠torproject.org 12 May '16

12 May '16

commit 2cbad2aac76d911cce7cee95e91aebc1b1fcb509 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 11 13:06:13 2016 -0400 Revert "Switch between fallback and authority when auth cert fetch fails" This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b. --- changes/bug18816 | 2 -- src/or/routerlist.c | 14 ++++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 index 0545512..7265f5a 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,6 +1,4 @@ o Minor bugfix (bootstrap): - Consistently use the consensus download schedule for authority certificates. - - When downloading authority certificates fails, switch from - using a fallback to using an authority. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3169343..85e9e7d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,14 +912,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fps) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fps, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -961,14 +958,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fp_pairs) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fp_pairs, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else they were all pending */

1 0

[tor/release-0.2.8] refactor the #19003 patches
by nickm＠torproject.org 12 May '16

12 May '16

commit b8b5bccfd9f350cd796a8bcd6b79b9d303a79e11 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 13:03:49 2016 -0400 refactor the #19003 patches fix the logic in one of the comments --- src/or/circuituse.c | 2 +- src/or/router.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fa6c666..a4b5801 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1677,7 +1677,7 @@ circuit_launch(uint8_t purpose, int flags) /* Do we have enough descriptors to build paths? * If need_exit is true, return 1 if we can build exit paths. * (We need at least one Exit in the consensus to build exit paths.) - * If need_exit is false, return 0 if we can build internal paths. + * If need_exit is false, return 1 if we can build internal paths. */ static int have_enough_path_info(int need_exit) diff --git a/src/or/router.c b/src/or/router.c index dd84210..3f94703 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1549,9 +1549,9 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe both our ORPort and DirPort (if present) are reachable from + * - We believe our ORPort and DirPort (if present) are reachable from * the outside; or - * - We believe both our ORPort is reachable from the outside, and we can't + * - We believe our ORPort is reachable from the outside, and we can't * check our DirPort because the consensus has no exits; or * - We are an authoritative directory server. */ @@ -1570,14 +1570,15 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - /* If there are no exits in the consensus, but have enough descriptors to - * build internal paths, we can't possibly verify our DirPort. - * This only happens in small networks without exits. */ - if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) - return check_whether_orport_reachable(); - - /* If there are exits in the consensus, use an exit to check our DirPort. */ - return check_whether_orport_reachable() && check_whether_dirport_reachable(); + if (!check_whether_orport_reachable()) + 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(); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0