August 2015 - tor-commits - lists.torproject.org

[tor/master] Add crypto_rand_unmocked, which is crypto_rand without mocking.
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit af898f54752f45fa2a8da28ca88379c89ca1f5a0 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Aug 12 15:57:05 2015 +0000 Add crypto_rand_unmocked, which is crypto_rand without mocking. There is odd issues with calling crypto_rand from our copy of ed25519-donna, due to mocking that are not easily resolved. --- src/common/crypto.c | 11 ++++++++++- src/common/crypto.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2121383..6d4b0d7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2365,11 +2365,20 @@ crypto_seed_rng(void) } /** Write n bytes of strong random data to to. Return 0 on - * success, -1 on failure. + * success, -1 on failure, with support for mocking for unit tests. */ MOCK_IMPL(int, crypto_rand, (char *to, size_t n)) { + return crypto_rand_unmocked(to, n); +} + +/** Write n bytes of strong random data to to. Return 0 on + * success, -1 on failure. Most callers will want crypto_rand instead. + */ +int +crypto_rand_unmocked(char *to, size_t n) +{ int r; tor_assert(n < INT_MAX); tor_assert(to); diff --git a/src/common/crypto.h b/src/common/crypto.h index 368e9d8..6256f73 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -260,6 +260,7 @@ int crypto_expand_key_material_rfc5869_sha256( /* random numbers */ int crypto_seed_rng(void); MOCK_DECL(int,crypto_rand,(char *to, size_t n)); +int crypto_rand_unmocked(char *to, size_t n); int crypto_strongest_rand(uint8_t *out, size_t out_len); int crypto_rand_int(unsigned int max); int crypto_rand_int_range(unsigned int min, unsigned int max);

1 0

[tor/master] Use ed25519-donna's batch verification support when applicable.
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit 78fad380cda75b0de86f0d8d2b4d7e55f239f326 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Aug 12 16:01:28 2015 +0000 Use ed25519-donna's batch verification support when applicable. The code was always in our Ed25519 wrappers, so enable it when using the ed25519-donna backend, and deal with the mocking related crypto_rand silliness. Implements feature 16533. --- changes/feature16533 | 4 + src/common/crypto_ed25519.c | 112 +++++++++++--------- src/ext/ed25519/donna/ed25519-randombytes-custom.h | 2 +- 3 files changed, 69 insertions(+), 49 deletions(-) diff --git a/changes/feature16533 b/changes/feature16533 new file mode 100644 index 0000000..e9fea94 --- /dev/null +++ b/changes/feature16533 @@ -0,0 +1,4 @@ + o Minor features (performance) + - Improve the runtime speed of Ed25519 signature verification by using + Ed25519-donna's batch verification support when there are a lot of + signatures to verify at once. Implements ticket 16533. diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 3a62932..7e995f4 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -37,6 +37,8 @@ typedef struct { unsigned char *); int (*sign)(unsigned char *, const unsigned char *, size_t, const unsigned char *, const unsigned char *); + int (*open_batch)(const unsigned char **, size_t *, const unsigned char **, + const unsigned char **, size_t, int *); int (*blind_secret_key)(unsigned char *, const unsigned char *, const unsigned char *); @@ -57,6 +59,7 @@ static const ed25519_impl_t impl_ref10 = { ed25519_ref10_open, ed25519_ref10_sign, + NULL, ed25519_ref10_blind_secret_key, ed25519_ref10_blind_public_key, @@ -74,6 +77,7 @@ static const ed25519_impl_t impl_donna = { ed25519_donna_open, ed25519_donna_sign, + ed25519_sign_open_batch_donna, ed25519_donna_blind_secret_key, ed25519_donna_blind_public_key, @@ -197,57 +201,69 @@ ed25519_checksig_batch(int *okay_out, const ed25519_checkable_t *checkable, int n_checkable) { - int res, i; - - res = 0; - for (i = 0; i < n_checkable; ++i) { - const ed25519_checkable_t *ch = &checkable[i]; - int r = ed25519_checksig(&ch->signature, ch->msg, ch->len, ch->pubkey); - if (r < 0) - --res; - if (okay_out) - okay_out[i] = (r == 0); - } - -#if 0 - /* This is how we'd do it if we were using ed25519_donna. I'll keep this - * code around here in case we ever do that. */ - const uint8_t **ms; - size_t *lens; - const uint8_t **pks; - const uint8_t **sigs; - int *oks; - - ms = tor_malloc(sizeof(uint8_t*)*n_checkable); - lens = tor_malloc(sizeof(size_t)*n_checkable); - pks = tor_malloc(sizeof(uint8_t*)*n_checkable); - sigs = tor_malloc(sizeof(uint8_t*)*n_checkable); - oks = okay_out ? okay_out : tor_malloc(sizeof(int)*n_checkable); - - for (i = 0; i < n_checkable; ++i) { - ms[i] = checkable[i].msg; - lens[i] = checkable[i].len; - pks[i] = checkable[i].pubkey->pubkey; - sigs[i] = checkable[i].signature.sig; - oks[i] = 0; - } - - ed25519_sign_open_batch_donna_fb(ms, lens, pks, sigs, n_checkable, oks); + int i, res; + const ed25519_impl_t *impl = get_ed_impl(); - res = 0; - for (i = 0; i < n_checkable; ++i) { - /* XXX/yawning: Propagate to okay_out? */ - if (!oks[i]) - --res; + if (impl->open_batch == NULL) { + /* No batch verification implementation available, fake it by checking the + * each signature individually. + */ + res = 0; + for (i = 0; i < n_checkable; ++i) { + const ed25519_checkable_t *ch = &checkable[i]; + int r = ed25519_checksig(&ch->signature, ch->msg, ch->len, ch->pubkey); + if (r < 0) + --res; + if (okay_out) + okay_out[i] = (r == 0); + } + } else { + /* ed25519-donna style batch verification available. + * + * Theoretically, this should only be called if n_checkable >= 3, since + * that's the threshold where the batch verification actually kicks in, + * but the only difference is a few mallocs/frees. + */ + const uint8_t **ms; + size_t *lens; + const uint8_t **pks; + const uint8_t **sigs; + int *oks; + int all_ok; + + ms = tor_malloc(sizeof(uint8_t*)*n_checkable); + lens = tor_malloc(sizeof(size_t)*n_checkable); + pks = tor_malloc(sizeof(uint8_t*)*n_checkable); + sigs = tor_malloc(sizeof(uint8_t*)*n_checkable); + oks = okay_out ? okay_out : tor_malloc(sizeof(int)*n_checkable); + + for (i = 0; i < n_checkable; ++i) { + ms[i] = checkable[i].msg; + lens[i] = checkable[i].len; + pks[i] = checkable[i].pubkey->pubkey; + sigs[i] = checkable[i].signature.sig; + oks[i] = 0; + } + + res = 0; + all_ok = impl->open_batch(ms, lens, pks, sigs, n_checkable, oks); + for (i = 0; i < n_checkable; ++i) { + if (!oks[i]) + --res; + } + /* XXX: For now sanity check oks with the return value. Once we have + * more confidence in the code, if `all_ok == 0` we can skip iterating + * over oks since all the signatures were found to be valid. + */ + tor_assert(((res == 0) && !all_ok) || ((res < 0) && all_ok)); + + tor_free(ms); + tor_free(lens); + tor_free(pks); + if (! okay_out) + tor_free(oks); } - tor_free(ms); - tor_free(lens); - tor_free(pks); - if (! okay_out) - tor_free(oks); -#endif - return res; } diff --git a/src/ext/ed25519/donna/ed25519-randombytes-custom.h b/src/ext/ed25519/donna/ed25519-randombytes-custom.h index e49368b..3fb0959 100644 --- a/src/ext/ed25519/donna/ed25519-randombytes-custom.h +++ b/src/ext/ed25519/donna/ed25519-randombytes-custom.h @@ -13,5 +13,5 @@ static void ED25519_FN(ed25519_randombytes_unsafe) (void *p, size_t len) { - crypto_rand(p, len); + crypto_rand_unmocked(p, len); }

1 0

[tor/master] Merge remote-tracking branch 'yawning/feature16533'
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit 5fe18bcf5459d8801fdeaf01e74571cd36ba47da Merge: 573bd1f 78fad38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 17 14:16:20 2015 -0400 Merge remote-tracking branch 'yawning/feature16533' changes/feature16533 | 4 + src/common/crypto.c | 11 +- src/common/crypto.h | 1 + src/common/crypto_ed25519.c | 112 +++++++++++--------- src/ext/ed25519/donna/ed25519-randombytes-custom.h | 2 +- 5 files changed, 80 insertions(+), 50 deletions(-)

1 0

[tor/master] Decouple routerlist_retry_directory_downloads() from the blob
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit e62518865b312816211086c6a0d080e7258dae5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:41:43 2015 -0400 Decouple routerlist_retry_directory_downloads() from the blob Instead of having it call update_all_descriptor_downloads and update_networkstatus_downloads directly, we can have it cause them to get rescheduled and called from run_scheduled_events. Closes ticket 16789. --- changes/decouple_retry_directory | 6 ++++++ src/or/main.c | 11 +++++++++++ src/or/main.h | 1 + src/or/routerlist.c | 6 ++---- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/changes/decouple_retry_directory b/changes/decouple_retry_directory new file mode 100644 index 0000000..11f901b --- /dev/null +++ b/changes/decouple_retry_directory @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Change the function that's called when we need to retry all downloads + so that it only reschedules the downloads to happen immediately, rather + than launching them all at once itself. This further simplifies + Tor's callgraph. + diff --git a/src/or/main.c b/src/or/main.c index a29387c..2e50c5b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1280,6 +1280,17 @@ reschedule_descriptor_update_check(void) time_to.check_descriptor = 0; } +/** + * Update our schedule so that we'll check whether we need to fetch directory + * info immediately. + */ +void +reschedule_directory_downloads(void) +{ + time_to.download_networkstatus = 0; + time_to.try_getting_descriptors = 0; +} + /** Perform regular maintenance tasks. This function gets run once per * second by second_elapsed_callback(). */ diff --git a/src/or/main.h b/src/or/main.h index be0bd64..31883d4 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -54,6 +54,7 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); void reset_all_main_loop_timers(void); void reschedule_descriptor_update_check(void); +void reschedule_directory_downloads(void); MOCK_DECL(long,get_uptime,(void)); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index aebbd48..8bd8039 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4013,12 +4013,10 @@ update_all_descriptor_downloads(time_t now) void routerlist_retry_directory_downloads(time_t now) { + (void)now; router_reset_status_download_failures(); router_reset_descriptor_download_failures(); - if (get_options()->DisableNetwork) - return; - update_networkstatus_downloads(now); - update_all_descriptor_downloads(now); + reschedule_directory_downloads(); } /** Return true iff router does not permit exit streams.

1 0

[tor/master] Merge remote-tracking branch 'public/decouple_retry_directory'
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit 573bd1f033d47a21a90340644480587e62817b68 Merge: 7f9a33a e625188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 17 13:50:19 2015 -0400 Merge remote-tracking branch 'public/decouple_retry_directory' changes/decouple_retry_directory | 6 ++++++ src/or/main.c | 11 +++++++++++ src/or/main.h | 1 + src/or/routerlist.c | 6 ++---- 4 files changed, 20 insertions(+), 4 deletions(-)

1 0

[tor/master] Bring the dimap tests up to 100%
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit 7f9a33a800b0d399942ca0aa98c05a71d08926b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 17 12:52:01 2015 -0400 Bring the dimap tests up to 100% --- src/test/test_util.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index a6c423d..8b4513d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3611,6 +3611,50 @@ test_util_di_ops(void *arg) ; } +static void +test_util_di_map(void *arg) +{ + (void)arg; + di_digest256_map_t *dimap = NULL; + uint8_t key1[] = "Robert Anton Wilson "; + uint8_t key2[] = "Martin Gardner, _Fads&fallacies"; + uint8_t key3[] = "Tom Lehrer, _Be Prepared_. "; + uint8_t key4[] = "Ursula Le Guin,_A Wizard of... "; + + char dflt_entry[] = "'You have made a good beginning', but no more"; + + tt_int_op(32, ==, sizeof(key1)); + tt_int_op(32, ==, sizeof(key2)); + tt_int_op(32, ==, sizeof(key3)); + + tt_ptr_op(dflt_entry, ==, dimap_search(dimap, key1, dflt_entry)); + + char *str1 = tor_strdup("You are precisely as big as what you love" + " and precisely as small as what you allow" + " to annoy you."); + char *str2 = tor_strdup("Let us hope that Lysenko's success in Russia will" + " serve for many generations to come as another" + " reminder to the world of how quickly and easily" + " a science can be corrupted when ignorant" + " political leaders deem themselves competent" + " to arbitrate scientific disputes"); + char *str3 = tor_strdup("Don't write naughty words on walls " + "if you can't spell."); + + dimap_add_entry(&dimap, key1, str1); + dimap_add_entry(&dimap, key2, str2); + dimap_add_entry(&dimap, key3, str3); + + tt_ptr_op(str1, ==, dimap_search(dimap, key1, dflt_entry)); + tt_ptr_op(str3, ==, dimap_search(dimap, key3, dflt_entry)); + tt_ptr_op(str2, ==, dimap_search(dimap, key2, dflt_entry)); + tt_ptr_op(dflt_entry, ==, dimap_search(dimap, key4, dflt_entry)); + + done: + dimap_free(dimap, tor_free_); +} + + /** * Test counting high bits */ @@ -4395,6 +4439,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(path_is_relative), UTIL_LEGACY(strtok), UTIL_LEGACY(di_ops), + UTIL_TEST(di_map, 0), UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), UTIL_TEST(find_str_at_start_of_line, 0),

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 17 Aug '15

17 Aug '15

commit bfd4e7a394186d7dc9937fd1d80a1a777efab5ce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 17 14:45:45 2015 +0000 Update translations for abouttor-homepage --- es_MX/aboutTor.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/es_MX/aboutTor.dtd b/es_MX/aboutTor.dtd index bde91fe..1e1dfe7 100644 --- a/es_MX/aboutTor.dtd +++ b/es_MX/aboutTor.dtd @@ -4,15 +4,15 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Acerca de Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "SIN EMBARGO, este navegador está caduco"> +<!ENTITY aboutTor.outOfDateTorOff.label "TAMBIÉN, este navegador está caduco"> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> -<!ENTITY aboutTor.success.label "Congratulations!"> +<!ENTITY aboutTor.success.label "Felicidades!"> <!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> <!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> @@ -21,7 +21,7 @@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "Buscar"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> @@ -29,7 +29,7 @@ <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> +<!ENTITY aboutTor.torInfo3.label "Nodo de salida"> <!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> <!ENTITY aboutTor.whatnextQuestion.label "What Next?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> @@ -45,5 +45,5 @@ <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "El proyecto Tor es una EEUU 501(c)(3) sin fines de lucro dedicada a la investigación, desarrollo, y educación sobre el anonimato y la privacidad en línea. "> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.learnMore.label "Aprenda más acerca del proyecto Tor"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 Aug '15

17 Aug '15

commit 635e264c9fca16c8b9610521a3dcbe20147f59c9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 17 14:45:15 2015 +0000 Update translations for https_everywhere --- es_MX/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index a7f3b69..cd3154a 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.enable_all "Enable All"> <!ENTITY https-everywhere.prefs.disable_all "Disable All"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> -<!ENTITY https-everywhere.prefs.search "Search"> +<!ENTITY https-everywhere.prefs.search "Buscar"> <!ENTITY https-everywhere.prefs.site "Site"> <!ENTITY https-everywhere.prefs.notes "Notes"> <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">

1 0

[onionoo/master] Add "measured" field to details documents.
by karsten＠torproject.org 17 Aug '15

17 Aug '15

commit e5eb41b5deb6a7ff32753d4cada03ca29745672e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 13 10:27:28 2015 +0200 Add "measured" field to details documents. Implements #16020. --- build.xml | 2 +- .../torproject/onionoo/docs/DetailsDocument.java | 8 ++++++ .../org/torproject/onionoo/docs/DetailsStatus.java | 8 ++++++ .../torproject/onionoo/server/ResponseBuilder.java | 4 ++- .../onionoo/updater/NodeDetailsStatusUpdater.java | 30 ++++++++++++++++++++ .../onionoo/writer/DetailsDocumentWriter.java | 1 + web/protocol.html | 15 ++++++++++ 7 files changed, 66 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 75dfe1c..f82b49d 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ <project default="dist" name="onionoo" basedir="."> - <property name="onionoo.protocol.version" value="2.4"/> + <property name="onionoo.protocol.version" value="2.5"/> <property name="release.version" value="${onionoo.protocol.version}.0"/> <property name="javasources" value="src/main/java"/> diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 2b65e50..aa410d8 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -362,5 +362,13 @@ public class DetailsDocument extends Document { public List<String> getTransports() { return this.transports; } + + private Boolean measured; + public void setMeasured(Boolean measured) { + this.measured = measured; + } + public Boolean getMeasured() { + return this.measured; + } } diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 09f0824..0a97fd3 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -295,6 +295,14 @@ public class DetailsStatus extends Document { return this.recommended_version; } + private Boolean measured; + public void setMeasured(Boolean measured) { + this.measured = measured; + } + public Boolean getMeasured() { + return this.measured; + } + /* From exit lists: */ private Map<String, Long> exit_addresses; diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index c7bfd65..ffd6ddb 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -70,7 +70,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "2.4"; + private static final String PROTOCOL_VERSION = "2.5"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; @@ -269,6 +269,8 @@ public class ResponseBuilder { dd.setTransports(detailsDocument.getTransports()); } else if (field.equals("effective_family")) { dd.setEffectiveFamily(detailsDocument.getEffectiveFamily()); + } else if (field.equals("measured")) { + dd.setMeasured(detailsDocument.getMeasured()); } } /* Don't escape HTML characters, like < and >, contained in diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 4fb0143..fdcd419 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -224,6 +224,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } } + private Map<String, Long> + lastSeenUnmeasured = new HashMap<String, Long>(), + lastSeenMeasured = new HashMap<String, Long>(); + private void processRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) { long validAfterMillis = consensus.getValidAfterMillis(); @@ -274,6 +278,17 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, entry.getVersion() == null) ? null : recommendedVersions.contains(entry.getVersion())); } + if (entry.getUnmeasured()) { + if (!this.lastSeenUnmeasured.containsKey(fingerprint) || + this.lastSeenUnmeasured.get(fingerprint) < validAfterMillis) { + this.lastSeenUnmeasured.put(fingerprint, validAfterMillis); + } + } else if (consensus.getConsensusMethod() >= 17) { + if (!this.lastSeenMeasured.containsKey(fingerprint) || + this.lastSeenMeasured.get(fingerprint) < validAfterMillis) { + this.lastSeenMeasured.put(fingerprint, validAfterMillis); + } + } } this.relayConsensusesProcessed++; if (this.relaysLastValidAfterMillis == validAfterMillis) { @@ -799,6 +814,21 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setLastRdnsLookup(this.startedRdnsLookups); } + if (detailsStatus.getLastSeenMillis() < + nodeStatus.getLastSeenMillis()) { + if (this.lastSeenMeasured.containsKey(fingerprint)) { + if (this.lastSeenUnmeasured.containsKey(fingerprint) && + this.lastSeenUnmeasured.get(fingerprint) > + this.lastSeenMeasured.get(fingerprint)) { + detailsStatus.setMeasured(false); + } else { + detailsStatus.setMeasured(true); + } + } else if (this.lastSeenUnmeasured.containsKey(fingerprint)) { + detailsStatus.setMeasured(false); + } + } + detailsStatus.setRelay(nodeStatus.isRelay()); detailsStatus.setRunning(nodeStatus.getLastSeenMillis() == (nodeStatus.isRelay() diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 152b4cb..6f60958 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -131,6 +131,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setExitAddresses(new ArrayList<String>( exitAddressesWithoutOrAddresses)); } + detailsDocument.setMeasured(detailsStatus.getMeasured()); this.documentStore.store(detailsDocument, fingerprint); } diff --git a/web/protocol.html b/web/protocol.html index 9f36e4d..6681faf 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -178,6 +178,8 @@ added "transports" field to bridge details documents on December 8, documents on March 22, 2015.</li> <li>2.4: Added optional "effective_family" field to details documents on July 3, 2015.</li> +<li>2.5: Added optional "measured" field to details +documents on August 13, 2015.</li> </ul> </div>  @@ -1257,6 +1259,19 @@ bandwidth weights. </li> +<li> +measured +<code class="typeof">boolean</code> +optional + +Boolean field saying whether the consensus weight of this relay is based +on a threshold of 3 or more measurements by Tor bandwidth authorities. +Omitted if the network status consensus containing this relay does not +contain measurement information. +Added on August 13, 2015. + +</li> + </ul> <h4>Bridge details objects</h4>

1 0

[tor/master] Fix an assertion failure introduced in 20254907d7
by nickm＠torproject.org 17 Aug '15

17 Aug '15

commit 2691b2bb064466c96c346e6a416658b8b4749a85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 17 09:50:47 2015 -0400 Fix an assertion failure introduced in 20254907d7 Fixes bug 16829; bug not in any released Tor. --- src/or/dirserv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e70b1b4..8eeba54 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -62,7 +62,7 @@ static uint32_t dirserv_get_status_impl(const char *fp, const char *nickname, uint32_t addr, uint16_t or_port, const char *platform, const char **msg, - int should_log); + int severity); static void clear_cached_dir(cached_dir_t *d); static const signed_descriptor_t *get_signed_descriptor_by_fp( const char *fp, @@ -290,7 +290,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, return dirserv_get_status_impl(d, router->nickname, router->addr, router->or_port, - router->platform, msg, 1); + router->platform, msg, severity); } /** Return true if there is no point in downloading the router described by

1 0