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

[tor/master] Add test_cmdline.sh to distribution.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 14f48cb08387d2f9df3a16fb1816b80ce1649344 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 14:19:10 2019 -0400 Add test_cmdline.sh to distribution. --- src/test/include.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 77193d4a7..931e05498 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -413,7 +413,8 @@ EXTRA_DIST += \ src/test/test_workqueue_efd2.sh \ src/test/test_workqueue_pipe.sh \ src/test/test_workqueue_pipe2.sh \ - src/test/test_workqueue_socketpair.sh + src/test/test_workqueue_socketpair.sh \ + src/test/test_cmdline.sh test-rust: $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"

1 0

[tor/master] Merge branch 'tor-github/pr/1296'
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 41261c3b5cd505f5a601c319eb484866903814af Merge: 049705fc1 478141e61 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 11 09:42:31 2019 -0400 Merge branch 'tor-github/pr/1296' changes/ticket31625 | 4 ++ src/app/config/config.c | 13 +++- src/app/config/confparse.c | 124 +++++++++++++++++++++++++++++++------- src/app/config/confparse.h | 5 +- src/lib/conf/confmacros.h | 2 +- src/lib/conf/conftypes.h | 58 ++++++++++++++---- src/lib/confmgt/structvar.c | 23 ++----- src/lib/confmgt/structvar.h | 5 +- src/lib/confmgt/type_defs.c | 22 ++++--- src/lib/confmgt/typedvar.c | 29 --------- src/lib/confmgt/typedvar.h | 4 -- src/lib/confmgt/var_type_def_st.h | 16 ++--- src/test/include.am | 6 +- src/test/test_cmdline.sh | 48 +++++++++++++++ src/test/test_config.c | 26 ++++++++ 15 files changed, 269 insertions(+), 116 deletions(-)

1 0

[tor/master] Changes file for 31625 (config flag refactor)
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit d545fe1992432004689c66372f1a61e7c3fb7899 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:54 2019 -0400 Changes file for 31625 (config flag refactor) --- changes/ticket31625 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket31625 b/changes/ticket31625 new file mode 100644 index 000000000..822a921e4 --- /dev/null +++ b/changes/ticket31625 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Replace our ad-hoc set of flags for configuration variables and + configuration variable types with fine-grained orthogonal flags + corresponding to the actual behavior we want. Closes ticket 31625.

1 0

