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

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit d612f7d9508e4233c9e49c077f27b0393a00508e Merge: 066d25767 8af8ecabb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:56:11 2018 -0500 Merge branch 'maint-0.3.5'

1 0

[tor/master] 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/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 8af8ecabbe429503a4ff9d5510df610907c6e45a Merge: c0e18d2f8 15e752e6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:55:42 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid duplicating conflict resolution in merge of 24104

1 0

[tor/release-0.3.3] Add missing router_tests to test.h
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit d4e51a2eeb173fab25d3945d045499b80cb4565c Author: juga0 <juga(a)riseup.net> Date: Mon Jul 2 08:48:36 2018 +0000 Add missing router_tests to test.h --- src/test/test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..4632ea497 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1240,6 +1240,7 @@ struct testgroup_t testgroups[] = { { "relaycell/", relaycell_tests }, { "rend_cache/", rend_cache_tests }, { "replaycache/", replaycache_tests }, + { "router/", router_tests }, { "routerkeys/", routerkeys_tests }, { "routerlist/", routerlist_tests }, { "routerset/" , routerset_tests },

1 0

[tor/release-0.3.3] 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/release-0.3.3] 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/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 15e752e6b111e159b1dee3bb4692d8de3c4d1c7f Merge: 63312e029 cbe04d455 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:54:56 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug24104 | 4 ++ src/or/rephist.c | 7 ++- src/or/rephist.h | 5 +- src/or/router.c | 24 +++++++-- 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(+), 16 deletions(-) diff --cc src/or/router.c index 5485ec913,edaa040dd..03959e907 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2642,13 -2544,10 +2658,13 @@@ check_descriptor_bandwidth_changed(time return; prev = my_ri->bandwidthcapacity; + + /* Consider ourselves to have zero bandwidth if we're hibernating or + * shutting down. */ - 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.");

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 8af8ecabbe429503a4ff9d5510df610907c6e45a Merge: c0e18d2f8 15e752e6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:55:42 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid duplicating conflict resolution in merge of 24104

1 0

[tor/release-0.3.3] 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/release-0.3.3] 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