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

[tor/master] Use CONST_TO_OR_CIRCUIT() in v2/v3 rend cell detection.
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 7ae576edaf94159c824900ef09bee5bea99c8255 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 3 17:36:18 2020 +0200 Use CONST_TO_OR_CIRCUIT() in v2/v3 rend cell detection. --- src/core/or/command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/or/command.c b/src/core/or/command.c index 35dadb9fc8..7767217275 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -597,19 +597,19 @@ command_process_relay_cell(… [View More]

1 0

[tor/master] Add more docs about the HSv3 stat collection period.
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 0812ecd517af406aa82e5a5deddbbe799e9d8b49 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 3 19:19:02 2020 +0200 Add more docs about the HSv3 stat collection period. --- src/feature/stats/rephist.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index e0d8669cba..1501e46b14 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -1868,8 +1868,11 @@ … [View More]

1 0

[tor/master] Merge branch 'tor-gitlab/mr/182' into master
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 7c06707750f549fc22b74bdba7b9743d7b536e19 Merge: 6c61011781 0812ecd517 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 17 10:36:05 2020 -0500 Merge branch 'tor-gitlab/mr/182' into master changes/bug23126 | 4 + src/app/main/main.c | 2 + src/core/mainloop/mainloop.c | 6 +- src/core/or/command.c | 29 ++- src/core/or/or_circuit_st.h | 6 + src/… [View More]feature/hs/hs_cache.c | 6 +- src/feature/hs_common/shared_random_client.c | 21 +- src/feature/relay/router.c | 5 + src/feature/rend/rendcache.c | 2 +- src/feature/stats/rephist.c | 346 +++++++++++++++++++-------- src/feature/stats/rephist.h | 53 +++- src/test/hs_test_helpers.c | 19 +- src/test/hs_test_helpers.h | 4 + src/test/test_stats.c | 129 ++++++++++ 14 files changed, 513 insertions(+), 119 deletions(-) diff --cc src/feature/stats/rephist.c index 3c22fda3b8,1501e46b14..59f38fe603 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@@ -1765,71 -1851,110 +1851,110 @@@ hs_v3_stats_free_(hs_v3_stats_t *victim /** Clear history of hidden service statistics and set the measurement * interval start to now. */ static void - rep_hist_reset_hs_stats(time_t now) + rep_hist_reset_hs_v3_stats(time_t now) { - if (!hs_stats) { - hs_stats = hs_stats_new(); + if (!hs_v3_stats) { + hs_v3_stats = hs_v3_stats_new(); } - hs_stats->rp_relay_cells_seen = 0; + digest256map_free(hs_v3_stats->v3_onions_seen_this_period, NULL); + hs_v3_stats->v3_onions_seen_this_period = digest256map_new(); - digestmap_free(hs_stats->onions_seen_this_period, NULL); - hs_stats->onions_seen_this_period = digestmap_new(); + hs_v3_stats->rp_v3_relay_cells_seen = 0; - start_of_hs_stats_interval = now; + start_of_hs_v3_stats_interval = now; } - /** Stop collecting hidden service stats in a way that we can re-start - * doing so in rep_hist_buffer_stats_init(). */ - void - rep_hist_hs_stats_term(void) + /** Return true if it's a good time to collect v3 stats. + * + * v3 stats have a strict stats collection period (from 12:00UTC to 12:00UTC + * on the real network). We don't want to collect statistics if (for example) + * we just booted and it's 03:00UTC; we will wait until 12:00UTC before we + * start collecting statistics to make sure that the final result represents + * the whole collection period. This behavior is controlled by + * rep_hist_hs_stats_init(). + */ + MOCK_IMPL(STATIC bool, + should_collect_v3_stats,(void)) { - rep_hist_reset_hs_stats(0); + return start_of_hs_v3_stats_interval <= approx_time(); } - /** We saw a new HS relay cell, Count it! */ + /** We just received a new descriptor with blinded_key. See if we've + * seen this blinded key before, and if not add it to the stats. */ void - rep_hist_seen_new_rp_cell(void) + rep_hist_hsdir_stored_maybe_new_v3_onion(const uint8_t *blinded_key) { - if (!hs_stats) { - return; // We're not collecting stats + /* Return early if we don't collect HSv3 stats, or if it's not yet the time + * to collect them. */ + if (!hs_v3_stats || !should_collect_v3_stats()) { + return; } - hs_stats->rp_relay_cells_seen++; + bool seen_before = + !!digest256map_get(hs_v3_stats->v3_onions_seen_this_period, + blinded_key); + + log_info(LD_GENERAL, "Considering v3 descriptor with %s (%sseen before)", + safe_str(hex_str((char*)blinded_key, 32)), + seen_before ? "" : "not "); + + /* Count it if we haven't seen it before. */ + if (!seen_before) { + digest256map_set(hs_v3_stats->v3_onions_seen_this_period, + blinded_key, (void*)(uintptr_t)1); + } } - /** As HSDirs, we saw another hidden service with public key - * pubkey. Check whether we have counted it before, if not - * count it now! */ + /** We saw a new HS relay cell: count it! + * If is_v2 is set then it's a v2 RP cell, otherwise it's a v3. */ void - rep_hist_stored_maybe_new_hs(const crypto_pk_t *pubkey) + rep_hist_seen_new_rp_cell(bool is_v2) { - char pubkey_hash[DIGEST_LEN]; + log_debug(LD_GENERAL, "New RP cell (%d)", is_v2); - if (!hs_stats) { - return; // We're not collecting stats + if (is_v2 && hs_v2_stats) { + hs_v2_stats->rp_v2_relay_cells_seen++; + } else if (!is_v2 && hs_v3_stats && should_collect_v3_stats()) { + hs_v3_stats->rp_v3_relay_cells_seen++; } + } - /* Get the digest of the pubkey which will be used to detect whether - we've seen this hidden service before or not. */ - if (crypto_pk_get_digest(pubkey, pubkey_hash) < 0) { - /* This fail should not happen; key has been validated by - descriptor parsing code first. */ - return; + /** Generic HS stats code */ + + /** Initialize v2 and v3 hidden service statistics. */ + void + rep_hist_hs_stats_init(time_t now) + { + if (!hs_v2_stats) { + hs_v2_stats = hs_v2_stats_new(); } - /* Check if this is the first time we've seen this hidden - service. If it is, count it as new. */ - if (!digestmap_get(hs_stats->onions_seen_this_period, - pubkey_hash)) { - digestmap_set(hs_stats->onions_seen_this_period, - pubkey_hash, (void*)(uintptr_t)1); + /* Start collecting v2 stats straight away */ + start_of_hs_v2_stats_interval = now; + + if (!hs_v3_stats) { + hs_v3_stats = hs_v3_stats_new(); } + + /* Start collecting v3 stats at the next 12:00 UTC */ + start_of_hs_v3_stats_interval = hs_get_start_time_of_next_time_period(now); + } + + /** Stop collecting hidden service stats in a way that we can re-start + * doing so in rep_hist_buffer_stats_init(). */ + void + rep_hist_hs_stats_term(void) + { + rep_hist_reset_hs_v2_stats(0); + rep_hist_reset_hs_v3_stats(0); } + /** Stats reporting code */ + /* The number of cells that are supposed to be hidden from the adversary * by adding noise from the Laplace distribution. This value, divided by - * EPSILON, is Laplace parameter b. It must be greather than 0. */ + * EPSILON, is Laplace parameter b. It must be greater than 0. */ #define REND_CELLS_DELTA_F 2048 /* Security parameter for obfuscating number of cells with a value between * ]0.0, 1.0]. Smaller values obfuscate observations more, but at the same [View Less]

1 0

[tor/master] Improve string formatting in rep_hist_format_hs_stats().
by dgoulet＠torproject.org 17 Nov '20

17 Nov '20

commit 810183aaf17aa23eb68260038345cb540a856f75 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 3 17:42:36 2020 +0200 Improve string formatting in rep_hist_format_hs_stats(). --- src/feature/stats/rephist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 7b4bc97bda..e0d8669cba 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2006,17 +2006,17 @@ … [View More]

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/184' into master
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 6c610117819a99eb33403be08ed7a11567ca65f9 Merge: 1b21d716ec 09b3af578d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:22:44 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/184' into master changes/bug33607 | 5 +++++ src/core/mainloop/connection.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[tor/master] Stop forcing IPv4 and IPv6 traffic on non-SOCKSPorts
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 09b3af578d3dd57f91d3d21c74e86a36c32cbd0e Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Oct 27 17:57:48 2020 -0700 Stop forcing IPv4 and IPv6 traffic on non-SOCKSPorts --- changes/bug33607 | 5 +++++ src/core/mainloop/connection.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/changes/bug33607 b/changes/bug33607 new file mode 100644 index 0000000000..c18d37b0d3 --- /dev/null +++ b/changes/bug33607 @@ -0,0 +1,5 @@ + o Minor … [View More]

1 0

[tor/master] Add {release, maint}-0.4.5 to git-list-tor-branches.sh
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 1b21d716ec4bcbcae68ba8aa3e81e4a9ff5ca483 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:04:55 2020 -0500 Add {release,maint}-0.4.5 to git-list-tor-branches.sh --- scripts/git/git-list-tor-branches.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index 5a527ffc05..61ec9809e9 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -… [View More]

1 0

[tor/master] Bump version to 0.4.6.0-alpha-dev
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit aed2a48c664dad17f58f51c161731a62f876a706 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:01:08 2020 -0500 Bump version to 0.4.6.0-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c880375988..132179a5a9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ … [View More]

1 0

[tor/master] changes: Add file for #40071
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 9aaac94cc3d2b4768bbac1e40396b74373f7bc5a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Nov 12 12:39:25 2020 -0500 changes: Add file for #40071 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40071 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/ticket40071 b/changes/ticket40071 new file mode 100644 index 0000000000..1e294a68e7 --- /dev/null +++ b/changes/ticket40071 @@ -0,0 +1,7 @@ + o Minor bugfixes (… [View More]

1 0

[tor/master] Merge branch 'ticket40071_045_01_squashed' into master
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit b13f32ee97e9a10e578c6f01775a1e2449b28693 Merge: 41bea71adc 9aaac94cc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 07:58:37 2020 -0500 Merge branch 'ticket40071_045_01_squashed' into master changes/ticket40071 | 7 ++++ src/core/or/circuitlist.h | 4 ++- src/feature/nodelist/routerlist.c | 54 ++--------------------------- src/feature/relay/relay_find_addr.c | 68 +++++++++++++++++++++++++++++++++++++ src/feature/relay/… [View More]

1 0