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

[tor/maint-0.3.5] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /dev/null +++ b/changes/bug16016 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Downgrade a noisy log message that could occur naturally when + receiving an extrainfo document that we no longer want. + Fixes bug 16016; bugfix on 0.2.6.3-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e48675aad..c7fa86892 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, + /* This is a DEBUG because it can happen naturally, if we tried + * to add an extrainfo for which we no longer have the + * corresponding routerinfo. + */ + log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR, "No entry found in extrainfo map."); goto done; }

1 0

[onionperf/develop] Always include error_code column in CSV output.
by karsten＠torproject.org 02 Jul '20

02 Jul '20

commit fc6e9702d3012edca463b96fbbe218bbff70d6c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 1 15:20:27 2020 +0200 Always include error_code column in CSV output. We should include an error_code column in the CSV output, regardless of whether data contains measurements with an error code or not. Everything else is just too confusing to whoever processes these files. Fixes #40004. --- onionperf/visualization.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/onionperf/visualization.py b/onionperf/visualization.py index 2107d5a..0a2a9d9 100644 --- a/onionperf/visualization.py +++ b/onionperf/visualization.py @@ -58,7 +58,8 @@ class TGenVisualization(Visualization): tgen_transfers = analysis.get_tgen_transfers(client) for transfer_id, transfer_data in tgen_transfers.items(): transfer = {"transfer_id": transfer_id, "label": label, - "filesize_bytes": transfer_data["filesize_bytes"]} + "filesize_bytes": transfer_data["filesize_bytes"], + "error_code": None} transfer["server"] = "onion" if ".onion:" in transfer_data["endpoint_remote"] else "public" if "elapsed_seconds" in transfer_data: s = transfer_data["elapsed_seconds"] @@ -147,7 +148,7 @@ class TGenVisualization(Visualization): def __plot_errors_count(self): for server in self.data["server"].unique(): - if "error_code" in self.data.columns and self.data[self.data["server"] == server]["error_code"].count() > 0: + if self.data[self.data["server"] == server]["error_code"].count() > 0: self.__draw_countplot(x="error_code", hue="label", hue_name="Data set", data=self.data[self.data["server"] == server], xlabel="Error code", ylabel="Downloads failed (#)", @@ -155,7 +156,7 @@ class TGenVisualization(Visualization): def __plot_errors_time(self): for server in self.data["server"].unique(): - if "error_code" in self.data.columns and self.data[self.data["server"] == server]["error_code"].count() > 0: + if self.data[self.data["server"] == server]["error_code"].count() > 0: self.__draw_stripplot(x="start", y="error_code", hue="label", hue_name="Data set", data=self.data[self.data["server"] == server], xlabel="Download start time", ylabel="Error code",

1 0

[onionperf/develop] Merge branch 'task-40004' into develop
by karsten＠torproject.org 02 Jul '20

02 Jul '20

commit 83e4b52575576806f1879f3912f4a913c3e06747 Merge: 0a9c6ac fc6e970 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 2 10:43:05 2020 +0200 Merge branch 'task-40004' into develop onionperf/visualization.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[onionperf/develop] Write generated torrc files to disk.
by karsten＠torproject.org 02 Jul '20

02 Jul '20

commit 30949a4218cf06c8e73927ec0db06dfa6d662294 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 1 16:50:57 2020 +0200 Write generated torrc files to disk. Implements #40002. --- onionperf/measurement.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 4a58bc4..1540bac 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -439,6 +439,9 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory if not os.path.exists(tor_datadir): os.makedirs(tor_datadir) tor_config = self.create_tor_config(control_port,socks_port,tor_datadir,name) + tor_confpath = "{0}/torrc".format(tor_datadir) + with open(tor_confpath, 'wt') as f: + f.write(tor_config) tor_logpath = "{0}/onionperf.tor.log".format(tor_datadir) tor_writable = util.FileWritable(tor_logpath)

1 0

