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

[tor/master] Document default value for Nickname
by nickm＠torproject.org 07 May '18

07 May '18

commit 0c7740b7ded0eb26aca45a4b96d74a9293660edd Author: Marcin Cieślak <saper(a)saper.info> Date: Sun Apr 29 13:00:32 2018 +0000 Document default value for Nickname --- doc/tor.1.txt | 2 ++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 34ec866b1..03a8734f7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2061,6 +2061,8 @@ is non-zero): [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19 characters inclusive, and must contain only the characters [a-zA-Z0-9]. + If not set, **Unnamed** will be used. Relays can always be uniquely identified + by their identity fingerprints. [[NumCPUs]] **NumCPUs** __num__:: How many processes to use at once for decrypting onionskins and other diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 90f91e5cb..86429f117 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -100,7 +100,7 @@ ## A handle for your relay, so people don't have to refer to it by key. ## Nicknames must be between 1 and 19 characters inclusive, and must ## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode, -## no emoji. +## no emoji. If not set, "Unnamed" will be used. #Nickname ididnteditheconfig ## Define these to limit how much relayed traffic you will allow. Your diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 4e183478e..72cca0be3 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -106,6 +106,7 @@ ## A handle for your relay, so people don't have to refer to it by key. ## Nicknames must be between 1 and 19 characters inclusive, and must ## contain only the characters [a-zA-Z0-9]. +## If not set, "Unnamed" will be used. #Nickname ididnteditheconfig ## Define these to limit how much relayed traffic you will allow. Your

1 0

[tor/master] Merge remote-tracking branch 'saper/default_nickname'
by nickm＠torproject.org 07 May '18

07 May '18

commit 2c5841a8b855b6340952a10b6014ec6cdd44ca87 Merge: a1a32b483 0c7740b7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:31:03 2018 -0400 Merge remote-tracking branch 'saper/default_nickname' doc/tor.1.txt | 2 ++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'ticket26014'
by nickm＠torproject.org 07 May '18

07 May '18

commit a1a32b483412deda5b7573c3120c85fe41e3dfd2 Merge: fd1d0a7d2 d14c245a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 12:07:53 2018 -0400 Merge branch 'ticket26014' changes/ticket26014 | 4 +++ src/or/voting_schedule.c | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_voting_schedule.c | 64 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 73 insertions(+)

1 0

[tor/master] Add unit test for ..get_start_of_next_voting_interval().
by nickm＠torproject.org 07 May '18

07 May '18

commit d14c245a0f3733fa6b33d3c7c44fc7fe0bfc302e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 6 20:42:18 2018 -0400 Add unit test for ..get_start_of_next_voting_interval(). This functionality was covered only accidentally by our voting-test code, and as such wasn't actually tested at all. The tests that called it made its coverage nondeterministic, depending on what time of day you ran the tests. Closes ticket 26014. --- changes/ticket26014 | 4 +++ src/or/voting_schedule.c | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_voting_schedule.c | 64 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 73 insertions(+) diff --git a/changes/ticket26014 b/changes/ticket26014 new file mode 100644 index 000000000..9d62ddbba --- /dev/null +++ b/changes/ticket26014 @@ -0,0 +1,4 @@ + o Minor features (Testing): + - Add a unit test for voting_schedule_get_start_of_next_interval(). + Closes ticket 26014, and helps make unit test coverage more + deterministic. diff --git a/src/or/voting_schedule.c b/src/or/voting_schedule.c index b7676d5e7..1d66b5e22 100644 --- a/src/or/voting_schedule.c +++ b/src/or/voting_schedule.c @@ -39,7 +39,9 @@ voting_schedule_get_start_of_next_interval(time_t now, int interval, tm.tm_sec = 0; if (tor_timegm(&tm, &midnight_today) < 0) { + // LCOV_EXCL_START log_warn(LD_BUG, "Ran into an invalid time when trying to find midnight."); + // LCOV_EXCL_STOP } midnight_tomorrow = midnight_today + (24*60*60); diff --git a/src/test/include.am b/src/test/include.am index eb61d7489..43eaf1e23 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -171,6 +171,7 @@ src_test_test_SOURCES = \ src/test/test_util.c \ src/test/test_util_format.c \ src/test/test_util_process.c \ + src/test/test_voting_schedule.c \ src/test/test_helpers.c \ src/test/test_dns.c \ src/test/testing_common.c \ diff --git a/src/test/test.c b/src/test/test.c index b1e5345b3..0ad33ec0c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -859,6 +859,7 @@ struct testgroup_t testgroups[] = { { "dir/", dir_tests }, { "dir_handle_get/", dir_handle_get_tests }, { "dir/md/", microdesc_tests }, + { "dir/voting-schedule/", voting_schedule_tests }, { "dos/", dos_tests }, { "entryconn/", entryconn_tests }, { "entrynodes/", entrynodes_tests }, diff --git a/src/test/test.h b/src/test/test.h index 15965ccaf..0cd030462 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -265,6 +265,7 @@ extern struct testcase_t tortls_tests[]; extern struct testcase_t util_tests[]; extern struct testcase_t util_format_tests[]; extern struct testcase_t util_process_tests[]; +extern struct testcase_t voting_schedule_tests[]; extern struct testcase_t dns_tests[]; extern struct testcase_t handle_tests[]; extern struct testcase_t sr_tests[]; diff --git a/src/test/test_voting_schedule.c b/src/test/test_voting_schedule.c new file mode 100644 index 000000000..df6058b74 --- /dev/null +++ b/src/test/test_voting_schedule.c @@ -0,0 +1,64 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" + +#include "or.h" +#include "voting_schedule.h" + +#include "test.h" + +static void +test_voting_schedule_interval_start(void *arg) +{ +#define next_interval voting_schedule_get_start_of_next_interval + (void)arg; + char buf[ISO_TIME_LEN+1]; + + // Midnight UTC tonight (as I am writing this test) + const time_t midnight = 1525651200; + format_iso_time(buf, midnight); + tt_str_op(buf, OP_EQ, "2018-05-07 00:00:00"); + + /* Some simple tests with a 50-minute voting interval */ + + tt_i64_op(next_interval(midnight, 3000, 0), OP_EQ, + midnight+3000); + + tt_i64_op(next_interval(midnight+100, 3000, 0), OP_EQ, + midnight+3000); + + tt_i64_op(next_interval(midnight+3000, 3000, 0), OP_EQ, + midnight+6000); + + tt_i64_op(next_interval(midnight+3001, 3000, 0), OP_EQ, + midnight+6000); + + /* Make sure that we roll around properly at midnight */ + tt_i64_op(next_interval(midnight+83000, 3000, 0), OP_EQ, + midnight+84000); + + /* We start fresh at midnight UTC, even if there are leftover seconds. */ + tt_i64_op(next_interval(midnight+84005, 3000, 0), OP_EQ, + midnight+86400); + + /* Now try with offsets. (These are only used for test networks.) */ + tt_i64_op(next_interval(midnight, 3000, 99), OP_EQ, + midnight+99); + + tt_i64_op(next_interval(midnight+100, 3000, 99), OP_EQ, + midnight+3099); + + done: + ; +#undef next_interval +} + +#define VS(name,flags) \ + { #name, test_voting_schedule_##name, (flags), NULL, NULL } + +struct testcase_t voting_schedule_tests[] = { + VS(interval_start, 0), + END_OF_TESTCASES +}; +

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug25705_v3_033'
by nickm＠torproject.org 07 May '18

07 May '18

commit fd1d0a7d2e55f489a3744ec5180f40f8a870e163 Merge: f36656cad 937260af6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:09:25 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25705_v3_033' changes/bug25705 | 5 +++++ src/or/circuituse.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-)

1 0

[tor/master] Bug 25705: Don't count circuit path failures as build failures.
by nickm＠torproject.org 07 May '18

07 May '18

commit 937260af6a88680616aac578f3def329c7d9e3fe Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Apr 1 03:52:34 2018 +0000 Bug 25705: Don't count circuit path failures as build failures. Also emit a rate limited log message when they happen, since they are likely correlated with other issues. --- changes/bug25705 | 5 +++++ src/or/circuituse.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/changes/bug25705 b/changes/bug25705 new file mode 100644 index 000000000..360d96d4c --- /dev/null +++ b/changes/bug25705 @@ -0,0 +1,5 @@ + o Minor bugfixes (circuit path selection): + - Don't count path selection failures as circuit build failures. This + should eliminate cases where Tor blames its guard or the network + for situations like insufficient microdescriptors and/or overly + restrictive torrc settings. Fixes bug 25705; bugfix on 0.3.3.1-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3125fff65..93b7b2023 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1757,6 +1757,39 @@ circuit_build_failed(origin_circuit_t *circ) * the last hop or an earlier hop. then use this info below. */ int failed_at_last_hop = 0; + + /* First, check to see if this was a path failure, rather than build + * failure. + * + * Note that we deliberately use circuit_get_cpath_len() (and not + * circuit_get_cpath_opened_len()) because we only want to ensure + * that a full path is *chosen*. This is different than a full path + * being *built*. We only want to count *build* failures below. + * + * Path selection failures can happen spuriously for a number + * of reasons (such as aggressive/invalid user-specified path + * restrictions in the torrc, insufficient microdescriptors, and + * non-user reasons like exitpolicy issues), and so should not be + * counted as failures below. + */ + if (circuit_get_cpath_len(circ) < circ->build_state->desired_path_len) { + static ratelim_t pathfail_limit = RATELIM_INIT(3600); + log_fn_ratelim(&pathfail_limit, LOG_NOTICE, LD_CIRC, + "Our circuit %u (id: %" PRIu32 ") died due to an invalid " + "selected path, purpose %s. This may be a torrc " + "configuration issue, or a bug.", + TO_CIRCUIT(circ)->n_circ_id, circ->global_identifier, + circuit_purpose_to_string(TO_CIRCUIT(circ)->purpose)); + + /* If the path failed on an RP, retry it. */ + if (TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) + hs_circ_retry_service_rendezvous_point(circ); + + /* In all other cases, just bail. The rest is just failure accounting + * that we don't want to do */ + return; + } + /* If the last hop isn't open, and the second-to-last is, we failed * at the last hop. */ if (circ->cpath && @@ -1806,18 +1839,8 @@ circuit_build_failed(origin_circuit_t *circ) * If we have guard state (new guard API) and our path selection * code actually chose a full path, then blame the failure of this * circuit on the guard. - * - * Note that we deliberately use circuit_get_cpath_len() (and not - * circuit_get_cpath_opened_len()) because we only want to ensure - * that a full path is *chosen*. This is different than a full path - * being *built*. We only want to blame *build* failures on this - * guard. Path selection failures can happen spuriously for a number - * of reasons (such as aggressive/invalid user-specified path - * restrictions in the torrc, as well as non-user reasons like - * exitpolicy issues), and so should not be counted here. */ - if (circ->guard_state && - circuit_get_cpath_len(circ) >= circ->build_state->desired_path_len) + if (circ->guard_state) entry_guard_failed(&circ->guard_state); /* if there are any one-hop streams waiting on this circuit, fail * them now so they can retry elsewhere. */

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 07 May '18

07 May '18

commit c5c3a7587b8c76fb28e0e23e497b00e675b526f3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 7 11:19:48 2018 +0000 Update translations for tor-browser-manual_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index d750aa783..4feb584af 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -191,7 +191,7 @@ msgid "" "or" msgstr "" "Envoyez un courriel à bridges(a)torproject.org à partir d’une adresse courriel" -" Gmail, Yahoo ou Riseup." +" Gmail, Yahoo, Riseup ou" #: bridges.page:51 msgid "Entering bridge addresses"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 07 May '18

07 May '18

commit e24b5102f132493f706e90e8e9cffac684ec78ac Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 7 11:19:43 2018 +0000 Update translations for tor-browser-manual --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index d750aa783..4feb584af 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -191,7 +191,7 @@ msgid "" "or" msgstr "" "Envoyez un courriel à bridges(a)torproject.org à partir d’une adresse courriel" -" Gmail, Yahoo ou Riseup." +" Gmail, Yahoo, Riseup ou" #: bridges.page:51 msgid "Entering bridge addresses"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 07 May '18

07 May '18

commit 240f9c1493d3cfb36a7eabf4c08b81f4df8c61c4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 7 11:18:26 2018 +0000 Update translations for tails-onioncircuits_completed --- fr/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index 4e7b06667..9ee381fd2 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-04-12 19:13+0000\n" +"PO-Revision-Date: 2018-05-07 11:16+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -79,7 +79,7 @@ msgstr "Empreinte :" #: ../onioncircuits:608 msgid "Published:" -msgstr "Publié :" +msgstr "Publiés :" #: ../onioncircuits:609 msgid "IP:"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 07 May '18

07 May '18

commit 9dd61ecf3bcc98cc2945627546d764cbcbc0bdee Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 7 11:18:20 2018 +0000 Update translations for tails-onioncircuits --- fr/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index 4e7b06667..9ee381fd2 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-04-12 19:13+0000\n" +"PO-Revision-Date: 2018-05-07 11:16+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -79,7 +79,7 @@ msgstr "Empreinte :" #: ../onioncircuits:608 msgid "Published:" -msgstr "Publié :" +msgstr "Publiés :" #: ../onioncircuits:609 msgid "IP:"

1 0