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

[tor/master] Extract log-granularity code into its own function.
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 6d15fab2dc377503aa20086723b6faf41a0a0d34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 11:58:53 2019 -0400 Extract log-granularity code into its own function. This pleases practracker. --- src/app/config/config.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1c04dcaf0..5f59ce32f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5672,22 +5672,14 @@ open_and_add_file_log(const log_severity_list_t *severity, } /** - * Initialize the logs based on the configuration file. - */ -STATIC int -options_init_logs(const or_options_t *old_options, or_options_t *options, - int validate_only) + * Try to set our global log granularity from `options->LogGranularity`, + * adjusting it as needed so that we are an even divisor of a second, or an + * even multiple of seconds. Return 0 on success, -1 on failure. + **/ +static int +options_init_log_granularity(const or_options_t *options, + int validate_only) { - config_line_t *opt; - int ok; - smartlist_t *elts; - int run_as_daemon = -#ifdef _WIN32 - 0; -#else - options->RunAsDaemon; -#endif - if (options->LogTimeGranularity <= 0) { log_warn(LD_CONFIG, "Log time granularity '%d' has to be positive.", options->LogTimeGranularity); @@ -5717,6 +5709,29 @@ options_init_logs(const or_options_t *old_options, or_options_t *options, set_log_time_granularity(options->LogTimeGranularity); } + return 0; +} + +/** + * Initialize the logs based on the configuration file. + */ +STATIC int +options_init_logs(const or_options_t *old_options, or_options_t *options, + int validate_only) +{ + config_line_t *opt; + int ok; + smartlist_t *elts; + int run_as_daemon = +#ifdef _WIN32 + 0; +#else + options->RunAsDaemon; +#endif + + if (options_init_log_granularity(options, validate_only) < 0) + return -1; + ok = 1; elts = smartlist_new();

1 0

[tor/master] Merge branch 'from_setconf_removal_squashed'
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 65e80ce6463b2ee0ed331535e5f50da52ce7d171 Merge: b3478a885 0bb2e7728 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 07:50:42 2019 -0400 Merge branch 'from_setconf_removal_squashed' changes/ticket31999 | 6 ++ src/app/config/config.c | 68 ++++++++------- src/app/config/config.h | 2 + src/app/config/quiet_level.c | 33 ++++++++ src/app/config/quiet_level.h | 2 + src/app/main/main.c | 23 +---- src/core/include.am | 1 + src/lib/log/log.c | 29 +++---- src/lib/log/log.h | 16 ++-- src/test/test_options.c | 196 ++++++++++++++++++++++++++++++++++++++++++- src/test/testing_common.c | 3 + 11 files changed, 300 insertions(+), 79 deletions(-)

1 0

[tor/master] Make a pair of add_*_log() functions mockable.
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit f4fc633937b56e52087c0e1c7a962a3a8cd7d2d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 11:42:20 2019 -0400 Make a pair of add_*_log() functions mockable. --- src/lib/log/log.c | 18 +++++++++--------- src/lib/log/log.h | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index ddd0eac6e..dc53b386b 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -276,8 +276,8 @@ static int log_time_granularity = 1; /** Define log time granularity for all logs to be granularity_msec * milliseconds. */ -void -set_log_time_granularity(int granularity_msec) +MOCK_IMPL(void, +set_log_time_granularity,(int granularity_msec)) { log_time_granularity = granularity_msec; tor_log_sigsafe_err_set_granularity(granularity_msec); @@ -937,9 +937,9 @@ set_log_severity_config(int loglevelMin, int loglevelMax, /** Add a log handler named name to send all messages in severity * to fd. Copies severity. Helper: does no locking. */ -static void -add_stream_log_impl(const log_severity_list_t *severity, - const char *name, int fd) +MOCK_IMPL(STATIC void, +add_stream_log_impl,(const log_severity_list_t *severity, + const char *name, int fd)) { logfile_t *lf; lf = tor_malloc_zero(sizeof(logfile_t)); @@ -1199,10 +1199,10 @@ mark_logs_temp(void) * opening the logfile failed, -1 is returned and errno is set appropriately * (by open(2)). Takes ownership of fd. */ -int -add_file_log(const log_severity_list_t *severity, - const char *filename, - int fd) +MOCK_IMPL(int, +add_file_log,(const log_severity_list_t *severity, + const char *filename, + int fd)) { logfile_t *lf; diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 4dead0fd2..374db76e1 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -163,11 +163,11 @@ int parse_log_severity_config(const char **cfg, log_severity_list_t *severity_out); void set_log_severity_config(int minSeverity, int maxSeverity, log_severity_list_t *severity_out); -void add_stream_log(const log_severity_list_t *severity, const char *name, - int fd); -int add_file_log(const log_severity_list_t *severity, - const char *filename, - int fd); +void add_stream_log(const log_severity_list_t *severity, + const char *name, int fd); +MOCK_DECL(int, add_file_log,(const log_severity_list_t *severity, + const char *filename, + int fd)); #ifdef HAVE_SYSLOG_H int add_syslog_log(const log_severity_list_t *severity, @@ -194,7 +194,7 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, void flush_pending_log_callbacks(void); void flush_log_messages_from_startup(void); void log_set_application_name(const char *name); -void set_log_time_granularity(int granularity_msec); +MOCK_DECL(void, set_log_time_granularity,(int granularity_msec)); void truncate_logs(void); void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) @@ -306,6 +306,8 @@ extern const log_domain_mask_t LD_GENERAL_; MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) CHECK_PRINTF(5,0)); +MOCK_DECL(STATIC void, add_stream_log_impl,( + const log_severity_list_t *severity, const char *name, int fd)); #endif #if defined(LOG_PRIVATE) || defined(TOR_UNIT_TESTS)

1 0

[torspec/master] Remove "hyphae" bridge distribution method.
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit f09e55ca97fef08bf68c0c2889b917e7b8bd6a08 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 19 12:55:09 2019 -0700 Remove "hyphae" bridge distribution method. This bridge distribution method was never finished: <https://bugs.torproject.org/22775> --- dir-spec.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index f620751..921552b 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -634,10 +634,10 @@ The "Method" describes how a Bridge address is distributed by BridgeDB. Recognized methods are: "none", "any", "https", "email", - "moat", "hyphae". If set to "none", BridgeDB will avoid distributing - your bridge address. If set to "any", BridgeDB will choose how to - distribute your bridge address. Choosing any of the other methods will - tell BridgeDB to distribute your bridge via a specific method: + "moat". If set to "none", BridgeDB will avoid distributing your bridge + address. If set to "any", BridgeDB will choose how to distribute your + bridge address. Choosing any of the other methods will tell BridgeDB to + distribute your bridge via a specific method: - "https" specifies distribution via the web interface at https://bridges.torproject.org; @@ -645,8 +645,6 @@ bridges(a)torproject.org; - "moat" specifies distribution via an interactive menu inside Tor Browser; and - - "hyphae" specifies distribution via a cryptographically-secure, - invitation-based system. Potential future "Method" specifiers must be as follows: Method = (KeywordChar | "_") +

1 0

[torspec/master] Merge remote-tracking branch 'NullHypothesis/fix/31807' into master
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit e88766eb0f054aac304827f16d35f8cfdf0bd5fe Merge: b7cfa86 7c79571 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:53:17 2019 +1000 Merge remote-tracking branch 'NullHypothesis/fix/31807' into master dir-spec.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

1 0

[torspec/master] Remove outdated note.
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 7c79571dd28656a6942cb15d8b8c71f4afe46820 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 19 12:56:04 2019 -0700 Remove outdated note. BridgeDB supports bridge-distribution lines since version 0.5.0: <https://bugs.torproject.org/23957> --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 921552b..2a38d3b 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -650,7 +650,7 @@ Method = (KeywordChar | "_") + All bridges SHOULD include this line. Non-bridges MUST NOT include - it. (It is currently ignored by Bridge DB.) + it. BridgeDB SHOULD treat unrecognized Method values as if they were "none".

1 0

[tor/release-0.2.9] Travis: Disable all but one macOS build
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 511aeba8eeb24a953228e00917f64703059a7673 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:34:47 2019 +1000 Travis: Disable all but one macOS build We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177. --- .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 564c97dbf..7c7fcf4f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,9 @@ matrix: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 new file mode 100644 index 000000000..6d6816acd --- /dev/null +++ b/changes/ticket32177 @@ -0,0 +1,3 @@ + o Testing: + - Disable all but one Travis CI macOS build, to mitigate slow scheduling + of Travis macOS jobs. Closes ticket 32177.

1 0

[tor/release-0.3.5] Travis: Disable all but one macOS build
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 511aeba8eeb24a953228e00917f64703059a7673 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:34:47 2019 +1000 Travis: Disable all but one macOS build We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177. --- .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 564c97dbf..7c7fcf4f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,9 @@ matrix: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 new file mode 100644 index 000000000..6d6816acd --- /dev/null +++ b/changes/ticket32177 @@ -0,0 +1,3 @@ + o Testing: + - Disable all but one Travis CI macOS build, to mitigate slow scheduling + of Travis macOS jobs. Closes ticket 32177.

1 0

[tor/release-0.3.5] Merge branch 'ticket32177_029' into ticket32177_035
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 92ad87b8082423af2b9873c921eebce5cc5fe296 Merge: 4b8e5ea0d 511aeba8e Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:37:32 2019 +1000 Merge branch 'ticket32177_029' into ticket32177_035 Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029. .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc .travis.yml index 65088d556,7c7fcf4f6..147ca41df --- a/.travis.yml +++ b/.travis.yml @@@ -37,30 -30,18 +37,31 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + ## We check disable module dirauth + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## We run rust on macOS, because we have seen macOS rust failures before + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded.

1 0

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

22 Oct '19

commit 14ba43f92edf54343c7358d7c32f5f0993c9a5ae Merge: 73b18f1f1 511aeba8e Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:46:08 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0