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

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit cbe04d455016233f4759fe281c07dd7db6096c2a Merge: aebe8a82c 8569166c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:54:16 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug24104 | 4 ++ src/or/rephist.c | 7 ++- src/or/rephist.h | 5 +- src/or/router.c | 25 +++++++-- src/test/log_test_helpers.c | 23 +++++++- src/test/log_test_helpers.h | 8 ++- src/test/test_router.c | 124 +++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 179 insertions(+), 17 deletions(-) diff --cc src/or/rephist.c index 43494692c,2844c4d74..67e4d3150 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -3205,4 -3292,4 +3205,3 @@@ rep_hist_free_all(void tor_assert_nonfatal(rephist_total_alloc == 0); tor_assert_nonfatal_once(rephist_total_num == 0); } -- diff --cc src/or/rephist.h index 507272159,6d35ac67f..3e64a3de4 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -111,30 -119,5 +111,29 @@@ extern int onion_handshakes_requested[M extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1]; #endif -#endif - +/** + * Represents the type of a cell for padding accounting + */ +typedef enum padding_type_t { + /** A RELAY_DROP cell */ + PADDING_TYPE_DROP, + /** A CELL_PADDING cell */ + PADDING_TYPE_CELL, + /** Total counts of padding and non-padding together */ + PADDING_TYPE_TOTAL, + /** Total cell counts for all padding-enabled channels */ + PADDING_TYPE_ENABLED_TOTAL, + /** CELL_PADDING counts for all padding-enabled channels */ + PADDING_TYPE_ENABLED_CELL +} padding_type_t; + +/** The amount of time over which the padding cell counts were counted */ +#define REPHIST_CELL_PADDING_COUNTS_INTERVAL (24*60*60) +void rep_hist_padding_count_read(padding_type_t type); +void rep_hist_padding_count_write(padding_type_t type); +char *rep_hist_get_padding_count_lines(void); +void rep_hist_reset_padding_counts(void); +void rep_hist_prep_published_padding_counts(time_t now); +void rep_hist_padding_count_timers(uint64_t num_timers); + +#endif /* !defined(TOR_REPHIST_H) */ - diff --cc src/test/log_test_helpers.c index d5a39cfee,c5368b6cb..1ad01afc8 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@@ -238,4 -258,4 +258,3 @@@ mock_dump_saved_logs(void escaped(m->generated_msg)); } SMARTLIST_FOREACH_END(m); } -- diff --cc src/test/log_test_helpers.h index 70c584eb3,a087b913f..f74028a8a --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@@ -101,5 -106,5 +106,4 @@@ void mock_dump_saved_logs(void) assert_log_predicate(!mock_saved_log_has_entry(), \ "expected log to not contain entries"); -#endif - +#endif /* !defined(TOR_LOG_TEST_HELPERS_H) */ - diff --cc src/test/test_router.c index 4e96e2453,51055a336..84473822a --- a/src/test/test_router.c +++ b/src/test/test_router.c @@@ -8,105 -7,136 +8,227 @@@ **/ #include "or.h" +#include "config.h" +#include "crypto_curve25519.h" +#include "crypto_ed25519.h" + #include "hibernate.h" -#include "log_test_helpers.h" + #include "main.h" + #include "rephist.h" #include "router.h" +#include "routerlist.h" + +/* Test suite stuff */ #include "test.h" ++#include "log_test_helpers.h" + +NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void)); + +static routerinfo_t* mock_routerinfo; + +static const routerinfo_t* +NS(router_get_my_routerinfo)(void) +{ + crypto_pk_t* ident_key; + crypto_pk_t* tap_key; + time_t now; + + if (!mock_routerinfo) { + /* Mock the published timestamp, otherwise router_dump_router_to_string() + * will poop its pants. */ + time(&now); + + /* We'll need keys, or router_dump_router_to_string() would return NULL. */ + ident_key = pk_generate(0); + tap_key = pk_generate(0); + + tor_assert(ident_key != NULL); + tor_assert(tap_key != NULL); + + mock_routerinfo = tor_malloc_zero(sizeof(routerinfo_t)); + mock_routerinfo->nickname = tor_strdup("ConlonNancarrow"); + mock_routerinfo->addr = 123456789; + mock_routerinfo->or_port = 443; + mock_routerinfo->platform = tor_strdup("unittest"); + mock_routerinfo->cache_info.published_on = now; + mock_routerinfo->identity_pkey = crypto_pk_dup_key(ident_key); + mock_routerinfo->onion_pkey = crypto_pk_dup_key(tap_key); + mock_routerinfo->bandwidthrate = 9001; + mock_routerinfo->bandwidthburst = 9002; + } + + return mock_routerinfo; +} + +/* If no distribution option was set, then check_bridge_distribution_setting() + * should have set it to "any". */ +static void +test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) +{ + const char* needle = "bridge-distribution-request any"; + or_options_t* options = get_options_mutable(); + routerinfo_t* router = NULL; + curve25519_keypair_t ntor_keypair; + ed25519_keypair_t signing_keypair; + char* desc = NULL; + char* found = NULL; + (void)arg; + + NS_MOCK(router_get_my_routerinfo); + + options->ORPort_set = 1; + options->BridgeRelay = 1; + + /* Generate keys which router_dump_router_to_string() expects to exist. */ + tt_int_op(0, ==, curve25519_keypair_generate(&ntor_keypair, 0)); + tt_int_op(0, ==, ed25519_keypair_generate(&signing_keypair, 0)); + + /* Set up part of our routerinfo_t so that we don't trigger any other + * assertions in router_dump_router_to_string(). */ + router = (routerinfo_t*)router_get_my_routerinfo(); + tt_ptr_op(router, !=, NULL); + + router->onion_curve25519_pkey = &ntor_keypair.pubkey; + + /* Generate our server descriptor and ensure that the substring + * "bridge-distribution-request any" occurs somewhere within it. */ + desc = router_dump_router_to_string(router, + router->identity_pkey, + router->onion_pkey, + &ntor_keypair, + &signing_keypair); + tt_ptr_op(desc, !=, NULL); + found = strstr(desc, needle); + tt_ptr_op(found, !=, NULL); + + done: + NS_UNMOCK(router_get_my_routerinfo); + + tor_free(desc); +} + static routerinfo_t *mock_router_get_my_routerinfo_result = NULL; + + static const routerinfo_t * + mock_router_get_my_routerinfo(void) + { + return mock_router_get_my_routerinfo_result; + } + + static long + mock_get_uptime_3h(void) + { + return 3*60*60; + } + + static long + mock_get_uptime_1d(void) + { + return 24*60*60; + } + + static int + mock_rep_hist_bandwidth_assess(void) + { + return 20001; + } + + static int + mock_we_are_not_hibernating(void) + { + return 0; + } + + static int + mock_we_are_hibernating(void) + { + return 0; + } + + static void + test_router_check_descriptor_bandwidth_changed(void *arg) + { + (void)arg; + routerinfo_t routerinfo; + memset(&routerinfo, 0, sizeof(routerinfo)); + mock_router_get_my_routerinfo_result = NULL; + + MOCK(we_are_hibernating, mock_we_are_not_hibernating); + MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo); + mock_router_get_my_routerinfo_result = &routerinfo; + + /* When uptime is less than 24h, no previous bandwidth, no last_changed + * Uptime: 10800, last_changed: 0, Previous bw: 0, Current bw: 0 */ + routerinfo.bandwidthcapacity = 0; + MOCK(get_uptime, mock_get_uptime_3h); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h, previous bandwidth, + * last_changed more than 3h ago + * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */ + routerinfo.bandwidthcapacity = 10000; + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h, previous bandwidth, + * last_changed more than 3h ago, and hibernating + * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */ + + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_hibernating); + routerinfo.bandwidthcapacity = 10000; + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_not_hibernating); + + /* When uptime is less than 24h, last_changed is not more than 3h ago + * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 0 */ + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h and bandwidthcapacity does not change + * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 20001 */ + MOCK(rep_hist_bandwidth_assess, mock_rep_hist_bandwidth_assess); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL) + 6*60*60 + 1); + expect_log_msg_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + UNMOCK(get_uptime); + UNMOCK(rep_hist_bandwidth_assess); + teardown_capture_of_logs(); + + /* When uptime is more than 24h */ + MOCK(get_uptime, mock_get_uptime_1d); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + done: + UNMOCK(get_uptime); + UNMOCK(router_get_my_routerinfo); + UNMOCK(we_are_hibernating); + } + #define ROUTER_TEST(name, flags) \ { #name, test_router_ ## name, flags, NULL, NULL } struct testcase_t router_tests[] = { + ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK), + ROUTER_TEST(check_descriptor_bandwidth_changed, TT_FORK), END_OF_TESTCASES }; --

