September 2019 - tor-commits - lists.torproject.org

[tor/master] log: Improve the documentation for tor_log_update_sigsafe_err_fds()
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit dfea789203a83a05176bd590a04d91c13da44ef6 Author: teor <teor(a)torproject.org> Date: Tue Sep 24 15:04:03 2019 +1000 log: Improve the documentation for tor_log_update_sigsafe_err_fds() Part of 31839. --- src/lib/log/log.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index be6f45955..a5db085c3 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -687,8 +687,9 @@ tor_log_update_sigsafe_err_fds(void) n_fds = 1; for (lf = logfiles; lf; lf = lf->next) { - /* Don't try callback to the control port, or syslogs: We can't - * do them from a signal handler. Don't try stdout: we always do stderr. + /* Don't try callback to the control port, syslogs, android logs, or any + * other non-file descriptor log: We can't call arbitrary functions from a + * signal handler. */ if (lf->is_temporary || logfile_is_external(lf) || lf->seems_dead || lf->fd < 0) @@ -720,7 +721,10 @@ tor_log_update_sigsafe_err_fds(void) if (!found_real_stderr && int_array_contains(log_fds, n_fds, STDOUT_FILENO)) { - /* Don't use a virtual stderr when we're also logging to stdout. */ + /* Don't use a virtual stderr when we're also logging to stdout. + * If we reached max_fds logs, we'll now have (max_fds - 1) logs. + * That's ok, max_fds is large enough that most tor instances don't exceed + * it. */ raw_assert(n_fds >= 2); /* Don't tor_assert inside log fns */ --n_fds; log_fds[0] = log_fds[n_fds];

1 0

[tor/master] doc: Document the signal-safe log behaviour in the tor man page
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 102546f99f2efbc21f9e0860c66f2c3ae714352f Author: teor <teor(a)torproject.org> Date: Tue Sep 24 15:03:17 2019 +1000 doc: Document the signal-safe log behaviour in the tor man page Part of 31389. --- doc/tor.1.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 835962362..6ba23ac62 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -663,7 +663,16 @@ GENERAL OPTIONS debug, info, notice, warn, and err. We advise using "notice" in most cases, since anything more verbose may provide sensitive information to an attacker who obtains the logs. If only one severity level is given, all - messages of that level or higher will be sent to the listed destination. + messages of that level or higher will be sent to the listed destination. + + + + Some low-level logs may be sent from signal handlers, so their destination + logs must be signal-safe. These low-level logs include backtraces, + logging function errors, and errors in code called by logging functions. + Signal-safe logs are always sent to stderr or stdout. They are also sent to + a limited number of log files that are configured to log messages at error + severity from the bug or general domains. They are never sent as syslogs, + android logs, control port log events, or to any API-based log + destinations. [[Log2]] **Log** __minSeverity__[-__maxSeverity__] **file** __FILENAME__:: As above, but send log messages to the listed filename. The

1 0

[tor/master] changes: file for 31839
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 0c07cd24d43a19c02333eb5a031df80ef00c891a Author: teor <teor(a)torproject.org> Date: Tue Sep 24 15:22:57 2019 +1000 changes: file for 31839 --- changes/ticket31839 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket31839 b/changes/ticket31839 new file mode 100644 index 000000000..d7da40f53 --- /dev/null +++ b/changes/ticket31839 @@ -0,0 +1,3 @@ + o Documentation: + - Document the signal-safe logging behaviour in the tor man page. Also + add some comments to the relevant functions. Closes ticket 31839.

1 0

[tor/master] Merge branch 'tor-github/pr/1357'
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 09769779a0b0d422b1cc4ec22ca8d95daba706ba Merge: 6677eae57 0c07cd24d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 25 14:17:35 2019 +0300 Merge branch 'tor-github/pr/1357' changes/ticket31839 | 3 +++ doc/tor.1.txt | 11 ++++++++++- src/lib/log/log.c | 10 +++++++--- 3 files changed, 20 insertions(+), 4 deletions(-)

1 0

[tor/master] practracker: Fix a typo in the usage message
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 22c33ea7f707e6b348b743277066b14bdb0f7f1b Author: teor <teor(a)torproject.org> Date: Tue Aug 6 00:20:49 2019 +1000 practracker: Fix a typo in the usage message Fixes bug 31828; bugfix on 0.4.2.1-alpha. --- scripts/maint/practracker/practracker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index ce9c5f5d8..b5a68fd27 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -181,7 +181,7 @@ def main(argv): parser.add_argument("--regen", action="store_true", help="Regenerate the exceptions file") parser.add_argument("--list-overbroad", action="store_true", - help="List over-strict exceptions") + help="List over-broad exceptions") parser.add_argument("--exceptions", help="Override the location for the exceptions file") parser.add_argument("--strict", action="store_true",

1 0

[tor/master] Merge branch 'tor-github/pr/1355'
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 6677eae57903eae05a31856e4d55da6fb51701b5 Merge: 6712fb9e2 22c33ea7f Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 25 14:17:03 2019 +0300 Merge branch 'tor-github/pr/1355' scripts/maint/practracker/practracker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] configure: Explain --disable-module-dirauth better
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit c7c849bba82f9a47f404882348dd00f22492f310 Author: teor <teor(a)torproject.org> Date: Tue Sep 24 11:29:22 2019 +1000 configure: Explain --disable-module-dirauth better Explain what the optional Directory Authority module is, and what happens when it is disabled. Fixes bug 31825; bugfix on 0.3.4.1-alpha. --- changes/bug31825 | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug31825 b/changes/bug31825 new file mode 100644 index 000000000..fe90acf29 --- /dev/null +++ b/changes/bug31825 @@ -0,0 +1,3 @@ + o Minor bugfixes (modules): + - Explain what the optional Directory Authority module is, and what + happens when it is disabled. Fixes bug 31825; bugfix on 0.3.4.1-alpha. diff --git a/configure.ac b/configure.ac index a639ffaf3..bd12e6167 100644 --- a/configure.ac +++ b/configure.ac @@ -251,7 +251,7 @@ m4_define(MODULES, dirauth) dnl Directory Authority module. AC_ARG_ENABLE([module-dirauth], AS_HELP_STRING([--disable-module-dirauth], - [Do not build tor with the dirauth module]), + [Build tor without the Directory Authority module: tor can not run as an authority]), [], dnl Action if-given AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], [Compile with Directory Authority feature support]))

