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

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

21 Nov '17

commit c6365055a1bf5a20cd17dd2b134ab7bfa2365ae3 Merge: b9be385fd ba94dc28e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 21 12:41:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24086 | 7 +++++++ changes/bug24099 | 4 ++++ src/common/storagedir.c | 25 +++++++++++++++++++++---- src/or/conscache.c | 17 ++++++++++++++--- src/or/consdiffmgr.c | 13 +++++++++++-- 5 files changed, 57 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.2] Add another assertion to check for 24086 root causes
by nickm＠torproject.org 21 Nov '17

21 Nov '17

commit 68c21860e32ca04d77c2bfbf7576b96de5110f59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 11:04:44 2017 -0500 Add another assertion to check for 24086 root causes In cdm_diff_ht_set_status(), we shouldn't have been allowing the status CDM_DIFF_PRESENT to be set if there wasn't actually a handle. --- src/or/consdiffmgr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 8c25ff201..c5f55b6f3 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -283,6 +283,10 @@ cdm_diff_ht_set_status(consensus_flavor_t flav, int status, consensus_cache_entry_handle_t *handle) { + if (handle == NULL) { + tor_assert_nonfatal(status != CDM_DIFF_PRESENT); + } + struct cdm_diff_t search, *ent; memset(&search, 0, sizeof(cdm_diff_t)); search.flavor = flav;

1 0

[tor/release-0.3.2] In storagedir, take more care with errno on empty or mislabeled file
by nickm＠torproject.org 21 Nov '17

21 Nov '17

commit cabcb752d7ecc2d16e6cb630b3de0684b4f97ec5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 10:10:13 2017 -0500 In storagedir, take more care with errno on empty or mislabeled file Required for 24099 fix -- we won't be able to act based on errno unless we can trust it. --- src/common/storagedir.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 31933f64c..c471ea911 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -187,14 +187,19 @@ storage_dir_get_usage(storage_dir_t *d) return d->usage; } -/** Mmap a specified file within d. */ +/** Mmap a specified file within d. + * + * On failure, return NULL and set errno as for tor_mmap_file(). */ tor_mmap_t * storage_dir_map(storage_dir_t *d, const char *fname) { char *path = NULL; tor_asprintf(&path, "%s/%s", d->directory, fname); tor_mmap_t *result = tor_mmap_file(path); + int errval = errno; tor_free(path); + if (result == NULL) + errno = errval; return result; } @@ -364,6 +369,10 @@ storage_dir_save_labeled_to_file(storage_dir_t *d, * the data's size into *sz_out. On success, also return a tor_mmap_t * object whose contents should not be used -- it needs to be kept around, * though, for as long as data_out is going to be valid. + * + * On failure, set errno as for tor_mmap_file() if the file was missing or + * empty, and set errno to EINVAL if the file was not in the labeled + * format expected. */ tor_mmap_t * storage_dir_map_labeled(storage_dir_t *dir, @@ -373,13 +382,20 @@ storage_dir_map_labeled(storage_dir_t *dir, size_t *sz_out) { tor_mmap_t *m = storage_dir_map(dir, fname); - if (! m) + int errval; + if (! m) { + errval = errno; goto err; + } const char *nulp = memchr(m->data, '\0', m->size); - if (! nulp) + if (! nulp) { + errval = EINVAL; goto err; - if (labels_out && config_get_lines(m->data, labels_out, 0) < 0) + } + if (labels_out && config_get_lines(m->data, labels_out, 0) < 0) { + errval = EINVAL; goto err; + } size_t offset = nulp - m->data + 1; tor_assert(offset <= m->size); *data_out = (const uint8_t *)(m->data + offset); @@ -388,6 +404,7 @@ storage_dir_map_labeled(storage_dir_t *dir, return m; err: tor_munmap_file(m); + errno = errval; return NULL; }

1 0

[atlas/master] Fixes Top Relays view and increases to 250 relays
by irl＠torproject.org 21 Nov '17

21 Nov '17

commit 3c671cbdf1eabed87407ebb213454de995bfe00f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 21 14:50:56 2017 +0000 Fixes Top Relays view and increases to 250 relays --- js/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/router.js b/js/router.js index c4966f7..1844203 100644 --- a/js/router.js +++ b/js/router.js @@ -99,7 +99,7 @@ define([ $("#content").hide(); $(".progress").show(); - doSearchView.collection.url = "https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&l…"; + doSearchView.collection.url = "https://onionoo.torproject.org/details?type=relay&order=-consensus_weight&l…"; doSearchView.collection.lookup({ success: function(err){ doSearchView.relays = doSearchView.collection.models;

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 21 Nov '17

21 Nov '17

commit f72b795687460f903671ad828c2a48f34bfdc879 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 21 14:46:55 2017 +0000 Update translations for tor-launcher-progress_completed --- it/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/progress.dtd b/it/progress.dtd index e60f3064f..389c0b1f7 100644 --- a/it/progress.dtd +++ b/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> +<!ENTITY torprogress.pleaseWait "Per favore attendi mentre ci connettiamo alla rete Tor. Potrebbero servire alcuni minuti.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 21 Nov '17

21 Nov '17

commit d4212f6547a14b9c944735e06d849f2144f0895e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 21 14:46:47 2017 +0000 Update translations for tor-launcher-progress --- it/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/progress.dtd b/it/progress.dtd index e60f3064f..389c0b1f7 100644 --- a/it/progress.dtd +++ b/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> +<!ENTITY torprogress.pleaseWait "Per favore attendi mentre ci connettiamo alla rete Tor. Potrebbero servire alcuni minuti.">

1 0

[tor/maint-0.3.2] Check number of usable guards when applying md restrictions.
by nickm＠torproject.org 20 Nov '17

20 Nov '17

commit 69f93f806c4531e9498257578a10935e7859390f Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Nov 20 18:11:59 2017 +0200 Check number of usable guards when applying md restrictions. We used to check whether we have enough filtered guards (guard set when torrc is applied) but that's not good enough, since that might be bad in some cases where many guards are not reachable (might cause overblocking and hence reacahbility issues). We now check if we have enough reachable filtered guards before applying md restrictions which should prevent overblocking. --- src/or/entrynodes.c | 30 ++++++++++++++---------------- src/or/entrynodes.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index dc02557b5..d63d9291b 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -966,7 +966,7 @@ entry_guard_learned_bridge_identity(const tor_addr_port_t *addrport, * violate it. */ STATIC int -num_reachable_filtered_guards(guard_selection_t *gs, +num_reachable_filtered_guards(const guard_selection_t *gs, const entry_guard_restriction_t *rst) { int n_reachable_filtered_guards = 0; @@ -1472,30 +1472,28 @@ guard_create_exit_restriction(const uint8_t *exit_id) return rst; } -/** If we have fewer than this many possible guards, don't set - * MD-availability-based restrictions: we might blacklist all of - * them. */ +/** If we have fewer than this many possible usable 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 - * blacklist all our nodes. */ + * to set those if our guard options are too restricted, since we don't want + * to blacklist all of them. */ static int should_set_md_dirserver_restriction(void) { const guard_selection_t *gs = get_guard_selection_info(); + int num_usable_guards = num_reachable_filtered_guards(gs, NULL); - /* 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); + /* Don't set restriction if too few reachable filtered guards. */ + if (num_usable_guards < MIN_GUARDS_FOR_MD_RESTRICTION) { + log_info(LD_GUARD, "Not setting md restriction: only %d" + " usable guards.", num_usable_guards); + return 0; + } - /* 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); + /* We have enough usable guards: set MD restriction */ + return 1; } /** Allocate and return an outdated md guard restriction. Return NULL if no diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 29de627de..39bff1438 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -521,7 +521,7 @@ STATIC void entry_guard_consider_retry(entry_guard_t *guard); STATIC void make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard); STATIC void entry_guards_update_confirmed(guard_selection_t *gs); STATIC void entry_guards_update_primary(guard_selection_t *gs); -STATIC int num_reachable_filtered_guards(guard_selection_t *gs, +STATIC int num_reachable_filtered_guards(const guard_selection_t *gs, const entry_guard_restriction_t *rst); STATIC void sampled_guards_update_from_consensus(guard_selection_t *gs); /**

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 20 Nov '17

20 Nov '17

commit b1ab360eca6a1ebd82762d7a735848c25cf19db1 Merge: 9068e55ce da82e0b57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 14:35:26 2017 -0500 Merge branch 'maint-0.3.2' src/or/entrynodes.c | 30 ++++++++++++++---------------- src/or/entrynodes.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'bug23817_031' into maint-0.3.2
by nickm＠torproject.org 20 Nov '17

20 Nov '17

commit da82e0b5795c449f4442c87e065e9a60da4892a8 Merge: e2d8300c1 69f93f806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 14:29:50 2017 -0500 Merge branch 'bug23817_031' into maint-0.3.2 src/or/entrynodes.c | 30 ++++++++++++++---------------- src/or/entrynodes.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'bug23817_031' into maint-0.3.2
by nickm＠torproject.org 20 Nov '17

20 Nov '17

commit da82e0b5795c449f4442c87e065e9a60da4892a8 Merge: e2d8300c1 69f93f806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 14:29:50 2017 -0500 Merge branch 'bug23817_031' into maint-0.3.2 src/or/entrynodes.c | 30 ++++++++++++++---------------- src/or/entrynodes.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-)

1 0