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

[tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++++----- 5 files changed, 93 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.1] util/map_anon_nofork: Add a cast to avoid passing -48 to memset
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 9b73088c14fe24a1554950363fb80468c695937f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 3 07:21:25 2019 -0400 util/map_anon_nofork: Add a cast to avoid passing -48 to memset This fixes coverity CID 1454593, and bug 31948. Bug not in any released version of Tor. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6ecff6f1c..b4d8a4d76 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6190,7 +6190,7 @@ test_util_map_anon_nofork(void *arg) tor_munmap_anonymous(ptr, sz); ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, &inherit); tt_ptr_op(ptr, OP_NE, 0); - memset(ptr, TEST_VALUE, sz); + memset(ptr, (uint8_t)TEST_VALUE, sz); tt_int_op(0, OP_EQ, pipe(pipefd)); pid_t child = fork();

1 0

[tor/maint-0.4.1] test: Avoid a map_anon_nofork test failure on SunOS
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 2420c8c9366e498dfaf3b4b6389ece9dc27ca537 Author: teor <teor(a)torproject.org> Date: Mon Sep 30 14:54:56 2019 +1000 test: Avoid a map_anon_nofork test failure on SunOS This test failure happened due to a signed/unsigned integer comparison. This bug occurred on SunOS, it may also occur on other systems that use signed char as the default. (And cast 1-byte integer constants to an unsigned integer.) Fixes bug 31897; bugfix on 0.4.1.1-alpha. --- changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug31897 b/changes/bug31897 new file mode 100644 index 000000000..81c63e704 --- /dev/null +++ b/changes/bug31897 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests, SunOS): + - Avoid a map_anon_nofork test failure due to a signed/unsigned integer + comparison. Fixes bug 31897; bugfix on 0.4.1.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 2faadd4e1..6ecff6f1c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6182,6 +6182,7 @@ test_util_map_anon_nofork(void *arg) * crash, or send zero. */ char *ptr = NULL; + const char TEST_VALUE = 0xd0; size_t sz = 16384; int pipefd[2] = {-1, -1}; unsigned inherit=0; @@ -6189,7 +6190,7 @@ test_util_map_anon_nofork(void *arg) tor_munmap_anonymous(ptr, sz); ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, &inherit); tt_ptr_op(ptr, OP_NE, 0); - memset(ptr, 0xd0, sz); + memset(ptr, TEST_VALUE, sz); tt_int_op(0, OP_EQ, pipe(pipefd)); pid_t child = fork(); @@ -6220,7 +6221,7 @@ test_util_map_anon_nofork(void *arg) // noinherit isn't implemented. tt_int_op(inherit, OP_EQ, INHERIT_RES_KEEP); tt_int_op((int)r, OP_EQ, 1); // child should send us a byte. - tt_int_op(buf[0], OP_EQ, 0xd0); // that byte should what we set it to. + tt_int_op(buf[0], OP_EQ, TEST_VALUE); // that byte should be TEST_VALUE. } int ws;

1 0

[tor/maint-0.4.1] 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/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 03e77ef036e41486b8bfe138d11790c928f49f35 Merge: 54e2d0dc2 1bde356bf Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 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/maint-0.4.1] 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/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 4f9a0033920b21882c4b6eead3c55551826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] 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/maint-0.4.1] 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/maint-0.4.1] 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