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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 04e9e74f1dd4fad7fe9e072253dd51b9c03bebf2 Merge: 5dbdca011 4a8d49132 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 13:07:39 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2 changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] mainloop: Disable periodic events before a destroy
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 4a8d4913227ea1d6b9302cda4703516595a3c1b5 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 15 13:33:48 2019 -0400 mainloop: Disable periodic events before a destroy When tearing down all periodic events during shutdown, disable them first so their enable flag is updated. This allows the tor_api.h to relaunch tor properly after a clean shutdown. Fixes #32058 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/ticket32058 b/changes/ticket32058 new file mode 100644 index 000000000..b40bcda41 --- /dev/null +++ b/changes/ticket32058 @@ -0,0 +1,5 @@ + o Minor bugfixes (mainloop, periodic events): + - Periodic events enabled flag was not unset properly when shutting down tor + cleanly. This had the side effect to not re-enable periodic events when + tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058; + bugfix on 0.3.3.1-alpha. diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c index 34690c54d..2651bbbc8 100644 --- a/src/core/mainloop/periodic.c +++ b/src/core/mainloop/periodic.c @@ -137,6 +137,11 @@ periodic_event_destroy(periodic_event_item_t *event) { if (!event) return; + + /* First disable the event so we first cancel the event and set its enabled + * flag properly. */ + periodic_event_disable(event); + mainloop_event_free(event->ev); event->last_action_time = 0; }

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 77c85360f66222365f2fbb98982b8bc0e4781acb Merge: 3539fdfd7 04e9e74f1 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 13:28:04 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

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

21 Oct '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.2] err: Use the correct type for cb_buf
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 0a5ce8280c7b7e4121237db5a29ea9e0084ffb05 Author: teor <teor(a)torproject.org> Date: Sun Oct 20 20:01:56 2019 +1000 err: Use the correct type for cb_buf Fixes bug 32060; bug not in any released version of tor. Resolves CID 1454761. --- src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index bc3ca286e..ce8ddcd7c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -85,7 +85,7 @@ static pthread_mutex_t cb_buf_mutex = PTHREAD_MUTEX_INITIALIZER; /** Lock and return a static stack pointer buffer that can hold up to * MAX_DEPTH function pointers. */ -static void * +static void ** lock_cb_buf(void) { /* Lock the mutex first, before even declaring the buffer. */ @@ -102,7 +102,7 @@ lock_cb_buf(void) /** Unlock the static stack pointer buffer. */ static void -unlock_cb_buf(void *cb_buf) +unlock_cb_buf(void **cb_buf) { memset(cb_buf, 0, SIZEOF_CB_BUF); pthread_mutex_unlock(&cb_buf_mutex); @@ -149,7 +149,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, char **symbols; size_t i; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int)depth); @@ -183,7 +183,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) int n_fds, i; const int *fds = NULL; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); (void) si; @@ -214,7 +214,7 @@ dump_stack_symbols_to_error_fds(void) const int *fds = NULL; size_t depth; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); @@ -256,7 +256,7 @@ install_bt_handler(void) * libc has pre-loaded the symbols we need to dump things, so that later * reads won't be denied by the sandbox code */ char **symbols; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); size_t depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5c8ecf364ae667104e63c43f9377601e3c572d9a Merge: 02e3e8eda cf2b00d3f Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:44:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2 changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5dbdca011454d1d6c9e83bcc1a970ec3c4f368da Merge: 5c8ecf364 0a5ce8280 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:45:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2 src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit bcf29f46c6eba9246cf125799afe710e7c9c2f01 Merge: d7c35378d 5dbdca011 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:45:30 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug31837 | 5 +++++ src/lib/err/backtrace.c | 12 ++++++------ src/test/test_rebind.py | 16 +++++++++------- 3 files changed, 20 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5c8ecf364ae667104e63c43f9377601e3c572d9a Merge: 02e3e8eda cf2b00d3f Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:44:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2 changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.2] test/rebind: Make control formatting and log parsing more robust
by teor＠torproject.org 21 Oct '19

21 Oct '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