May 2016 - tor-commits - lists.torproject.org

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

11 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/maint-0.2.8] Switch between fallback and authority when auth cert fetch fails
by nickm＠torproject.org 11 May '16

11 May '16

commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 4 15:41:37 2016 +1000 Switch between fallback and authority when auth cert fetch fails --- changes/bug18816 | 2 ++ src/or/routerlist.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 index 7265f5a..0545512 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,4 +1,6 @@ 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 85e9e7d..3169343 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,11 +912,14 @@ 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, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -958,11 +961,14 @@ 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, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else they were all pending */

1 0

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

11 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/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 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/master] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 11 May '16

11 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/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 11 May '16

11 May '16

commit e31980f693b569541aded815a504eb62a76649d9 Merge: 84af12e 50249c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:23:40 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

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

11 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/master] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 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/maint-0.2.7] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 11 May '16

11 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/maint-0.2.7] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 11 May '16

11 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