- tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit b76ae3898d5d6e34c291f8e0506147a5bd4cbc07 Merge: 8bc3ac6a8 091f8688b Author: teor <teor(a)torproject.org> Date: Tue Mar 26 11:48:52 2019 +1000 Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 ++++++- src/test/test_dir.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --cc src/test/test_dir.c index 4132d42d1,0e44c47f3..b9a48c650 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -2029,8 -1998,45 +2048,46 @@@ test_dir_dirserv_read_measured_bandwidt smartlist_free(bw_file_headers); tor_free(bw_file_headers_str); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: + unlink(fname); tor_free(fname); tor_free(header_lines_v100); tor_free(header_lines_v110_no_terminator);

1 0

[tor/release-0.4.0] bwauth: Ignore bandwidth file lines with "vote=0"
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 4ab2e9a5990bd6f1fd65f2600dc7487686c801ff Author: juga0 <juga(a)riseup.net> Date: Tue Mar 19 11:48:42 2019 +0000 bwauth: Ignore bandwidth file lines with "vote=0" so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806. --- changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/changes/ticket29806 b/changes/ticket29806 new file mode 100644 index 000000000..6afefd4c0 --- /dev/null +++ b/changes/ticket29806 @@ -0,0 +1,7 @@ + o Minor features (bandwidth authority): + - Make bandwidth authorities to ignore relays that are reported in the + bandwidth file with the key-value "vote=0". + This change allows to report the relays that were not measured due + some failure and diagnose the reasons without the bandwidth being included in the + bandwidth authorities vote. + Closes ticket 29806. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4e09c1c65..ae1975f16 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2497,7 +2497,13 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line, } do { - if (strcmpstart(cp, "bw=") == 0) { + // If the line contains vote=0, ignore it. + if (strcmpstart(cp, "vote=0") == 0) { + log_debug(LD_DIRSERV, "Ignoring bandwidth file line that contains " + "vote=0: %s",escaped(orig_line)); + tor_free(line); + return -1; + } else if (strcmpstart(cp, "bw=") == 0) { int parse_ok = 0; char *endptr; if (got_bw) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 37b015b72..52d3ef159 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1508,6 +1508,19 @@ test_dir_measured_bw_kb(void *arg) /* check whether node_id can be at the end and something in the * in the middle of bw and node_id */ "bw=1024 foo=bar node_id=$557365204145532d32353620696e73746561642e\n", + + /* Test that a line with vote=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1\n", + /* Test that a line with unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=1\n", + /* Test that a line with vote=1 and unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=1\n", + /* Test that a line with unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=0\n", + /* Test that a line with vote=1 and unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=0\n", "end" }; const char *lines_fail[] = { @@ -1541,6 +1554,12 @@ test_dir_measured_bw_kb(void *arg) "node_id=$55736520414552d32353620696e73746561642e bw=1024\n", "node_id=557365204145532d32353620696e73746561642e bw=1024\n", "node_id= $557365204145532d32353620696e73746561642e bw=0.23\n", + + /* Test that a line with vote=0 will fail too, so that it is ignored. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", + /* Test that a line with vote=0 will fail even if unmeasured=0. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n", "end" }; @@ -1706,6 +1725,44 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: tor_free(fname); }

1 0

[tor/release-0.4.0] test/dir: add an extra argument to dirserv_read_measured_bandwidths()
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 091f8688b8ee15b57ed5bc24bac12a7a0b7f5725 Author: teor <teor(a)torproject.org> Date: Thu Mar 21 12:56:28 2019 +1000 test/dir: add an extra argument to dirserv_read_measured_bandwidths() Part of 29806. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cbb414ed6..0e44c47f3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2014,7 +2014,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_containing("Ignoring bandwidth file line"); teardown_capture_of_logs(); @@ -2032,7 +2032,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_not_containing("Ignoring bandwidth file line"); teardown_capture_of_logs();

1 0

[tor/release-0.3.4] Merge branch 'tor-github/pr/820' into maint-0.3.4
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit ee43bc706cd27c23f64833526190c640f1be8c87 Merge: d7a5fdcb7 4ab2e9a59 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 26 01:24:26 2019 +0200 Merge branch 'tor-github/pr/820' into maint-0.3.4 changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] test/dir: add a 4th argument to dirserv_read_measured_bandwidths()
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 3af9a51118aadde538580f6d4f8043a0a9bba512 Author: teor <teor(a)torproject.org> Date: Thu Mar 21 23:35:56 2019 +1000 test/dir: add a 4th argument to dirserv_read_measured_bandwidths() Part of 29806. --- src/test/test_dir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b9a48c650..07a2641c9 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2064,7 +2064,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL, + NULL)); expect_log_msg_containing("Ignoring bandwidth file line"); teardown_capture_of_logs(); @@ -2082,7 +2083,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL, + NULL)); expect_log_msg_not_containing("Ignoring bandwidth file line"); teardown_capture_of_logs();