1 0

[tor/maint-0.2.9] Check bandwidth changes only if small uptime
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 7d70f67deaeea1a3dc80a763f13bcec5d7a2425d Author: juga0 <juga(a)riseup.net> Date: Sun Jun 3 09:31:19 2018 +0000 Check bandwidth changes only if small uptime to upload a new descriptor. --- src/or/router.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index 31f2ff00d..ab916fb6e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2425,13 +2425,24 @@ mark_my_descriptor_dirty(const char *reason) * if our previous bandwidth estimate was exactly 0. */ #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60) +/** Maximum uptime to republish our descriptor because of large shifts in + * estimated bandwidth. */ +#define MAX_UPTIME_BANDWIDTH_CHANGE (24*60*60) + /** Check whether bandwidth has changed a lot since the last time we announced - * bandwidth. If so, mark our descriptor dirty. */ + * bandwidth while the uptime is smaller than MAX_UPTIME_BANDWIDTH_CHANGE. + * If so, mark our descriptor dirty. */ void check_descriptor_bandwidth_changed(time_t now) { static time_t last_changed = 0; uint64_t prev, cur; + + /* If the relay uptime is bigger than MAX_UPTIME_BANDWIDTH_CHANGE, + * the next regularly scheduled descriptor update (18h) will be enough */ + if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE) + return; + if (!router_get_my_routerinfo()) return;