[onionperf/develop] Merge branch 'task-40002' into develop
by karsten＠torproject.org 02 Jul '20

02 Jul '20

commit 0a9c6aca86f44660e4895c643484c0c16fc9c705 Merge: 3e1d149 30949a4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 2 10:22:24 2020 +0200 Merge branch 'task-40002' into develop onionperf/measurement.py | 3 +++ 1 file changed, 3 insertions(+)

1 0

[manual/master] Update GNU/Linux step 6 to ./start-tor-browser.desktop
by gus＠torproject.org 01 Jul '20

01 Jul '20

commit ad1ccb6536ae922099d3ebcc063db381dbd024ec Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Jul 1 20:50:10 2020 +0000 Update GNU/Linux step 6 to ./start-tor-browser.desktop --- content/installation/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/installation/contents.lr b/content/installation/contents.lr index d50dd6a..5e569d9 100644 --- a/content/installation/contents.lr +++ b/content/installation/contents.lr @@ -49,4 +49,4 @@ For GNU/Linux: 6. Alternatively, from inside the Tor Browser directory, you can also start from the command line by running: - `./start-tor-browser` + `./start-tor-browser.desktop`

1 0

[tor/master] addr: Continue trying all Address options on resolve failure
by nickm＠torproject.org 01 Jul '20

01 Jul '20

commit 6f1423cb57b35525babb08fe317df126f7363b46 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 30 12:12:04 2020 -0400 addr: Continue trying all Address options on resolve failure When going over all Address lines from the configuration, continue to attempt resolving other lines if one fails. Before that, we would bail right away and never noticed the other Address lines. Fixed in #33235 Related to #33233 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 61662c340..9c208efea 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -212,7 +212,7 @@ get_address_from_config(const or_options_t *options, int warn_severity, /* Hostname that can't be resolved, this is a fatal error. */ log_fn(warn_severity, LD_CONFIG, "Could not resolve local Address '%s'. Failing.", cfg->value); - return FN_RET_BAIL; + continue; } }

1 0

[tor/master] addr: Only attempt Address resolution on non parsable lines
by nickm＠torproject.org 01 Jul '20

01 Jul '20