[tor/master] integration test for --list-torrc-options
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 7a8ea0d3c35d73e149e4f804e517cefa10e7afc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 12:54:09 2019 -0400 integration test for --list-torrc-options (This option tests our existing behavior, not necessarily the most sensible behavior.) --- src/test/include.am | 3 ++- src/test/test_cmdline.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 1ec54a286..77193d4a7 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -23,7 +23,8 @@ TESTSCRIPTS = \ src/test/test_workqueue_pipe.sh \ src/test/test_workqueue_pipe2.sh \ src/test/test_workqueue_socketpair.sh \ - src/test/test_switch_id.sh + src/test/test_switch_id.sh \ + src/test/test_cmdline.sh if USE_RUST TESTSCRIPTS += \ diff --git a/src/test/test_cmdline.sh b/src/test/test_cmdline.sh new file mode 100755 index 000000000..cf758c385 --- /dev/null +++ b/src/test/test_cmdline.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +umask 077 +set -e + +if [ $# -ge 1 ]; then + TOR_BINARY="${1}" + shift +else + TOR_BINARY="${TESTING_TOR_BINARY:-./src/app/tor}" +fi + +echo "TOR BINARY IS ${TOR_BINARY}" + +die() { echo "$1" >&2 ; exit 5; } + +echo "A" + +DATA_DIR=$(mktemp -d -t tor_cmdline_tests.XXXXXX) +trap 'rm -rf "$DATA_DIR"' 0 + +# 1. Test list-torrc-options. +OUT="${DATA_DIR}/output" + +echo "B" +"${TOR_BINARY}" --list-torrc-options > "$OUT" + +echo "C" + +# regular options are given. +grep -i "SocksPort" "$OUT" >/dev/null || die "Did not find SocksPort" + + +echo "D" + +# unlisted options are given, since they do not have the NOSET flag. +grep -i "__SocksPort" "$OUT" > /dev/null || die "Did not find __SocksPort" + +echo "E" + +# unsettable options are not given. +if grep -i "DisableIOCP" "$OUT" /dev/null; then + die "Found DisableIOCP" +fi +if grep -i "HiddenServiceOptions" "$OUT" /dev/null ; then + die "Found HiddenServiceOptions" +fi +echo "OK"

1 0

[tor/master] subsys: Make the subsystem init order match the module dependencies
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 612b0a41399d0ddf260f4f6dd989fcc97d069fbd Author: teor <teor(a)torproject.org> Date: Wed Sep 4 15:40:57 2019 +1000 subsys: Make the subsystem init order match the module dependencies Fix levels for subsystems that depend on log/err * winprocess (security) doesn't use err: * call windows process security APIs as early as possible * init err after winprocess * move wallclock so it's still after err * network and time depend on log: * make sure that network and time can use logging. * init network and time after log Add comments explaining the module init order. Fixes bug 31615; bugfix on 0.4.0.1-alpha. --- changes/bug31615 | 5 +++++ src/lib/err/torerr_sys.c | 5 ++++- src/lib/log/log_sys.c | 2 ++ src/lib/net/network_sys.c | 4 +++- src/lib/process/winprocess_sys.c | 2 ++ src/lib/thread/compat_threads.c | 2 ++ src/lib/time/time_sys.c | 4 +++- src/lib/wallclock/approx_time.c | 4 +++- 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/bug31615 b/changes/bug31615 new file mode 100644 index 000000000..49b13bea9 --- /dev/null +++ b/changes/bug31615 @@ -0,0 +1,5 @@ + o Minor bugfixes (subsystems): + - Make the subsystem init order match the subsystem module dependencies. + Call windows process security APIs as early as possible. Init log before + network and time, so that network and time can use logging. + Fixes bug 31615; bugfix on 0.4.0.1-alpha. diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c index 3ab1b3c4e..34f70f1f0 100644 --- a/src/lib/err/torerr_sys.c +++ b/src/lib/err/torerr_sys.c @@ -33,7 +33,10 @@ subsys_torerr_shutdown(void) const subsys_fns_t sys_torerr = { .name = "err", - .level = -100, + /* Low-level error handling is a diagnostic feature, we want it to init + * right after windows process security, and shutdown last. + * (Security never shuts down.) */ + .level = -99, .supported = true, .initialize = subsys_torerr_initialize, .shutdown = subsys_torerr_shutdown diff --git a/src/lib/log/log_sys.c b/src/lib/log/log_sys.c index d1080f226..826358546 100644 --- a/src/lib/log/log_sys.c +++ b/src/lib/log/log_sys.c @@ -29,6 +29,8 @@ subsys_logging_shutdown(void) const subsys_fns_t sys_logging = { .name = "log", .supported = true, + /* Logging depends on threads, approx time, raw logging, and security. + * Most other lib modules depend on logging. */ .level = -90, .initialize = subsys_logging_initialize, .shutdown = subsys_logging_shutdown, diff --git a/src/lib/net/network_sys.c b/src/lib/net/network_sys.c index 9dfdb2b45..e0a2625d7 100644 --- a/src/lib/net/network_sys.c +++ b/src/lib/net/network_sys.c @@ -37,7 +37,9 @@ subsys_network_shutdown(void) const subsys_fns_t sys_network = { .name = "network", - .level = -90, + /* Network depends on logging, and a lot of other modules depend on network. + */ + .level = -80, .supported = true, .initialize = subsys_network_initialize, .shutdown = subsys_network_shutdown, diff --git a/src/lib/process/winprocess_sys.c b/src/lib/process/winprocess_sys.c index 1266babca..407eeaaee 100644 --- a/src/lib/process/winprocess_sys.c +++ b/src/lib/process/winprocess_sys.c @@ -58,6 +58,8 @@ subsys_winprocess_initialize(void) const subsys_fns_t sys_winprocess = { .name = "winprocess", + /* HeapEnableTerminationOnCorruption and setdeppolicy() are security + * features, we want them to run first. */ .level = -100, .supported = WINPROCESS_SYS_ENABLED, .initialize = subsys_winprocess_initialize, diff --git a/src/lib/thread/compat_threads.c b/src/lib/thread/compat_threads.c index 35cfeba64..1c4a5c4e3 100644 --- a/src/lib/thread/compat_threads.c +++ b/src/lib/thread/compat_threads.c @@ -122,6 +122,8 @@ subsys_threads_initialize(void) const subsys_fns_t sys_threads = { .name = "threads", .supported = true, + /* Threads is used by logging, which is a diagnostic feature, we want it to + * init right after low-level error handling and approx time. */ .level = -95, .initialize = subsys_threads_initialize, }; diff --git a/src/lib/time/time_sys.c b/src/lib/time/time_sys.c index b3feb7b46..8b9aa2856 100644 --- a/src/lib/time/time_sys.c +++ b/src/lib/time/time_sys.c @@ -20,7 +20,9 @@ subsys_time_initialize(void) const subsys_fns_t sys_time = { .name = "time", - .level = -90, + /* Monotonic time depends on logging, and a lot of other modules depend on + * monotonic time. */ + .level = -80, .supported = true, .initialize = subsys_time_initialize, }; diff --git a/src/lib/wallclock/approx_time.c b/src/lib/wallclock/approx_time.c index 7b3280402..77eeddaf5 100644 --- a/src/lib/wallclock/approx_time.c +++ b/src/lib/wallclock/approx_time.c @@ -54,6 +54,8 @@ subsys_wallclock_initialize(void) const subsys_fns_t sys_wallclock = { .name = "wallclock", .supported = true, - .level = -99, + /* Approximate time is a diagnostic feature, we want it to init right after + * low-level error handling. */ + .level = -98, .initialize = subsys_wallclock_initialize, };

1 0

[tor/master] main: remove level number comments from the subsystem list (0.4.0)
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 2e2a35b6943810257b6917648db90ed5d46505e1 Author: teor <teor(a)torproject.org> Date: Tue Sep 10 08:35:56 2019 +1000 main: remove level number comments from the subsystem list (0.4.0) These levels get out of date really easily: we'll implement a level dump command in tor in 31614. They also cause conflicts and inconsistencies when merging forward level changes. Part of 31615. --- src/app/main/subsystem_list.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 383417618..81b58cf70 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -27,23 +27,25 @@ /** * Global list of the subsystems in Tor, in the order of their initialization. + * Want to know the exact level numbers? + * We'll implement a level dump command in #31614. **/ const subsys_fns_t *tor_subsystems[] = { - &sys_winprocess, /* -100 */ - &sys_torerr, /* -100 */ - &sys_wallclock, /* -99 */ - &sys_threads, /* -95 */ - &sys_logging, /* -90 */ - &sys_time, /* -90 */ - &sys_network, /* -90 */ - &sys_compress, /* -70 */ - &sys_crypto, /* -60 */ - &sys_tortls, /* -50 */ - &sys_process, /* -35 */ + &sys_winprocess, + &sys_torerr, + &sys_wallclock, + &sys_threads, + &sys_logging, + &sys_time, + &sys_network, + &sys_compress, + &sys_crypto, + &sys_tortls, + &sys_process, - &sys_orconn_event, /* -33 */ - &sys_ocirc_event, /* -32 */ - &sys_btrack, /* -30 */ + &sys_orconn_event, + &sys_ocirc_event, + &sys_btrack, }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems);

1 0

[tor/master] main: remove level number comments from the subsystem list (0.4.1)
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit f1c57cd1e5d8ae88f28f764fef7f17081ebf2961 Author: teor <teor(a)torproject.org> Date: Tue Sep 10 08:44:35 2019 +1000 main: remove level number comments from the subsystem list (0.4.1) Part of 31615. --- src/app/main/subsystem_list.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index c63788715..989b0d6f8 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -52,13 +52,13 @@ const subsys_fns_t *tor_subsystems[] = { &sys_ocirc_event, &sys_btrack, - &sys_mainloop, /* 5 */ - &sys_or, /* 20 */ + &sys_mainloop, + &sys_or, - &sys_relay, /* 50 */ + &sys_relay, #ifdef HAVE_MODULE_DIRAUTH - &sys_dirauth, /* 70 */ + &sys_dirauth, #endif };

1 0

[tor/master] Merge branch 'bug31615_040' into bug31615_041
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 7e22d9934658c27ba0d45455959f46207a190649 Merge: 4596ead2f 2e2a35b69 Author: teor <teor(a)torproject.org> Date: Tue Sep 10 08:43:13 2019 +1000 Merge branch 'bug31615_040' into bug31615_041 Merged modified lines from bug31615_040, and unmodified lines from maint-0.4.1. changes/bug31615 | 5 +++++ src/app/main/subsystem_list.c | 32 +++++++++++++++++--------------- src/lib/err/torerr_sys.c | 5 ++++- src/lib/log/log_sys.c | 2 ++ src/lib/net/network_sys.c | 4 +++- src/lib/process/winprocess_sys.c | 2 ++ src/lib/thread/compat_threads.c | 2 ++ src/lib/time/time_sys.c | 4 +++- src/lib/wallclock/approx_time.c | 4 +++- 9 files changed, 41 insertions(+), 19 deletions(-) diff --cc src/app/main/subsystem_list.c index f59579623,81b58cf70..c63788715 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@@ -32,32 -27,25 +32,34 @@@ /** * Global list of the subsystems in Tor, in the order of their initialization. + * Want to know the exact level numbers? + * We'll implement a level dump command in #31614. **/ const subsys_fns_t *tor_subsystems[] = { - &sys_winprocess, /* -100 */ - &sys_torerr, /* -100 */ - &sys_wallclock, /* -99 */ - &sys_threads, /* -95 */ - &sys_logging, /* -90 */ - &sys_time, /* -90 */ - &sys_network, /* -90 */ - &sys_compress, /* -70 */ - &sys_crypto, /* -60 */ - &sys_tortls, /* -50 */ - &sys_process, /* -35 */ - - &sys_orconn_event, /* -33 */ - &sys_ocirc_event, /* -32 */ - &sys_btrack, /* -30 */ + &sys_winprocess, + &sys_torerr, + &sys_wallclock, + &sys_threads, + &sys_logging, + &sys_time, + &sys_network, + &sys_compress, + &sys_crypto, + &sys_tortls, + &sys_process, + + &sys_orconn_event, + &sys_ocirc_event, + &sys_btrack, + + &sys_mainloop, /* 5 */ + &sys_or, /* 20 */ + + &sys_relay, /* 50 */ + +#ifdef HAVE_MODULE_DIRAUTH + &sys_dirauth, /* 70 */ +#endif }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems);

1 0

[tor/master] Merge branch 'bug31615_041' into bug31615_master
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 987768b07766e752d7aa7234916abe1e8e2feb87 Merge: 796a9b37e f1c57cd1e Author: teor <teor(a)torproject.org> Date: Tue Sep 10 09:03:37 2019 +1000 Merge branch 'bug31615_041' into bug31615_master Merged modified lines from bug31615_041, and unmodified lines from master. changes/bug31615 | 5 +++++ src/app/main/subsystem_list.c | 38 ++++++++++++++++++++------------------ src/lib/err/torerr_sys.c | 5 ++++- src/lib/log/log_sys.c | 2 ++ src/lib/net/network_sys.c | 4 +++- src/lib/process/winprocess_sys.c | 2 ++ src/lib/thread/compat_threads.c | 2 ++ src/lib/time/time_sys.c | 4 +++- src/lib/wallclock/approx_time.c | 4 +++- 9 files changed, 44 insertions(+), 22 deletions(-) diff --cc src/app/main/subsystem_list.c index 95d96f78d,989b0d6f8..d525708e7 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@@ -33,33 -32,33 +33,35 @@@ /** * Global list of the subsystems in Tor, in the order of their initialization. + * Want to know the exact level numbers? + * We'll implement a level dump command in #31614. **/ const subsys_fns_t *tor_subsystems[] = { - &sys_winprocess, /* -100 */ - &sys_torerr, /* -100 */ - &sys_wallclock, /* -99 */ - &sys_threads, /* -95 */ - &sys_logging, /* -90 */ - &sys_time, /* -90 */ - &sys_network, /* -90 */ - &sys_compress, /* -70 */ - &sys_crypto, /* -60 */ - &sys_tortls, /* -50 */ - &sys_process, /* -35 */ + &sys_winprocess, + &sys_torerr, + &sys_wallclock, + &sys_threads, + &sys_logging, + &sys_time, + &sys_network, + &sys_compress, + &sys_crypto, + &sys_tortls, + &sys_process, - &sys_orconn_event, /* -33 */ - &sys_ocirc_event, /* -32 */ - &sys_btrack, /* -30 */ + &sys_orconn_event, + &sys_ocirc_event, + &sys_btrack, + &sys_evloop, /* -20 */ + - &sys_mainloop, /* 5 */ - &sys_or, /* 20 */ + &sys_mainloop, + &sys_or, - &sys_relay, /* 50 */ + &sys_relay, #ifdef HAVE_MODULE_DIRAUTH - &sys_dirauth, /* 70 */ + &sys_dirauth, #endif };

1 0

[tor/master] main: remove level number comments from the subsystem list (master)
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 5fa75a6cd45d81476d5648665717d46a406845bf Author: teor <teor(a)torproject.org> Date: Tue Sep 10 09:04:38 2019 +1000 main: remove level number comments from the subsystem list (master) Part of 31615. --- src/app/main/subsystem_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index d525708e7..67cb12363 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -53,7 +53,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_ocirc_event, &sys_btrack, - &sys_evloop, /* -20 */ + &sys_evloop, &sys_mainloop, &sys_or,

1 0