1 0

[tor/maint-0.2.9] Make bandwidth change factor a constant
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 6210d568ecc5c2fd1833126d68505f42e4399820 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 3 09:40:57 2018 +0000 Make bandwidth change factor a constant used to determine large changes in bandwidth. --- src/or/router.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index ab916fb6e..4afba6549 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2429,6 +2429,9 @@ mark_my_descriptor_dirty(const char *reason) * estimated bandwidth. */ #define MAX_UPTIME_BANDWIDTH_CHANGE (24*60*60) +/** By which factor bandwidth shifts have to change to be considered large. */ +#define BANDWIDTH_CHANGE_FACTOR 2 + /** Check whether bandwidth has changed a lot since the last time we announced * bandwidth while the uptime is smaller than MAX_UPTIME_BANDWIDTH_CHANGE. * If so, mark our descriptor dirty. */ @@ -2449,8 +2452,8 @@ check_descriptor_bandwidth_changed(time_t now) prev = router_get_my_routerinfo()->bandwidthcapacity; cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || - cur > prev*2 || - cur < prev/2) { + cur > (prev * BANDWIDTH_CHANGE_FACTOR) || + cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) { if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor.");

1 0

[tor/maint-0.2.9] Allow mocking rep_hist_bandwidth_assess
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit e13ddee1665bc83442be04820b51b425fa98e848 Author: juga0 <juga(a)riseup.net> Date: Sat Jun 9 12:54:08 2018 +0000 Allow mocking rep_hist_bandwidth_assess --- src/or/rephist.c | 6 +++--- src/or/rephist.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index f0bac5789..2844c4d74 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1,5 +1,5 @@ /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2016, The Tor Project, Inc. */ + * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -1427,8 +1427,8 @@ find_largest_max(bw_array_t *b) * * Return the smaller of these sums, divided by NUM_SECS_ROLLING_MEASURE. */ -int -rep_hist_bandwidth_assess(void) +MOCK_IMPL(int, +rep_hist_bandwidth_assess,(void)) { uint64_t w,r; r = find_largest_max(read_array); diff --git a/src/or/rephist.h b/src/or/rephist.h index ff4810a56..6d35ac67f 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -1,7 +1,7 @@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2016, The Tor Project, Inc. */ + * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -29,7 +29,7 @@ void rep_hist_make_router_pessimal(const char *id, time_t when); void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); -int rep_hist_bandwidth_assess(void); +MOCK_DECL(int, rep_hist_bandwidth_assess, (void)); char *rep_hist_get_bandwidth_lines(void); void rep_hist_update_state(or_state_t *state); int rep_hist_load_state(or_state_t *state, char **err);

