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

[tor/master] Merge branch 'ticket28668_035' into ticket28668_040
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit d23704bf26ae6c00e97fb0c3ceb4a362c49eaf07 Merge: 3da3aca08 2d74da3d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 23 14:50:22 2019 -0500 Merge branch 'ticket28668_035' into ticket28668_040 changes/bug29161 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 2 +- src/test/test_util.c | 21 +++++++++++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix a LOG_ERR message from test_pt.c
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 3da3aca08f022f6c1e33a06afe4e30804754d005 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 15:54:35 2019 -0500 Fix a LOG_ERR message from test_pt.c Fixes an instance of ticket28668. --- src/test/test_pt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index bacb6d5a3..8759f05e8 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -23,6 +23,8 @@ #include "app/config/or_state_st.h" +#include "test/log_test_helpers.h" + static void reset_mp(managed_proxy_t *mp) { @@ -414,7 +416,10 @@ test_pt_configure_proxy(void *arg) "650 TRANSPORT_LAUNCHED server mock5 127.0.0.1 5555\r\n"); /* Get the log message out. */ + setup_full_capture_of_logs(LOG_ERR); process_notify_event_stdout(mp->process); + expect_single_log_msg_containing("Oh noes, something bad happened"); + teardown_capture_of_logs(); tt_int_op(controlevent_n, OP_EQ, 10); tt_int_op(controlevent_event, OP_EQ, EVENT_PT_LOG); @@ -475,6 +480,7 @@ test_pt_configure_proxy(void *arg) } done: + teardown_capture_of_logs(); or_state_free(dummy_state); UNMOCK(process_read_stdout); UNMOCK(get_or_state);

1 0

[tor/master] If address/get_if_addrs6 can't findipv6, log WARN, not ERR
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 54c9c8b04f6055dc4101b6a36cfb587af78dc9b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 23 12:04:57 2019 -0500 If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede. --- changes/ticket29160 | 4 ++++ src/test/test_address.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29160 b/changes/ticket29160 new file mode 100644 index 000000000..8e1118306 --- /dev/null +++ b/changes/ticket29160 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Do not log an error-level message if we fail to find an IPv6 + network interface from the unit tests. Fixes bug 29160; bugfix on + 0.2.7.3-rc. diff --git a/src/test/test_address.c b/src/test/test_address.c index 43467aca1..cfb32b855 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) (void)arg; - rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr); /* Work even on systems without IPv6 interfaces */ if (rv == 0) { @@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES }; -

1 0

[tor/master] Capture more BUG warnings in util/time test
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 6144cf99adae5ffebbc549a4e0f3c6e05e51ad16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 23 12:37:12 2019 -0500 Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161. --- changes/bug29161 | 3 +++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_util.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/changes/bug29161 b/changes/bug29161 new file mode 100644 index 000000000..39a638acf --- /dev/null +++ b/changes/bug29161 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Detect and suppress "bug" warnings from the util/time test on Windows. + Fixes bug 29161; bugfix on 0.2.9.3-alpha. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 5b2440d1a..40543d41e 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -39,6 +39,8 @@ * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs localtime outputs as a BUG. */ struct tm * tor_localtime_r(const time_t *timep, struct tm *result) @@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs or gmtime outputs as a BUG. */ struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/test/test_util.c b/src/test/test_util.c index 089c1f1d7..6a7b42b78 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -690,6 +690,12 @@ test_util_time(void *arg) expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) +#define CHECK_POSSIBLE_EINVAL() do { \ + if (mock_saved_log_n_entries()) { \ + expect_single_log_msg_containing("Invalid argument"); \ + } \ + teardown_capture_of_logs(); \ + } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") @@ -885,12 +891,16 @@ test_util_time(void *arg) if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { t_res = -1*(1 << 30); + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1935-1900)); t_res = INT32_MIN; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1901-1900)); } @@ -900,7 +910,9 @@ test_util_time(void *arg) /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -926,7 +938,9 @@ test_util_time(void *arg) { /* As above, but with localtime. */ t_res = -9223372036854775LL; + CAPTURE(); tor_localtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -983,7 +997,9 @@ test_util_time(void *arg) /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); @@ -1004,7 +1020,9 @@ test_util_time(void *arg) { /* As above but with localtime. */ t_res = 9223372036854775LL; + CAPTURE(); tor_localtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); @@ -1216,7 +1234,9 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ tv.tv_sec = (time_t)2150000000UL; + CAPTURE(); format_iso_time(timestr, (time_t)tv.tv_sec); + CHECK_POSSIBLE_EINVAL(); #if SIZEOF_TIME_T == 4 /* format_iso_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. @@ -1231,6 +1251,7 @@ test_util_time(void *arg) #undef CAPTURE #undef CHECK_TIMEGM_ARG_OUT_OF_RANGE +#undef CHECK_POSSIBLE_EINVAL done: teardown_capture_of_logs();

1 0

[tor/master] Merge branch 'maint-0.3.5'
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit d043096d596b7c83de354776a2ee1a799c8b6a5d Merge: d5de1a0a5 6efc2a0e1 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 13 11:02:09 2019 -0500 Merge branch 'maint-0.3.5'

1 0