1 0

[tor/master] Merge branch 'tor-github/pr/1353'
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 6712fb9e270b51af67d72706b54dcaa749950de1 Merge: 219962964 c7c849bba Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 25 14:16:28 2019 +0300 Merge branch 'tor-github/pr/1353' changes/bug31825 | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] test: refactor dirserv_router_has_valid_address() tests
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit c2ceede37623935a63c05187d89ba7b6d86df7e8 Author: teor <teor(a)torproject.org> Date: Thu Sep 19 15:39:36 2019 +1000 test: refactor dirserv_router_has_valid_address() tests Cleanup after 31793. --- src/test/test_address.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index c186cda73..ab95113dc 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1245,25 +1245,29 @@ test_address_tor_node_in_same_network_family(void *ignored) helper_free_mock_node(node_b); } -#define CHECK_RI_ADDR(addr_str, rv) STMT_BEGIN \ +/* Test dirserv_router_has_valid_address() on a stub routerinfo, with only its + * address fields set. Use IPv4 ipv4_addr_str and IPv6 ipv6_addr_str. + * Fail if it does not return rv. */ +#define TEST_ROUTER_VALID_ADDRESS_HELPER(ipv4_addr_str, ipv6_addr_str, rv) \ + STMT_BEGIN \ ri = tor_malloc_zero(sizeof(routerinfo_t)); \ tor_addr_t addr; \ - tor_addr_parse(&addr, (addr_str)); \ + tor_addr_parse(&addr, (ipv4_addr_str)); \ ri->addr = tor_addr_to_ipv4h(&addr); \ - tor_addr_make_null(&ri->ipv6_addr, AF_INET6); \ - tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, (rv)); \ + tor_addr_parse(&ri->ipv6_addr, (ipv6_addr_str)); \ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, (rv)); \ tor_free(ri); \ STMT_END -/* XXX: Here, we use a non-internal IPv4 as dirserv_router_has_valid_address() - * will check internal/null IPv4 first. */ -#define CHECK_RI_ADDR6(addr_str, rv) STMT_BEGIN \ - ri = tor_malloc_zero(sizeof(routerinfo_t)); \ - ri->addr = 16777217; /* 1.0.0.1 */ \ - tor_addr_parse(&ri->ipv6_addr, (addr_str)); \ - tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, (rv)); \ - tor_free(ri); \ - STMT_END +/* Like TEST_ROUTER_VALID_ADDRESS_HELPER(), but always passes a null + * IPv6 address. */ +#define CHECK_RI_ADDR(ipv4_addr_str, rv) \ + TEST_ROUTER_VALID_ADDRESS_HELPER(ipv4_addr_str, "::", rv) + +/* Like TEST_ROUTER_VALID_ADDRESS_HELPER(), but always passes a non-internal + * IPv4 address, so that the IPv6 check is reached. */ +#define CHECK_RI_ADDR6(ipv6_addr_str, rv) \ + TEST_ROUTER_VALID_ADDRESS_HELPER("1.0.0.1", ipv6_addr_str, rv) static void test_address_dirserv_router_addr_private(void *ignored) @@ -1281,14 +1285,7 @@ test_address_dirserv_router_addr_private(void *ignored) /* Null addresses */ /* IPv4 null fails, regardless of IPv6 */ CHECK_RI_ADDR("0.0.0.0", -1); - - { - ri = tor_malloc_zero(sizeof(routerinfo_t)); - ri->addr = 0; /* 0.0.0.0 */ - tor_addr_parse(&ri->ipv6_addr, "::"); - tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, -1); - tor_free(ri); - } + TEST_ROUTER_VALID_ADDRESS_HELPER("0.0.0.0", "::", -1); /* IPv6 null succeeds, because IPv4 is not null */ CHECK_RI_ADDR6("::", 0);