1 0

[tor/maint-0.2.9] Add test log helpers for msgs not containing str
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 842b18ab26ac12da7e63c38413d193905b8fbed5 Author: juga0 <juga(a)riseup.net> Date: Sat Jun 9 10:34:17 2018 +0000 Add test log helpers for msgs not containing str --- src/test/log_test_helpers.c | 22 +++++++++++++++++++++- src/test/log_test_helpers.h | 7 ++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index c788a33c1..c5368b6cb 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Tor Project, Inc. */ +/* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define LOG_PRIVATE #include "torlog.h" @@ -158,6 +158,26 @@ mock_saved_log_has_message_containing(const char *msg) return 0; } +/** + * Return true iff there is not a message recorded by log capture + * that contains <b>msg</b> as a substring. + */ +int +mock_saved_log_has_message_not_containing(const char *msg) +{ + if (saved_logs) { + SMARTLIST_FOREACH( + saved_logs, mock_saved_log_entry_t *, m, + { + if (msg && m->generated_msg && strstr(m->generated_msg, msg)) + return 0; + } + ); + } + + return 1; +} + /** Return true iff the saved logs have any messages with <b>severity</b> */ int mock_saved_log_has_severity(int severity) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 922c68b42..a087b913f 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Tor Project, Inc. */ +/* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #include "or.h" @@ -24,6 +24,7 @@ void teardown_capture_of_logs(void); int mock_saved_log_has_message(const char *msg); int mock_saved_log_has_message_containing(const char *msg); +int mock_saved_log_has_message_not_containing(const char *msg); int mock_saved_log_has_severity(int severity); int mock_saved_log_has_entry(void); int mock_saved_log_n_entries(void); @@ -46,6 +47,10 @@ void mock_dump_saved_logs(void); assert_log_predicate(mock_saved_log_has_message_containing(str), \ "expected log to contain " # str); +#define expect_log_msg_not_containing(str) \ + assert_log_predicate(mock_saved_log_has_message_not_containing(str), \ + "expected log to not contain " # str); + #define expect_log_msg_containing_either(str1, str2) \ assert_log_predicate(mock_saved_log_has_message_containing(str1) || \ mock_saved_log_has_message_containing(str2), \

1 0

[tor/maint-0.2.9] Add changes file
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit bbb82a52491de244fbdf5d7b6f22ae26f8b4ea19 Author: juga0 <juga(a)riseup.net> Date: Mon Jun 4 20:40:21 2018 +0000 Add changes file --- changes/bug24104 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug24104 b/changes/bug24104 new file mode 100644 index 000000000..ca2a3537f --- /dev/null +++ b/changes/bug24104 @@ -0,0 +1,4 @@ + o Minor bugfix (relay statistics): + - Update relay descriptor on bandwidth changes only when the uptime is + smaller than 24h in order to reduce the efficiency of guard discovery + attacks. Fixes bug 24104; bugfix on 0.1.1.6-alpha.

1 0

[tor/maint-0.2.9] Add test for check_descriptor_bandwidth_changed
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 1066fdd8d1e084ef38281c9817032e68e2a490ff Author: juga0 <juga(a)riseup.net> Date: Sat Jun 9 10:34:41 2018 +0000 Add test for check_descriptor_bandwidth_changed --- src/test/include.am | 1 + src/test/test_router.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index 0ee3d1169..7864d7d9f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -117,6 +117,7 @@ src_test_test_SOURCES = \ src/test/test_relaycell.c \ src/test/test_rendcache.c \ src/test/test_replay.c \ + src/test/test_router.c \ src/test/test_routerkeys.c \ src/test/test_routerlist.c \ src/test/test_routerset.c \ diff --git a/src/test/test_router.c b/src/test/test_router.c new file mode 100644 index 000000000..a4921da9b --- /dev/null +++ b/src/test/test_router.c @@ -0,0 +1,120 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_router.c + * \brief Unittests for code in src/or/router.c + **/ + +#include "or.h" +#include "hibernate.h" +#include "log_test_helpers.h" +#include "main.h" +#include "rephist.h" +#include "router.h" +#include "test.h" + +static routerinfo_t *mock_router_get_my_routerinfo_result = NULL; + +static const routerinfo_t * +mock_router_get_my_routerinfo(void) +{ + return mock_router_get_my_routerinfo_result; +} + +static long +mock_get_uptime_3h(void) +{ + return 3*60*60; +} + +static long +mock_get_uptime_1d(void) +{ + return 24*60*60; +} + +static int +mock_rep_hist_bandwidth_assess(void) +{ + return 20001; +} + +static int +mock_we_are_hibernating(void) +{ + return 0; +} + +static void +test_router_check_descriptor_bandwidth_changed(void *arg) +{ + (void)arg; + routerinfo_t routerinfo; + memset(&routerinfo, 0, sizeof(routerinfo)); + mock_router_get_my_routerinfo_result = NULL; + + MOCK(we_are_hibernating, mock_we_are_hibernating); + MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo); + mock_router_get_my_routerinfo_result = &routerinfo; + + /* When uptime is less than 24h, no previous bandwidth, no last_changed + * Uptime: 10800, last_changed: 0, Previous bw: 0, Current bw: 0 */ + routerinfo.bandwidthcapacity = 0; + MOCK(get_uptime, mock_get_uptime_3h); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h, previous bandwidth, + * last_changed more than 3h ago + * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */ + routerinfo.bandwidthcapacity = 10000; + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h, last_changed is not more than 3h ago + * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 0 */ + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + + /* When uptime is less than 24h and bandwidthcapacity does not change + * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 20001 */ + MOCK(rep_hist_bandwidth_assess, mock_rep_hist_bandwidth_assess); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL) + 6*60*60 + 1); + expect_log_msg_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + UNMOCK(get_uptime); + UNMOCK(rep_hist_bandwidth_assess); + teardown_capture_of_logs(); + + /* When uptime is more than 24h */ + MOCK(get_uptime, mock_get_uptime_1d); + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + UNMOCK(get_uptime); + teardown_capture_of_logs(); + + done: + UNMOCK(router_get_my_routerinfo); +} + +#define ROUTER_TEST(name, flags) \ + { #name, test_router_ ## name, flags, NULL, NULL } + +struct testcase_t router_tests[] = { + ROUTER_TEST(check_descriptor_bandwidth_changed, TT_FORK), + END_OF_TESTCASES +}; +

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 8569166c70f99bf908e78ce272e71eb60cdc84d0 Merge: 7f042cbc0 81f422332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:43:50 2018 -0500 Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9 Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f. changes/bug24104 | 4 ++ src/or/rephist.c | 6 +- src/or/rephist.h | 4 +- src/or/router.c | 25 ++++++-- src/test/include.am | 1 + src/test/log_test_helpers.c | 22 ++++++- src/test/log_test_helpers.h | 7 ++- src/test/test.c | 1 + src/test/test_router.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 200 insertions(+), 12 deletions(-) diff --cc src/or/router.c index 35b6bd203,f1a99364e..c41647422 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2433,15 -2440,21 +2441,23 @@@ check_descriptor_bandwidth_changed(time { static time_t last_changed = 0; uint64_t prev, cur; + const routerinfo_t *my_ri = router_get_my_routerinfo(); ++ + int hibernating = we_are_hibernating(); + + /* If the relay uptime is bigger than MAX_UPTIME_BANDWIDTH_CHANGE, + * the next regularly scheduled descriptor update (18h) will be enough */ + if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE && !hibernating) + return; + - if (!router_get_my_routerinfo()) + if (!my_ri) /* make sure routerinfo exists */ return; - prev = router_get_my_routerinfo()->bandwidthcapacity; + prev = my_ri->bandwidthcapacity; - cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); + cur = hibernating ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || - cur > prev*2 || - cur < prev/2) { + cur > (prev * BANDWIDTH_CHANGE_FACTOR) || + cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) { if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); @@@ -3640,4 -3652,4 +3656,3 @@@ router_get_all_orports(const routerinfo fake_node.ri = (routerinfo_t *)ri; return node_get_all_orports(&fake_node); } --