commit a8b8a1ee99fa843a5937b4d2a5973c444a4311e0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 30 12:05:56 2020 -0400 addr: Only attempt Address resolution on non parsable lines In get_address_from_config(), we would attempt to resolve an Address line that is not from the requested family but that line could be a valid address from another family (v4 vs v6). This makes it that we don't attempt to resolve a valid address from another family. Found with unit test config/find_my_address_mixed. Fixed in #33235 Related to #33233 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index c8b44de84..61662c340 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -193,6 +193,10 @@ get_address_from_config(const or_options_t *options, int warn_severity, explicit_ip = true; num_valid_addr++; continue; + } else if (af != -1) { + /* Parsable address but just not the one from the family we want. Skip + * it so we don't attempt a resolve. */ + continue; } /* Not an IP address. Considering this value a hostname and attempting to

1 0

[tor/master] test: Rename function to be IPv4 specific
by nickm＠torproject.org 01 Jul '20

01 Jul '20

commit faba6909f80da729a1238d12588bb746aae474c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 30 09:56:14 2020 -0400 test: Rename function to be IPv4 specific Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 7b7c9c621..fe102eea9 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1170,7 +1170,7 @@ get_interface_address6_failure(int severity, sa_family_t family, } static void -test_config_find_my_address(void *arg) +test_config_find_my_address_v4(void *arg) { or_options_t *options; tor_addr_t resolved_addr, test_addr; @@ -6245,7 +6245,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(adding_dir_servers, TT_FORK), CONFIG_TEST(default_dir_servers, TT_FORK), CONFIG_TEST(default_fallback_dirs, 0), - CONFIG_TEST(find_my_address, TT_FORK), + CONFIG_TEST(find_my_address_v4, TT_FORK), CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), CONFIG_TEST(parse_transport_options_line, 0),

1 0

[tor/master] test: Mixed unit tests for find_my_address()
by nickm＠torproject.org 01 Jul '20

01 Jul '20

commit 89c26f4cfd03fa9d26caa99ecf24258e25fc56ea Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 30 12:04:18 2020 -0400 test: Mixed unit tests for find_my_address() This unit tests validates the use of IPv4 _and_ IPv6 together as in multiple option Address lines both addresses and hostnames. Closes #33235 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_config.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 616145667..84b18c90e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1058,6 +1058,46 @@ tor_addr_lookup_failure(const char *name, uint16_t family, tor_addr_t *addr) return -1; } +/** Mock function for tor_addr_lookup(). + * + * Depending on the given hostname and family, resolve either to IPv4 or IPv6. + * + * If the requested hostname family is not the same as the family provided, an + * error is returned. + * + * Possible hostnames: + * - www.torproject.org.v4 for IPv4 -> 1.1.1.1 + * - www.torproject.org.v6 for IPv6 -> [0101::0101] + */ +static int +tor_addr_lookup_mixed(const char *name, uint16_t family, tor_addr_t *addr) +{ + tt_assert(addr); + tt_assert(name); + + if (!strcmp(name, "www.torproject.org.v4")) { + if (family == AF_INET) { + tor_addr_from_ipv4h(addr, 0x01010101); + return 0; + } + /* Resolving AF_INET but the asked family is different. Failure. */ + return -1; + } + + if (!strcmp(name, "www.torproject.org.v6")) { + if (family == AF_INET6) { + int ret = tor_addr_parse(addr, "0101::0101"); + tt_int_op(ret, OP_EQ, AF_INET6); + return 0; + } + /* Resolving AF_INET6 but the asked family is not. Failure. */ + return -1; + } + + done: + return 0; +} + static int n_gethostname_replacement = 0; /** This mock function is meant to replace tor_gethostname(). It @@ -1187,6 +1227,168 @@ get_interface_address6_failure(int severity, sa_family_t family, return -1; } +/** Helper macro: to validate the returned value from find_my_address() so we + * don't copy those all the time. */ +#undef VALIDATE_FOUND_ADDRESS +#define VALIDATE_FOUND_ADDRESS(ret, method, hostname) \ + do { \ + tt_int_op(retval, OP_EQ, ret); \ + if (method == NULL) tt_assert(!method_used); \ + else tt_str_op(method_used, OP_EQ, method); \ + if (hostname == NULL) tt_assert(!hostname_out); \ + else tt_str_op(hostname_out, OP_EQ, hostname); \ + if (ret == true) { \ + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); \ + } \ + } while (0) + +/** Helper macro: Cleanup the address and variables used after a + * find_my_address() call. */ +#undef CLEANUP_FOUND_ADDRESS +#define CLEANUP_FOUND_ADDRESS \ + do { \ + config_free_lines(options->Address); \ + tor_free(options->DirAuthorities); \ + tor_free(hostname_out); \ + tor_addr_make_unspec(&resolved_addr); \ + tor_addr_make_unspec(&test_addr); \ + } while (0) + +/** Test both IPv4 and IPv6 coexisting together in the configuration. */ +static void +test_config_find_my_address_mixed(void *arg) +{ + or_options_t *options; + tor_addr_t resolved_addr, test_addr; + const char *method_used; + char *hostname_out = NULL; + bool retval; + + (void)arg; + + options = options_new(); + + options_init(options); + + /* + * CASE 1: Only IPv6 address. Accepted. + */ + config_line_append(&options->Address, "Address", + "2a01:4f8:fff0:4f:266:37ff:fe2c:5d19"); + tor_addr_parse(&test_addr, "2a01:4f8:fff0:4f:266:37ff:fe2c:5d19"); + + /* IPv4 address not guessed since one Address statement exists. */ + retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(false, NULL, NULL); + /* IPv6 address should be found and considered configured. */ + retval = find_my_address(options, AF_INET6, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED", NULL); + + CLEANUP_FOUND_ADDRESS; + + /* + * Case 2: IPv4 _and_ IPv6 given. Accepted. + */ + config_line_append(&options->Address, "Address", + "2a01:4f8:fff0:4f:266:37ff:fe2c:5d19"); + config_line_append(&options->Address, "Address", "1.1.1.1"); + tor_addr_parse(&test_addr, "1.1.1.1"); + + /* IPv4 address should be found and considered configured. */ + retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED", NULL); + + /* IPv6 address should be found and considered configured. */ + tor_addr_parse(&test_addr, "2a01:4f8:fff0:4f:266:37ff:fe2c:5d19"); + retval = find_my_address(options, AF_INET6, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED", NULL); + + CLEANUP_FOUND_ADDRESS; + + /* + * Case 3: Two hostnames, IPv4 and IPv6. + */ + config_line_append(&options->Address, "Address", "www.torproject.org.v4"); + config_line_append(&options->Address, "Address", "www.torproject.org.v6"); + + /* Looks at specific hostname to learn which address family to use. */ + MOCK(tor_addr_lookup, tor_addr_lookup_mixed); + + /* IPv4 address should be found and considered resolved. */ + tor_addr_parse(&test_addr, "1.1.1.1"); + retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "RESOLVED", "www.torproject.org.v4"); + + /* IPv6 address should be found and considered resolved. */ + tor_addr_parse(&test_addr, "0101::0101"); + retval = find_my_address(options, AF_INET6, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "RESOLVED", "www.torproject.org.v6"); + + CLEANUP_FOUND_ADDRESS; + UNMOCK(tor_addr_lookup); + + /* + * Case 4: IPv4 address and a hostname resolving to IPV6. + */ + config_line_append(&options->Address, "Address", "1.1.1.1"); + config_line_append(&options->Address, "Address", "www.torproject.org.v6"); + + /* Looks at specific hostname to learn which address family to use. */ + MOCK(tor_addr_lookup, tor_addr_lookup_mixed); + + /* IPv4 address should be found and configured. */ + tor_addr_parse(&test_addr, "1.1.1.1"); + retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED", NULL); + + /* IPv6 address should be found and considered resolved. */ + tor_addr_parse(&test_addr, "0101::0101"); + retval = find_my_address(options, AF_INET6, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "RESOLVED", "www.torproject.org.v6"); + + CLEANUP_FOUND_ADDRESS; + UNMOCK(tor_addr_lookup); + + /* + * Case 5: Hostname resolving to IPv4 and an IPv6 address. + */ + config_line_append(&options->Address, "Address", "0101::0101"); + config_line_append(&options->Address, "Address", "www.torproject.org.v4"); + + /* Looks at specific hostname to learn which address family to use. */ + MOCK(tor_addr_lookup, tor_addr_lookup_mixed); + + /* IPv4 address should be found and resolved. */ + tor_addr_parse(&test_addr, "1.1.1.1"); + retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "RESOLVED", "www.torproject.org.v4"); + + /* IPv6 address should be found and considered resolved. */ + tor_addr_parse(&test_addr, "0101::0101"); + retval = find_my_address(options, AF_INET6, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED", NULL); + + CLEANUP_FOUND_ADDRESS; + UNMOCK(tor_addr_lookup); + + done: + config_free_lines(options->Address); + or_options_free(options); + tor_free(hostname_out); + + UNMOCK(tor_addr_lookup); +} + static void test_config_find_my_address_v6(void *arg) { @@ -6661,6 +6863,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(default_fallback_dirs, 0), CONFIG_TEST(find_my_address_v4, TT_FORK), CONFIG_TEST(find_my_address_v6, TT_FORK), + CONFIG_TEST(find_my_address_mixed, TT_FORK), CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), CONFIG_TEST(parse_transport_options_line, 0),

1 0