[tor/master] Merge branch 'tor-github/pr/651'
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit d5de1a0a5514c51d39f8acdb0c906a186854e681 Merge: c320c52e8 bbe417ae8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 13 11:02:02 2019 -0500 Merge branch 'tor-github/pr/651' changes/bug29161 | 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 2 +- src/test/test_pt.c | 6 ++++++ src/test/test_util.c | 24 ++++++++++++++++++++++++ src/test/testing_common.c | 18 ++++++++++++++++++ 8 files changed, 63 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'tor-github/pr/650' into maint-0.3.5
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 6efc2a0e1f785e1e12fb8c7fd4b6aa4feceb647a Merge: 2e770216c d71ca3968 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 13 10:56:24 2019 -0500 Merge branch 'tor-github/pr/650' into maint-0.3.5 changes/bug29161 | 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 ++++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_address.c | 3 +-- src/test/test_util.c | 24 ++++++++++++++++++++++++ src/test/testing_common.c | 18 ++++++++++++++++++ 7 files changed, 57 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Capture more BUG warnings in util/time test
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 6144cf99adae5ffebbc549a4e0f3c6e05e51ad16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 23 12:37:12 2019 -0500 Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161. --- changes/bug29161 | 3 +++ src/lib/encoding/time_fmt.c | 4 ++++ src/test/test_util.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/changes/bug29161 b/changes/bug29161 new file mode 100644 index 000000000..39a638acf --- /dev/null +++ b/changes/bug29161 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Detect and suppress "bug" warnings from the util/time test on Windows. + Fixes bug 29161; bugfix on 0.2.9.3-alpha. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 5b2440d1a..40543d41e 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -39,6 +39,8 @@ * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs localtime outputs as a BUG. */ struct tm * tor_localtime_r(const time_t *timep, struct tm *result) @@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs or gmtime outputs as a BUG. */ struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/test/test_util.c b/src/test/test_util.c index 089c1f1d7..6a7b42b78 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -690,6 +690,12 @@ test_util_time(void *arg) expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) +#define CHECK_POSSIBLE_EINVAL() do { \ + if (mock_saved_log_n_entries()) { \ + expect_single_log_msg_containing("Invalid argument"); \ + } \ + teardown_capture_of_logs(); \ + } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") @@ -885,12 +891,16 @@ test_util_time(void *arg) if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { t_res = -1*(1 << 30); + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1935-1900)); t_res = INT32_MIN; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1901-1900)); } @@ -900,7 +910,9 @@ test_util_time(void *arg) /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -926,7 +938,9 @@ test_util_time(void *arg) { /* As above, but with localtime. */ t_res = -9223372036854775LL; + CAPTURE(); tor_localtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -983,7 +997,9 @@ test_util_time(void *arg) /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; + CAPTURE(); tor_gmtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); @@ -1004,7 +1020,9 @@ test_util_time(void *arg) { /* As above but with localtime. */ t_res = 9223372036854775LL; + CAPTURE(); tor_localtime_r(&t_res, &b_time); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); @@ -1216,7 +1234,9 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ tv.tv_sec = (time_t)2150000000UL; + CAPTURE(); format_iso_time(timestr, (time_t)tv.tv_sec); + CHECK_POSSIBLE_EINVAL(); #if SIZEOF_TIME_T == 4 /* format_iso_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. @@ -1231,6 +1251,7 @@ test_util_time(void *arg) #undef CAPTURE #undef CHECK_TIMEGM_ARG_OUT_OF_RANGE +#undef CHECK_POSSIBLE_EINVAL done: teardown_capture_of_logs();

1 0

[tor/release-0.3.5] Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit f684cd800577144a48e112951eaf4ddc602ad26a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 15:47:33 2019 -0500 Fail any unit test that causes an unhandled LD_BUG or LOG_ERR Closes ticket 28668. --- changes/ticket28668 | 3 +++ src/test/testing_common.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/changes/ticket28668 b/changes/ticket28668 new file mode 100644 index 000000000..6386e0051 --- /dev/null +++ b/changes/ticket28668 @@ -0,0 +1,3 @@ + o Minor features (testing): + - Treat all unexpected ERR and BUG messages as test failures. + Closes ticket 28668. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 60015f3c2..62d40a42f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -239,6 +239,15 @@ tinytest_postfork(void) init_pregenerated_keys(); } +static void +log_callback_failure(int severity, uint32_t domain, const char *msg) +{ + (void)msg; + if (severity == LOG_ERR || (domain & LD_BUG)) { + tinytest_set_test_failed_(); + } +} + /** Main entry point for unit test code: parse the command line, and run * some unit tests. */ int @@ -287,6 +296,7 @@ main(int c, const char **v) c = i_out; { + /* setup logs to stdout */ log_severity_list_t s; memset(&s, 0, sizeof(s)); set_log_severity_config(loglevel, LOG_ERR, &s); @@ -294,6 +304,14 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + { + /* Setup logs that cause failure. */ + log_severity_list_t s; + memset(&s, 0, sizeof(s)); + set_log_severity_config(LOG_ERR, LOG_ERR, &s); + s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; + add_callback_log(&s, log_callback_failure); + } init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS;

1 0

[tor/release-0.3.5] If address/get_if_addrs6 can't findipv6, log WARN, not ERR
by dgoulet＠torproject.org 13 Feb '19

13 Feb '19

commit 54c9c8b04f6055dc4101b6a36cfb587af78dc9b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 23 12:04:57 2019 -0500 If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede. --- changes/ticket29160 | 4 ++++ src/test/test_address.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29160 b/changes/ticket29160 new file mode 100644 index 000000000..8e1118306 --- /dev/null +++ b/changes/ticket29160 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Do not log an error-level message if we fail to find an IPv6 + network interface from the unit tests. Fixes bug 29160; bugfix on + 0.2.7.3-rc. diff --git a/src/test/test_address.c b/src/test/test_address.c index 43467aca1..cfb32b855 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) (void)arg; - rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr); /* Work even on systems without IPv6 interfaces */ if (rv == 0) { @@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES }; -

1 0