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

[tor/master] Merge remote-tracking branch 'tor-github/pr/206'
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 57d0b8c3cd7213f03b0a37c8c74c003b1c820438 Merge: c775689e9 5028a52b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 11 10:14:29 2018 -0400 Merge remote-tracking branch 'tor-github/pr/206' INSTALL | 34 ---------------------------------- changes/doc26588 | 3 +++ 2 files changed, 3 insertions(+), 34 deletions(-)

1 0

[tor/master] Remove old instructions from INSTALL
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 5028a52b54a7123e9dccc3271c8801c7dbde05d6 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jul 3 16:33:07 2018 +0300 Remove old instructions from INSTALL --- INSTALL | 34 ---------------------------------- changes/doc26588 | 3 +++ 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/INSTALL b/INSTALL index ddb790b0b..f493f4ed3 100644 --- a/INSTALL +++ b/INSTALL @@ -16,37 +16,3 @@ If it doesn't build for you: ./configure --with-libevent-dir=/usr/local rather than simply ./configure. - If you have mysterious autoconf failures while linking openssl, - consider setting your LD_LIBRARY_PATH to the openssl lib directory. - For example, "setenv LD_LIBRARY_PATH /usr/athena/lib". - - Lastly, check out - https://www.torproject.org/docs/faq#DoesntWork - -How to do static builds of tor: - -Tor supports linking each of the libraries it needs statically. Use the ---enable-static-X ./configure option in conjunction with the --with-X-dir -option for libevent, zlib, and openssl. For this to work sanely, libevent -should be built with --disable-shared --enable-static --with-pic, and -OpenSSL should be built with no-shared no-dso. - -If you need to build tor so that system libraries are also statically linked, -use the --enable-static-tor ./configure option. This won't work on OS X -unless you build the required crt0.o yourself. It is also incompatible with -the --enable-gcc-hardening option. - -An example of how to build a mostly static tor: -./configure --enable-static-libevent \ - --enable-static-openssl \ - --enable-static-zlib \ - --with-libevent-dir=/tmp/static-tor/libevent-1.4.14b-stable \ - --with-openssl-dir=/tmp/static-tor/openssl-0.9.8r/ \ - --with-zlib-dir=/tmp/static-tor/zlib-1.2.5 - -An example of how to build an entirely static tor: -./configure --enable-static-tor \ - --with-libevent-dir=/tmp/static-tor/libevent-1.4.14b-stable \ - --with-openssl-dir=/tmp/static-tor/openssl-0.9.8r/ \ - --with-zlib-dir=/tmp/static-tor/zlib-1.2.5 - diff --git a/changes/doc26588 b/changes/doc26588 new file mode 100644 index 000000000..4b67bdb03 --- /dev/null +++ b/changes/doc26588 @@ -0,0 +1,3 @@ + o Documentation: + - Remove old instructions from INSTALL document. Closes + ticket 26588.

1 0

[tor/master] Scrub IP in channel_tls_process_netinfo_cell() if SafeLogging is on
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 9c34f95b89e8c1c86c8564a40fcd1090180dd686 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jul 20 21:13:38 2018 +0300 Scrub IP in channel_tls_process_netinfo_cell() if SafeLogging is on --- src/core/or/channeltls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 87f5a02b7..96898993c 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1837,7 +1837,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) (int)(chan->conn->link_proto), hex_str(identity_digest, DIGEST_LEN), tor_addr_is_null(&my_apparent_addr) ? - "<none>" : fmt_and_decorate_addr(&my_apparent_addr)); + "<none>" : + safe_str_client(fmt_and_decorate_addr(&my_apparent_addr))); } assert_connection_ok(TO_CONN(chan->conn),time(NULL)); }

1 0