1 0

[tor/maint-0.2.9] Test for descriptor does not change when hibernating
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 81f4223329a709e5138532b037a58c118b30dd7f Author: juga0 <juga(a)riseup.net> Date: Mon Jul 2 09:02:32 2018 +0000 Test for descriptor does not change when hibernating --- src/test/test_router.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/test/test_router.c b/src/test/test_router.c index a4921da9b..51055a336 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -41,6 +41,12 @@ mock_rep_hist_bandwidth_assess(void) } static int +mock_we_are_not_hibernating(void) +{ + return 0; +} + +static int mock_we_are_hibernating(void) { return 0; @@ -54,7 +60,7 @@ test_router_check_descriptor_bandwidth_changed(void *arg) memset(&routerinfo, 0, sizeof(routerinfo)); mock_router_get_my_routerinfo_result = NULL; - MOCK(we_are_hibernating, mock_we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_not_hibernating); MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo); mock_router_get_my_routerinfo_result = &routerinfo; @@ -78,6 +84,21 @@ test_router_check_descriptor_bandwidth_changed(void *arg) "Measured bandwidth has changed; rebuilding descriptor."); teardown_capture_of_logs(); + /* When uptime is less than 24h, previous bandwidth, + * last_changed more than 3h ago, and hibernating + * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */ + + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_hibernating); + routerinfo.bandwidthcapacity = 10000; + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_not_hibernating); + /* When uptime is less than 24h, last_changed is not more than 3h ago * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 0 */ setup_full_capture_of_logs(LOG_INFO); @@ -103,11 +124,12 @@ test_router_check_descriptor_bandwidth_changed(void *arg) check_descriptor_bandwidth_changed(time(NULL)); expect_log_msg_not_containing( "Measured bandwidth has changed; rebuilding descriptor."); - UNMOCK(get_uptime); teardown_capture_of_logs(); done: + UNMOCK(get_uptime); UNMOCK(router_get_my_routerinfo); + UNMOCK(we_are_hibernating); } #define ROUTER_TEST(name, flags) \

1 0

[tor/maint-0.2.9] Check descriptor bandwidth changed if not hibernating
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit e033d98f79a950a342a7db6909709b5dc987b2cb Author: juga0 <juga(a)riseup.net> Date: Mon Jul 2 08:21:43 2018 +0000 Check descriptor bandwidth changed if not hibernating There should be a separate check to update descriptor when start or end hibernating. --- src/or/router.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 4afba6549..f1a99364e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2440,17 +2440,18 @@ check_descriptor_bandwidth_changed(time_t now) { static time_t last_changed = 0; uint64_t prev, cur; + int hibernating = we_are_hibernating(); /* If the relay uptime is bigger than MAX_UPTIME_BANDWIDTH_CHANGE, * the next regularly scheduled descriptor update (18h) will be enough */ - if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE) + if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE && !hibernating) return; if (!router_get_my_routerinfo()) return; prev = router_get_my_routerinfo()->bandwidthcapacity; - cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); + cur = hibernating ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || cur > (prev * BANDWIDTH_CHANGE_FACTOR) || cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {

1 0