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

[tor/release-0.3.5] changes: use correct bugfix release, and reword changes file for 31408
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 0614f839054a52e6e1a79a366fcc70da0691df66 Author: teor <teor(a)torproject.org> Date: Mon Sep 23 11:11:50 2019 +1000 changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug31408 b/changes/bug31408 index 7a6744cee..3e4ffa927 100644 --- a/changes/bug31408 +++ b/changes/bug31408 @@ -1,4 +1,5 @@ o Major bugfixes (torrc): - - Fix configuration files in a %included folder containing a - configuration file with only comments or whitespace being - ignored. Fixes bug 31408; bugfix on 0.4.0.5. + - Stop ignoring torrc options after an %include directive, when the + included directory ends with a file that does not contain any config + options. (But does contain comments or whitespace.) + Fixes bug 31408; bugfix on 0.3.1.1-alpha.

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 +++++ src/or/connection_edge.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 1fb110d3ab296c74b8380f8eb449fc9290583532 Merge: db5df1acf 1bde356bf Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:34 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ changes/ticket31466 | 5 ++++ src/core/or/channeltls.c | 10 ++++++- src/core/or/connection_edge.c | 6 ++-- src/feature/relay/router.c | 18 +++++------- src/lib/fs/conffile.c | 10 ++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++----- 11 files changed, 127 insertions(+), 24 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 ++++ src/feature/relay/router.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 ++++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 +++++ src/core/or/connection_edge.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells are always supposed to be variable-sized, right? This is incorrect, though. On a v1 link protocol connection, all cells are fixed-sized. There aren't supposed to be any VERSIONS cells with this version of the protocol, but apparently, somebody was messing up. (The v1 link protocol is obsolete, so probably the implementer responsible didn't mean to be using it.) Fixes bug 31107. Bugfix on 0.2.4.4-alpha, when we introduced a tor_fragile_assert() for this case. --- changes/bug31107 | 4 ++++ src/or/channeltls.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug31107 b/changes/bug31107 new file mode 100644 index 000000000..9652927c3 --- /dev/null +++ b/changes/bug31107 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, protocol violations): + - Do not log a nonfatal assertion failure when receiving a VERSIONS + cell on a connection using the obsolete v1 link protocol. Log a + protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index d44f71913..6f4e413dc 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1098,7 +1098,15 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) /* do nothing */ break; case CELL_VERSIONS: - tor_fragile_assert(); + /* A VERSIONS cell should always be a variable-length cell, and + * so should never reach this function (which handles constant-sized + * cells). But if the connection is using the (obsolete) v1 link + * protocol, all cells will be treated as constant-sized, and so + * it's possible we'll reach this code. + */ + log_fn(LOG_PROTOCOL_WARN, LD_CHANNEL, + "Received unexpected VERSIONS cell on a channel using link " + "protocol %d; ignoring.", conn->link_proto); break; case CELL_NETINFO: ++stats_n_netinfo_cells_processed;

1 0

[tor/release-0.4.0] test/rebind: Make control formatting and log parsing more robust
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor <teor(a)torproject.org> Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something * backslash-replace bad UTF-8 characters in logs * format control messages as ASCII: tor does not accept UTF-8 control commands Fixes bug 31837; bugfix on 0.3.5.1-alpha. --- changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug31837 b/changes/bug31837 new file mode 100644 index 000000000..0f976edfe --- /dev/null +++ b/changes/bug31837 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When testing port rebinding, don't busy-wait for tor to log. Instead, + actually sleep for a short time before polling again. Also improve the + formatting of control commands and log messages. + Fixes bug 31837; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 45ad1c546..30a587858 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -31,15 +31,17 @@ def wait_for_log(s): cutoff = time.time() + LOG_TIMEOUT while time.time() < cutoff: l = tor_process.stdout.readline() - l = l.decode('utf8') + l = l.decode('utf8', 'backslashreplace') if s in l: logging.info('Tor logged: "{}"'.format(l.strip())) return - logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) # readline() returns a blank string when there is no output # avoid busy-waiting - if len(s) == 0: + if len(l) == 0: + logging.debug('Tor has not logged anything, waiting for "{}"'.format(s)) time.sleep(LOG_WAIT) + else: + logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT)) def pick_random_port(): @@ -119,18 +121,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)): tor_process.terminate() fail('Cannot connect to ControlPort') -control_socket.sendall('AUTHENTICATE \r\n'.encode('utf8')) -control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('AUTHENTICATE \r\n'.encode('ascii')) +control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8')) +control_socket.sendall('SIGNAL HALT\r\n'.encode('ascii')) wait_for_log('exiting cleanly') logging.info('OK')

1 0

[tor/release-0.4.0] Avoid a crash if our "current" and "old" ntor onion keys are equal
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is running smoothly, but it's possible if you try to start a relay where secret_onion_key_ntor is the same as secret_onion_key_ntor.old. Fixes bug 30916; bugfix on 0.2.4.8-alpha when ntor keys were introduced. --- changes/bug30916 | 4 ++++ src/feature/relay/router.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug30916 b/changes/bug30916 new file mode 100644 index 000000000..b006bfc75 --- /dev/null +++ b/changes/bug30916 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid crashing when starting with a corrupt keys directory where + the old ntor key and the new ntor key are identical. Fixes bug 30916; + bugfix on 0.2.4.8-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 88a30cef0..1dbaf2ed6 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -286,7 +286,8 @@ construct_ntor_key_map(void) tor_memdup(&curve25519_onion_key, sizeof(curve25519_keypair_t))); } - if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN)) { + if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN) && + tor_memneq(cur_pk, last_pk, CURVE25519_PUBKEY_LEN)) { dimap_add_entry(&m, last_pk, tor_memdup(&last_curve25519_onion_key, sizeof(curve25519_keypair_t)));

1 0