[tor/master] Add a sentence to manpage that we may not scrub logs at loglevels below Notice
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit a17e9d33781ae56107cfe4b1ece17c1273f8acec Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jul 20 21:35:13 2018 +0300 Add a sentence to manpage that we may not scrub logs at loglevels below Notice --- doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1db8cabf8..0c010d94f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -754,7 +754,9 @@ GENERAL OPTIONS If this option is set to 0, Tor will not perform any scrubbing, if it is set to 1, all potentially sensitive strings are replaced. If it is set to relay, all log messages generated when acting as a relay are sanitized, but - all messages generated when acting as a client are not. (Default: 1) + all messages generated when acting as a client are not. + Note: Tor may not heed this option when logging at log levels below Notice. + (Default: 1) [[User]] **User** __Username__:: On startup, setuid to this user and setgid to their primary group.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/244'
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit c775689e96be101d2818722aa92393190ca3fc6d Merge: 61d5bcc1a dddc9a171 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 11 10:05:15 2018 -0400 Merge remote-tracking branch 'tor-github/pr/244' changes/bug26882 | 5 +++++ doc/tor.1.txt | 4 +++- src/core/or/channeltls.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Add changes file
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit dddc9a1715a2101690adb4026be81c2cc1aad671 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jul 20 21:42:45 2018 +0300 Add changes file --- changes/bug26882 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug26882 b/changes/bug26882 new file mode 100644 index 000000000..adfe0e2f3 --- /dev/null +++ b/changes/bug26882 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, documentation): + - When SafeLogging is enabled, scrub IP address in + channel_tls_process_netinfo_cell(). Also, add a note + to manpage that scrubbing is not guaranteed on loglevels + below Notice. Fixes bug 26882; bugfix on 0.2.4.10-alpha.

1 0

[tor/master] Consider all routerinfo errors other than "not a server" transient
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 9c242e950b45ac67b2b741bc4e0c920a9a57cb43 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Aug 8 18:47:43 2018 +0300 Consider all routerinfo errors other than "not a server" transient --- src/feature/relay/router.c | 22 ++++++---------------- src/test/test_policy.c | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 0cc488723..40839f260 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -164,22 +164,12 @@ routerinfo_err_to_string(int err) int routerinfo_err_is_transient(int err) { - switch (err) { - case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR: - return 1; - case TOR_ROUTERINFO_ERROR_CANNOT_PARSE: - return 1; - case TOR_ROUTERINFO_ERROR_NOT_A_SERVER: - return 0; - case TOR_ROUTERINFO_ERROR_DIGEST_FAILED: - return 0; // XXX: bug? - case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE: - return 1; - case TOR_ROUTERINFO_ERROR_DESC_REBUILDING: - return 1; - } - - return 0; + /** + * For simplicity, we consider all errors other than + * "not a server" transient - see discussion on + * https://trac.torproject.org/projects/tor/ticket/27034 + */ + return err != TOR_ROUTERINFO_ERROR_NOT_A_SERVER; } /** Replace the current onion key with <b>k</b>. Does not affect diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 4b1adc91f..6a07e5b1f 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1706,7 +1706,7 @@ test_policies_getinfo_helper_policies(void *arg) rv = getinfo_helper_policies(NULL, "exit-policy/full", &answer, &errmsg); - tt_int_op(rv, OP_EQ, 0); + tt_int_op(rv, OP_EQ, -1); tt_ptr_op(answer, OP_EQ, NULL); tt_ptr_op(errmsg, OP_NE, NULL); tt_str_op(errmsg, OP_EQ, "Key digest failed");

1 0

[tor/master] Print stacktrace when crypto_pk_get_digest() fails in router_build_fresh_descriptor()
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 7a1007861f978abe0703a8fe062ed3c983bccd49 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Aug 8 18:56:27 2018 +0300 Print stacktrace when crypto_pk_get_digest() fails in router_build_fresh_descriptor() --- src/feature/relay/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 40839f260..e4ec01af2 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2350,8 +2350,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) } ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key()); - if (crypto_pk_get_digest(ri->identity_pkey, - ri->cache_info.identity_digest)<0) { + if (BUG(crypto_pk_get_digest(ri->identity_pkey, + ri->cache_info.identity_digest) < 0)) { routerinfo_free(ri); return TOR_ROUTERINFO_ERROR_DIGEST_FAILED; }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/268'
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 61d5bcc1a251002d726e66461ec576d9b71cebd1 Merge: b7ed61167 5f2e00241 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 11 10:04:04 2018 -0400 Merge remote-tracking branch 'tor-github/pr/268' changes/bug27034 | 6 ++++++ src/feature/relay/router.c | 26 ++++++++------------------ src/test/test_policy.c | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-)

1 0

[tor/master] Add changes file
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit 5f2e00241a35f7658bde4f9afb0a758588217e40 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Aug 8 19:07:50 2018 +0300 Add changes file --- changes/bug27034 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug27034 b/changes/bug27034 new file mode 100644 index 000000000..bdb7d29c1 --- /dev/null +++ b/changes/bug27034 @@ -0,0 +1,6 @@ + o Minor bugfixes (controller): + - Consider all routerinfo errors other than "not a server" + to be transient for the purpose of "GETINFO exit-policy/*" + controller request. Print stacktrace in the unlikely case + of failing to recompute routerinfo digest. Fixes bug 27034; + bugfix on 0.3.4.1-alpha.

1 0