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

[tor/release-0.3.1] Make should_set_md_dirserver_restriction() look at num filtered guards
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 96b69942a54e69e9f4d8aeb07bf9a5fb98892900 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 08:49:24 2017 -0500 Make should_set_md_dirserver_restriction() look at num filtered guards This seems closer to what the code intended. --- src/or/entrynodes.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 1cc24d8d6..dc02557b5 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1472,9 +1472,10 @@ guard_create_exit_restriction(const uint8_t *exit_id) return rst; } -/** If we have less than these many configured bridges, don't set dirserver - * restrictions because we might blacklist all of them. */ -#define TOO_FEW_BRIDGES_FOR_RESTRICTION 10 +/** If we have fewer than this many possible guards, don't set + * MD-availability-based restrictions: we might blacklist all of + * them. */ +#define MIN_GUARDS_FOR_MD_RESTRICTION 10 /** Return true if we should set md dirserver restrictions. We might not want * to set those if our network is too restricted, since we don't want to @@ -1484,20 +1485,17 @@ should_set_md_dirserver_restriction(void) { const guard_selection_t *gs = get_guard_selection_info(); - /* Don't set a restriction if we are on a restricted guard selection */ - if (gs->type == GS_TYPE_RESTRICTED) { - return 0; - } - - /* Don't set restriction if we are using bridges and have too few of those */ - if (gs->type == GS_TYPE_BRIDGE && gs->sampled_entry_guards) { - int num_sampled_guards = smartlist_len(gs->sampled_entry_guards); - if (num_sampled_guards < TOO_FEW_BRIDGES_FOR_RESTRICTION) { - return 0; + /* Compute the number of filtered guards */ + int n_filtered_guards = 0; + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + if (guard->is_filtered_guard) { + ++n_filtered_guards; } - } + } SMARTLIST_FOREACH_END(guard); - return 1; + /* Do we have enough filtered guards that we feel okay about blacklisting + * some for MD restriction? */ + return (n_filtered_guards >= MIN_GUARDS_FOR_MD_RESTRICTION); } /** Allocate and return an outdated md guard restriction. Return NULL if no @@ -1508,6 +1506,8 @@ guard_create_dirserver_md_restriction(void) entry_guard_restriction_t *rst = NULL; if (!should_set_md_dirserver_restriction()) { + log_debug(LD_GUARD, "Not setting md restriction: too few " + "filtered guards."); return NULL; }

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit ca554b22f850da93d26c18119e0e251a58c6072e Merge: fdd13697d dc79d5299 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit d2031f2c602c40c3cc5f96a0fba27435203e83e2 Merge: ae608408e 69f93f806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:45:54 2017 -0500 Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1 changes/bug23817 | 3 ++ src/or/directory.c | 40 ++++++++++------ src/or/directory.h | 7 ++- src/or/entrynodes.c | 121 ++++++++++++++++++++++++++++++++++++++++++++----- src/or/entrynodes.h | 39 +++++++++++----- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++++++++++++ src/or/microdesc.h | 6 ++- src/or/networkstatus.c | 3 ++ 8 files changed, 280 insertions(+), 40 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit dc79d5299d1ffebab06d2e5ea9ef5f9459e0fc9a Merge: acc462c96 d2031f2c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 2edad42fd8afa243c0261d1907e50e43329e6392 Merge: fbb74fb37 d2031f2c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:45:59 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23817 | 3 ++ src/or/directory.c | 40 ++++++++++------ src/or/directory.h | 7 ++- src/or/entrynodes.c | 121 ++++++++++++++++++++++++++++++++++++++++++++----- src/or/entrynodes.h | 39 +++++++++++----- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++++++++++++ src/or/microdesc.h | 6 ++- src/or/networkstatus.c | 3 ++ 8 files changed, 280 insertions(+), 40 deletions(-)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit d2031f2c602c40c3cc5f96a0fba27435203e83e2 Merge: ae608408e 69f93f806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:45:54 2017 -0500 Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1 changes/bug23817 | 3 ++ src/or/directory.c | 40 ++++++++++------ src/or/directory.h | 7 ++- src/or/entrynodes.c | 121 ++++++++++++++++++++++++++++++++++++++++++++----- src/or/entrynodes.h | 39 +++++++++++----- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++++++++++++ src/or/microdesc.h | 6 ++- src/or/networkstatus.c | 3 ++ 8 files changed, 280 insertions(+), 40 deletions(-)

1 0

[tor/master] Add a changelog for the STACK fixes
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 35d56a127d9af913f0f74ec359b182fa33f49c50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:37:36 2017 -0500 Add a changelog for the STACK fixes --- changes/stack | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/stack b/changes/stack new file mode 100644 index 000000000..ffdf536cb --- /dev/null +++ b/changes/stack @@ -0,0 +1,7 @@ + o Minor bugfixes (correctness): + - Fix several places in our codebase where a C compiler would be likely + to eliminate a check, based on assuming that undefined behavior had not + happened elsewhere in the code. These cases are usually a sign of + redundant checking, or dubious arithmetic. Found by Georg Koppen using + the "STACK" tool from Wang, Zeldovich, Kaashoek, and + Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.

1 0

[tor/master] Remove a duplicate call to update_microdesc_downloads()
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 1c9f06348671ee72112f2f75d90d7e46cf412b2d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:38 2017 +0300 Remove a duplicate call to update_microdesc_downloads() This call happens before we update our entry guards, so it needs to be removed for the fix to #23862 to work. --- src/or/directory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 534e3d610..48d912bd2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2122,10 +2122,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) /* If we launched other fetches for this consensus, cancel them. */ connection_dir_close_consensus_fetches(conn, flavname); - /* launches router downloads as needed */ + /* update the list of routers and directory guards */ routers_update_all_from_networkstatus(now, 3); update_microdescs_from_networkstatus(now); - update_microdesc_downloads(now); directory_info_has_arrived(now, 0, 0); if (authdir_mode_v3(get_options())) { sr_act_post_consensus(

1 0

[tor/master] Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit c55a0542369d01f39472cc502c8e27ff85250dc6 Merge: 3bca705c5 7ae9e92ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:41:28 2017 -0500 Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0 changes/bug23682 | 5 +++++ src/or/directory.c | 3 +-- src/or/main.c | 18 +++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-)

1 0

[tor/release-0.3.0] Remove a duplicate call to update_microdesc_downloads()
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 1c9f06348671ee72112f2f75d90d7e46cf412b2d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:38 2017 +0300 Remove a duplicate call to update_microdesc_downloads() This call happens before we update our entry guards, so it needs to be removed for the fix to #23862 to work. --- src/or/directory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 534e3d610..48d912bd2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2122,10 +2122,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) /* If we launched other fetches for this consensus, cancel them. */ connection_dir_close_consensus_fetches(conn, flavname); - /* launches router downloads as needed */ + /* update the list of routers and directory guards */ routers_update_all_from_networkstatus(now, 3); update_microdescs_from_networkstatus(now); - update_microdesc_downloads(now); directory_info_has_arrived(now, 0, 0); if (authdir_mode_v3(get_options())) { sr_act_post_consensus(

1 0