1 0

[tor/master] test: dirserv_router_has_valid_address() with zero-family addresses
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 46fea1dfeeae1b575d427a9c3c6b4a8d1ab7f2b9 Author: teor <teor(a)torproject.org> Date: Thu Sep 19 15:24:01 2019 +1000 test: dirserv_router_has_valid_address() with zero-family addresses Sometimes tor doesn't initialise an address, so its family is zero. Failing test for 31793. Future commits will fix the code. --- src/test/test_address.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/test/test_address.c b/src/test/test_address.c index ef6daa06b..c186cda73 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1271,10 +1271,44 @@ test_address_dirserv_router_addr_private(void *ignored) (void)ignored; /* A stub routerinfo structure, with only its address fields set. */ routerinfo_t *ri = NULL; + CHECK_RI_ADDR("1.0.0.1", 0); CHECK_RI_ADDR("10.0.0.1", -1); + CHECK_RI_ADDR6("2600::1", 0); CHECK_RI_ADDR6("fe80::1", -1); + + /* Null addresses */ + /* IPv4 null fails, regardless of IPv6 */ + CHECK_RI_ADDR("0.0.0.0", -1); + + { + ri = tor_malloc_zero(sizeof(routerinfo_t)); + ri->addr = 0; /* 0.0.0.0 */ + tor_addr_parse(&ri->ipv6_addr, "::"); + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, -1); + tor_free(ri); + } + + /* IPv6 null succeeds, because IPv4 is not null */ + CHECK_RI_ADDR6("::", 0); + + /* Byte-zeroed null addresses */ + /* IPv4 null fails, regardless of IPv6 */ + { + ri = tor_malloc_zero(sizeof(routerinfo_t)); + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, -1); + tor_free(ri); + } + + /* IPv6 null succeeds, because IPv4 is not internal */ + { + ri = tor_malloc_zero(sizeof(routerinfo_t)); + ri->addr = 16777217; /* 1.0.0.1 */ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, 0); + tor_free(ri); + } + done: tor_free(ri); }

1 0