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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 0994050c4a766fad94ce5108e99d18b0a6200e5f Merge: 57c4af16f 95e3527df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:32:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2 changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.2] Add test to check if the exit callback is called in process_t upon process_exec() failures.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 4ed06acb2ada14e424f453c24c477659b4cb7cbf Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 16:56:21 2019 +0200 Add test to check if the exit callback is called in process_t upon process_exec() failures. This patch adds a test to check for whether the exit callback is always called when process_exec() fails, both on Windows and Unix. See: https://bugs.torproject.org/31810 --- src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/test/test_process_slow.c b/src/test/test_process_slow.c index 91252c725..f311e8b29 100644 --- a/src/test/test_process_slow.c +++ b/src/test/test_process_slow.c @@ -328,8 +328,38 @@ test_callbacks_terminate(void *arg) process_free(process); } +static void +test_nonexistent_executable(void *arg) +{ + (void)arg; + + /* Process callback data. */ + process_data_t *process_data = process_data_new(); + + /* Setup our process. */ + process_t *process = process_new("binary-does-not-exist"); + process_set_data(process, process_data); + process_set_exit_callback(process, process_exit_callback); + + /* Run our process. */ + process_exec(process); + + /* Start our main loop. */ + run_main_loop(process_data); + + /* Ensure that the exit callback was actually called even though the binary + * did not exist. + */ + tt_assert(process_data->did_exit); + + done: + process_data_free(process_data); + process_free(process); +} + struct testcase_t slow_process_tests[] = { { "callbacks", test_callbacks, 0, NULL, NULL }, { "callbacks_terminate", test_callbacks_terminate, 0, NULL, NULL }, + { "nonexistent_executable", test_nonexistent_executable, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/release-0.4.2] Bump practracker exception limit for process_win32_exec().
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 95e3527df0d5d6f5da88df5ef2629d61cc7c689a Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 21:12:51 2019 +0200 Bump practracker exception limit for process_win32_exec(). I have added a larger comment there and one line of code, so I think this bump is reasonable. See: https://bugs.torproject.org/31810 --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index dcea3a3f4..7b15b37f8 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -311,7 +311,7 @@ problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 problem function-size /src/lib/osinfo/uname.c:get_uname() 116 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 -problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133 +problem function-size /src/lib/process/process_win32.c:process_win32_exec() 151 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 109 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102 problem function-size /src/lib/process/setuid.c:switch_id() 156

1 0

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

18 Oct '19

commit 8b27498f12f7e090ee6c887f11b939d095b3114d Merge: 1049cec5e 0994050c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:32:49 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 0994050c4a766fad94ce5108e99d18b0a6200e5f Merge: 57c4af16f 95e3527df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:32:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2 changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.4.2] Remove overly strict assertions in transports.c.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 389b37246eb6310401bfc3bcb80ee2fb8dcac56b Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Sep 24 16:42:00 2019 +0200 Remove overly strict assertions in transports.c. This patch removes an overly strict tor_assert() and an ignorable BUG() expression. Both of these would trigger if a PT was unable to configure itself during startup. The easy way to trigger this is to configure an obfs4 bridge where you make the obfs4 process try to bind on a port number under 1024. See: https://bugs.torproject.org/31091 --- changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/changes/ticket31091 b/changes/ticket31091 new file mode 100644 index 000000000..3cb9a2c37 --- /dev/null +++ b/changes/ticket31091 @@ -0,0 +1,3 @@ + o Minor bugfixes (pluggable transports): + - Remove overly strict assertions that triggers when a pluggable transport + is spawned in an unsuccessful manner. Fixes bug 31091; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e7ff3bf34..f34d4af48 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1826,15 +1826,13 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); - if (BUG(mp == NULL)) + if (mp == NULL) return; handle_proxy_line(line, mp); - if (proxy_configuration_finished(mp)) { + if (proxy_configuration_finished(mp)) handle_finished_proxy(mp); - tor_assert(mp->conf_state == PT_PROTO_COMPLETED); - } } /** Callback function that is called when our PT process have data on its

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 57c4af16f0d9e80c0adaaada61609497723f6184 Merge: fbd2fef22 389b37246 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:27:39 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2 changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 57c4af16f0d9e80c0adaaada61609497723f6184 Merge: fbd2fef22 389b37246 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:27:39 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2 changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)

1 0

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

18 Oct '19

commit 7c5716d162f2109f246fbd369185c973dd60b22b Merge: e2a42a1ab 57c4af16f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:27:49 2019 -0400 Merge branch 'maint-0.4.2' changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] Remove overly strict assertions in transports.c.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 389b37246eb6310401bfc3bcb80ee2fb8dcac56b Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Sep 24 16:42:00 2019 +0200 Remove overly strict assertions in transports.c. This patch removes an overly strict tor_assert() and an ignorable BUG() expression. Both of these would trigger if a PT was unable to configure itself during startup. The easy way to trigger this is to configure an obfs4 bridge where you make the obfs4 process try to bind on a port number under 1024. See: https://bugs.torproject.org/31091 --- changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/changes/ticket31091 b/changes/ticket31091 new file mode 100644 index 000000000..3cb9a2c37 --- /dev/null +++ b/changes/ticket31091 @@ -0,0 +1,3 @@ + o Minor bugfixes (pluggable transports): + - Remove overly strict assertions that triggers when a pluggable transport + is spawned in an unsuccessful manner. Fixes bug 31091; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e7ff3bf34..f34d4af48 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1826,15 +1826,13 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); - if (BUG(mp == NULL)) + if (mp == NULL) return; handle_proxy_line(line, mp); - if (proxy_configuration_finished(mp)) { + if (proxy_configuration_finished(mp)) handle_finished_proxy(mp); - tor_assert(mp->conf_state == PT_PROTO_COMPLETED); - } } /** Callback function that is called when our PT process have data on its

1 0