1 0

[tor/maint-0.4.0] bwauth: Ignore bandwidth file lines with "vote=0"
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 4ab2e9a5990bd6f1fd65f2600dc7487686c801ff Author: juga0 <juga(a)riseup.net> Date: Tue Mar 19 11:48:42 2019 +0000 bwauth: Ignore bandwidth file lines with "vote=0" so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806. --- changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/changes/ticket29806 b/changes/ticket29806 new file mode 100644 index 000000000..6afefd4c0 --- /dev/null +++ b/changes/ticket29806 @@ -0,0 +1,7 @@ + o Minor features (bandwidth authority): + - Make bandwidth authorities to ignore relays that are reported in the + bandwidth file with the key-value "vote=0". + This change allows to report the relays that were not measured due + some failure and diagnose the reasons without the bandwidth being included in the + bandwidth authorities vote. + Closes ticket 29806. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4e09c1c65..ae1975f16 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2497,7 +2497,13 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line, } do { - if (strcmpstart(cp, "bw=") == 0) { + // If the line contains vote=0, ignore it. + if (strcmpstart(cp, "vote=0") == 0) { + log_debug(LD_DIRSERV, "Ignoring bandwidth file line that contains " + "vote=0: %s",escaped(orig_line)); + tor_free(line); + return -1; + } else if (strcmpstart(cp, "bw=") == 0) { int parse_ok = 0; char *endptr; if (got_bw) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 37b015b72..52d3ef159 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1508,6 +1508,19 @@ test_dir_measured_bw_kb(void *arg) /* check whether node_id can be at the end and something in the * in the middle of bw and node_id */ "bw=1024 foo=bar node_id=$557365204145532d32353620696e73746561642e\n", + + /* Test that a line with vote=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1\n", + /* Test that a line with unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=1\n", + /* Test that a line with vote=1 and unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=1\n", + /* Test that a line with unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=0\n", + /* Test that a line with vote=1 and unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=0\n", "end" }; const char *lines_fail[] = { @@ -1541,6 +1554,12 @@ test_dir_measured_bw_kb(void *arg) "node_id=$55736520414552d32353620696e73746561642e bw=1024\n", "node_id=557365204145532d32353620696e73746561642e bw=1024\n", "node_id= $557365204145532d32353620696e73746561642e bw=0.23\n", + + /* Test that a line with vote=0 will fail too, so that it is ignored. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", + /* Test that a line with vote=0 will fail even if unmeasured=0. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n", "end" }; @@ -1706,6 +1725,44 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: tor_free(fname); }

1 0

[tor/master] bwauth: Ignore bandwidth file lines with "vote=0"
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 4ab2e9a5990bd6f1fd65f2600dc7487686c801ff Author: juga0 <juga(a)riseup.net> Date: Tue Mar 19 11:48:42 2019 +0000 bwauth: Ignore bandwidth file lines with "vote=0" so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806. --- changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/changes/ticket29806 b/changes/ticket29806 new file mode 100644 index 000000000..6afefd4c0 --- /dev/null +++ b/changes/ticket29806 @@ -0,0 +1,7 @@ + o Minor features (bandwidth authority): + - Make bandwidth authorities to ignore relays that are reported in the + bandwidth file with the key-value "vote=0". + This change allows to report the relays that were not measured due + some failure and diagnose the reasons without the bandwidth being included in the + bandwidth authorities vote. + Closes ticket 29806. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4e09c1c65..ae1975f16 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2497,7 +2497,13 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line, } do { - if (strcmpstart(cp, "bw=") == 0) { + // If the line contains vote=0, ignore it. + if (strcmpstart(cp, "vote=0") == 0) { + log_debug(LD_DIRSERV, "Ignoring bandwidth file line that contains " + "vote=0: %s",escaped(orig_line)); + tor_free(line); + return -1; + } else if (strcmpstart(cp, "bw=") == 0) { int parse_ok = 0; char *endptr; if (got_bw) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 37b015b72..52d3ef159 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1508,6 +1508,19 @@ test_dir_measured_bw_kb(void *arg) /* check whether node_id can be at the end and something in the * in the middle of bw and node_id */ "bw=1024 foo=bar node_id=$557365204145532d32353620696e73746561642e\n", + + /* Test that a line with vote=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1\n", + /* Test that a line with unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=1\n", + /* Test that a line with vote=1 and unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=1\n", + /* Test that a line with unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=0\n", + /* Test that a line with vote=1 and unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=0\n", "end" }; const char *lines_fail[] = { @@ -1541,6 +1554,12 @@ test_dir_measured_bw_kb(void *arg) "node_id=$55736520414552d32353620696e73746561642e bw=1024\n", "node_id=557365204145532d32353620696e73746561642e bw=1024\n", "node_id= $557365204145532d32353620696e73746561642e bw=0.23\n", + + /* Test that a line with vote=0 will fail too, so that it is ignored. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", + /* Test that a line with vote=0 will fail even if unmeasured=0. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n", "end" }; @@ -1706,6 +1725,44 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: tor_free(fname); }

1 0

[tor/release-0.3.4] bwauth: Ignore bandwidth file lines with "vote=0"
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 4ab2e9a5990bd6f1fd65f2600dc7487686c801ff Author: juga0 <juga(a)riseup.net> Date: Tue Mar 19 11:48:42 2019 +0000 bwauth: Ignore bandwidth file lines with "vote=0" so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806. --- changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/changes/ticket29806 b/changes/ticket29806 new file mode 100644 index 000000000..6afefd4c0 --- /dev/null +++ b/changes/ticket29806 @@ -0,0 +1,7 @@ + o Minor features (bandwidth authority): + - Make bandwidth authorities to ignore relays that are reported in the + bandwidth file with the key-value "vote=0". + This change allows to report the relays that were not measured due + some failure and diagnose the reasons without the bandwidth being included in the + bandwidth authorities vote. + Closes ticket 29806. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4e09c1c65..ae1975f16 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2497,7 +2497,13 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line, } do { - if (strcmpstart(cp, "bw=") == 0) { + // If the line contains vote=0, ignore it. + if (strcmpstart(cp, "vote=0") == 0) { + log_debug(LD_DIRSERV, "Ignoring bandwidth file line that contains " + "vote=0: %s",escaped(orig_line)); + tor_free(line); + return -1; + } else if (strcmpstart(cp, "bw=") == 0) { int parse_ok = 0; char *endptr; if (got_bw) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 37b015b72..52d3ef159 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1508,6 +1508,19 @@ test_dir_measured_bw_kb(void *arg) /* check whether node_id can be at the end and something in the * in the middle of bw and node_id */ "bw=1024 foo=bar node_id=$557365204145532d32353620696e73746561642e\n", + + /* Test that a line with vote=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1\n", + /* Test that a line with unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=1\n", + /* Test that a line with vote=1 and unmeasured=1 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=1\n", + /* Test that a line with unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 unmeasured=0\n", + /* Test that a line with vote=1 and unmeasured=0 will pass. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=1" + "unmeasured=0\n", "end" }; const char *lines_fail[] = { @@ -1541,6 +1554,12 @@ test_dir_measured_bw_kb(void *arg) "node_id=$55736520414552d32353620696e73746561642e bw=1024\n", "node_id=557365204145532d32353620696e73746561642e bw=1024\n", "node_id= $557365204145532d32353620696e73746561642e bw=0.23\n", + + /* Test that a line with vote=0 will fail too, so that it is ignored. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0\n", + /* Test that a line with vote=0 will fail even if unmeasured=0. */ + "node_id=$557365204145532d32353620696e73746561642e bw=1024 vote=0 " + "unmeasured=0\n", "end" }; @@ -1706,6 +1725,44 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: tor_free(fname); }

1 0

[tor/release-0.4.0] test/dir: add a 4th argument to dirserv_read_measured_bandwidths()
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 3af9a51118aadde538580f6d4f8043a0a9bba512 Author: teor <teor(a)torproject.org> Date: Thu Mar 21 23:35:56 2019 +1000 test/dir: add a 4th argument to dirserv_read_measured_bandwidths() Part of 29806. --- src/test/test_dir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b9a48c650..07a2641c9 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2064,7 +2064,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL, + NULL)); expect_log_msg_containing("Ignoring bandwidth file line"); teardown_capture_of_logs(); @@ -2082,7 +2083,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL, + NULL)); expect_log_msg_not_containing("Ignoring bandwidth file line"); teardown_capture_of_logs();

1 0

[tor/release-0.4.0] Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit b76ae3898d5d6e34c291f8e0506147a5bd4cbc07 Merge: 8bc3ac6a8 091f8688b Author: teor <teor(a)torproject.org> Date: Tue Mar 26 11:48:52 2019 +1000 Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 ++++++- src/test/test_dir.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --cc src/test/test_dir.c index 4132d42d1,0e44c47f3..b9a48c650 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -2029,8 -1998,45 +2048,46 @@@ test_dir_dirserv_read_measured_bandwidt smartlist_free(bw_file_headers); tor_free(bw_file_headers_str); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: + unlink(fname); tor_free(fname); tor_free(header_lines_v100); tor_free(header_lines_v110_no_terminator);

1 0