August 2016 - tor-commits - lists.torproject.org

[tor/master] Do not call tor_tls_server_info_callback(NULL) from tests.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 69dce0903187abc0a48606884c88588d276086d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 13:18:13 2016 -0400 Do not call tor_tls_server_info_callback(NULL) from tests. This isn't valid behavior, and it causes a crash when you run the unit tests at --debug. I've added an IF_BUG_ONCE() check for this case. --- src/common/tortls.c | 4 ++++ src/test/test_tortls.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index a62efb5..23889be 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1489,6 +1489,10 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) tor_tls_t *tls; (void) val; + IF_BUG_ONCE(ssl == NULL) { + return; // LCOV_EXCL_LINE + } + tor_tls_debug_state_callback(ssl, type, val); if (type != SSL_CB_ACCEPT_LOOP) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 3a048fb..9115823 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -1831,8 +1831,6 @@ test_tortls_server_info_callback(void *ignored) tls->magic = TOR_TLS_MAGIC; tls->ssl = ssl; - tor_tls_server_info_callback(NULL, 0, 0); - SSL_set_state(ssl, SSL3_ST_SW_SRVR_HELLO_A); mock_clean_saved_logs(); tor_tls_server_info_callback(ssl, SSL_CB_ACCEPT_LOOP, 0);

1 0

[tor/master] Document and clean log_test_helpers.c a bit
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 2df6cdc9f94f59c332bf3a00787320a98678bf4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 13:03:59 2016 -0400 Document and clean log_test_helpers.c a bit In addition to documentation, this commit makes a function static, and removes a weird single-point-of-return-ism, and notes a thing I should fix. --- src/test/log_test_helpers.c | 64 ++++++++++++++++++++++++++++++++++++++++----- src/test/log_test_helpers.h | 7 ++--- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 8b67c39..d6982ae 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -4,10 +4,32 @@ #include "torlog.h" #include "log_test_helpers.h" +/** + * \file log_test_helpers.c + * \brief Code to check for expected log messages during testing. + */ + +static void mock_saving_logv(int severity, log_domain_mask_t domain, + const char *funcname, const char *suffix, + const char *format, va_list ap) + CHECK_PRINTF(5, 0); + +/** + * Smartlist of all the logs we've received since we last set up + * log capture. + */ static smartlist_t *saved_logs = NULL; +/** Boolean: should we also send messages to the test-runner? */ static int echo_to_real_logs = 1; +/** + * As setup_capture_of_logs, but do not relay log messages into the main + * logging system. + * + * Avoid using this function; use setup_capture_of_logs() instead if you + * can. If you must use this function, then make sure you detect any + * unexpected log messages, and treat them as test failures. */ int setup_full_capture_of_logs(int new_level) { @@ -16,10 +38,19 @@ setup_full_capture_of_logs(int new_level) return result; } +/** + * Temporarily capture all the messages logged at severity new_level or + * higher. Return the previous log level; you'll need to pass it into + * teardown_capture_of_logs(). + * + * This function does not prevent messages from being sent to the main + * logging system. + */ int setup_capture_of_logs(int new_level) { int previous_log = log_global_min_severity_; + /* XXXX This can suppress, if logging is turned up high. Will fix. -NM*/ log_global_min_severity_ = new_level; mock_clean_saved_logs(); saved_logs = smartlist_new(); @@ -28,6 +59,9 @@ setup_capture_of_logs(int new_level) return previous_log; } +/** + * Undo setup_capture_of_logs(). + */ void teardown_capture_of_logs(int prev) { @@ -36,6 +70,9 @@ teardown_capture_of_logs(int prev) mock_clean_saved_logs(); } +/** + * Clear all messages in mock_saved_logs() + */ void mock_clean_saved_logs(void) { @@ -47,29 +84,41 @@ mock_clean_saved_logs(void) saved_logs = NULL; } +/** + * Return a list of all the messages captured since the last + * setup_[full_]capture_of_logs() call. Each log call is recorded as a + * mock_saved_log_entry_t. + */ const smartlist_t * mock_saved_logs(void) { return saved_logs; } +/** + * Return true iff there is a message recorded by log capture + * that is exactly equal to msg + */ int mock_saved_log_has_message(const char *msg) { - int has_msg = 0; if (saved_logs) { SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m, { if (msg && m->generated_msg && !strcmp(msg, m->generated_msg)) { - has_msg = 1; + return 1; } }); } - return has_msg; + return 0; } +/** + * Return true iff there is a message recorded by log capture + * that contains msg as a substring. + */ int mock_saved_log_has_message_containing(const char *msg) { @@ -87,7 +136,7 @@ mock_saved_log_has_message_containing(const char *msg) } -/* Do the saved logs have any messages with severity? */ +/** Return true iff the saved logs have any messages with severity */ int mock_saved_log_has_severity(int severity) { @@ -104,7 +153,7 @@ mock_saved_log_has_severity(int severity) return has_sev; } -/* Do the saved logs have any messages? */ +/** Return true iff the the saved logs have at lease one message */ int mock_saved_log_has_entry(void) { @@ -114,7 +163,10 @@ mock_saved_log_has_entry(void) return 0; } -void +/* Replacement for logv: record the log message, and (maybe) send it + * into the logging system again. + */ +static void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 2cb76b2..039c7ae 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -6,19 +6,16 @@ #ifndef TOR_LOG_TEST_HELPERS_H #define TOR_LOG_TEST_HELPERS_H +/** An element of mock_saved_logs(); records the log element that we + * received. */ typedef struct mock_saved_log_entry_t { int severity; const char *funcname; const char *suffix; const char *format; char *generated_msg; - struct mock_saved_log_entry_t *next; } mock_saved_log_entry_t; -void mock_saving_logv(int severity, log_domain_mask_t domain, - const char *funcname, const char *suffix, - const char *format, va_list ap) - CHECK_PRINTF(5, 0); void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level);

1 0

[tor/master] Always log [bug] warnings from the unit tests.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 273290d4fee31857d689ef5286e44dd268a9bd65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 13:22:07 2016 -0400 Always log [bug] warnings from the unit tests. We should consider them bugs. If they are happening intentionally, we should use the log_test_helpers code to capture and suppress them. But having them off-by-default has potential to cause programming errors. --- src/test/testing_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index ea93663..e3fe87c 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -272,6 +272,8 @@ main(int c, const char **v) log_severity_list_t s; memset(&s, 0, sizeof(s)); set_log_severity_config(loglevel, LOG_ERR, &s); + /* ALWAYS log bug warnings. */ + s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); }

1 0

[tor/master] Changes file for log test improvements
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 05c2db3f0bec9fe2e41ea62fbb6e5bd8ac755da4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 13:35:46 2016 -0400 Changes file for log test improvements --- changes/bug19999_prep | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/changes/bug19999_prep b/changes/bug19999_prep new file mode 100644 index 0000000..e8bb4a5 --- /dev/null +++ b/changes/bug19999_prep @@ -0,0 +1,20 @@ + o Minor features (unit tests): + - The unit tests now log all warning messages with the "BUG" flag. + Previously, they only logged errors by default. This change will + help us make our testing code more correct, and make sure that + we only hit this code when we mean to. This is preparatory work + for ticket 19999. + - Our unit testing code that captures log messages no longer prevents + them from being written out if the user asked for them (by passing + --debug or --info or or --notice --warn to the "test" binary). This + change will prevent us from missing unexpected log messages simply + because we were looking for others. Related to ticket 19999. + - Our link-handshake unit tests now check, that when invalid + handshakes fail, they fail with the error messages we + expected. + + o Minor bugfixes (unit tests): + - The tor_tls_server_info_callback unit test no longer crashes when + debug-level logging is turned on. Fixes bug 20041; bugfix on + 0.2.8.1-alpha. +

1 0

[tor/master] Merge branch 'log_test_improvements'
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 240c58017d12799cfaa7b4e326a0c25a2be17c4c Merge: 1f7dc82 05c2db3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:09:21 2016 -0400 Merge branch 'log_test_improvements' changes/bug19999_prep | 20 ++++++++ src/common/log.c | 5 ++ src/common/torlog.h | 5 ++ src/common/tortls.c | 4 ++ src/test/log_test_helpers.c | 103 +++++++++++++++++++++++++++++++++++----- src/test/log_test_helpers.h | 12 +++-- src/test/test_address.c | 5 +- src/test/test_compat_libevent.c | 12 ++++- src/test/test_tortls.c | 2 - src/test/test_util.c | 4 +- src/test/testing_common.c | 2 + 11 files changed, 153 insertions(+), 21 deletions(-)

1 0

[tor/master] Require specific messages for remaining link-handshake failure cases
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit d299c043d405e0ba2f565009270bba012def6191 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:10:15 2016 -0400 Require specific messages for remaining link-handshake failure cases --- src/test/test_link_handshake.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index ce12f2a..e1fd14b 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -630,20 +630,31 @@ test_link_handshake_recv_authchallenge_ok_unrecognized(void *arg) } AUTHCHALLENGE_FAIL(badstate, + require_failure_message = "We're not currently doing a " + "v3 handshake"; d->c->base_.state = OR_CONN_STATE_CONNECTING) AUTHCHALLENGE_FAIL(badproto, + require_failure_message = "not using link protocol >= 3"; d->c->link_proto = 2) AUTHCHALLENGE_FAIL(as_server, + require_failure_message = "We didn't originate this " + "connection"; d->c->handshake_state->started_here = 0;) AUTHCHALLENGE_FAIL(duplicate, + require_failure_message = "We already received one"; d->c->handshake_state->received_auth_challenge = 1) AUTHCHALLENGE_FAIL(nocerts, + require_failure_message = "We haven't gotten a CERTS " + "cell yet"; d->c->handshake_state->received_certs_cell = 0) AUTHCHALLENGE_FAIL(tooshort, + require_failure_message = "It was not well-formed"; d->cell->payload_len = 33) AUTHCHALLENGE_FAIL(truncated, + require_failure_message = "It was not well-formed"; d->cell->payload_len = 34) AUTHCHALLENGE_FAIL(nonzero_circid, + require_failure_message = "It had a nonzero circuit ID"; d->cell->circ_id = 1337) static tor_x509_cert_t *mock_peer_cert = NULL; @@ -859,47 +870,68 @@ test_link_handshake_auth_cell(void *arg) } AUTHENTICATE_FAIL(badstate, + require_failure_message = "We're not doing a v3 handshake"; d->c2->base_.state = OR_CONN_STATE_CONNECTING) AUTHENTICATE_FAIL(badproto, + require_failure_message = "not using link protocol >= 3"; d->c2->link_proto = 2) AUTHENTICATE_FAIL(atclient, + require_failure_message = "We originated this connection"; d->c2->handshake_state->started_here = 1) AUTHENTICATE_FAIL(duplicate, + require_failure_message = "We already got one"; d->c2->handshake_state->received_authenticate = 1) static void test_link_handshake_auth_already_authenticated(void *arg) { authenticate_data_t *d = arg; + const int prev_level = setup_capture_of_logs(LOG_INFO); d->c2->handshake_state->authenticated = 1; channel_tls_process_authenticate_cell(d->cell, d->chan2); tt_int_op(mock_close_called, ==, 1); tt_int_op(d->c2->handshake_state->authenticated, ==, 1); + expect_log_msg_containing("The peer is already authenticated"); done: - ; + teardown_capture_of_logs(prev_level); } + AUTHENTICATE_FAIL(nocerts, + require_failure_message = "We never got a certs cell"; d->c2->handshake_state->received_certs_cell = 0) AUTHENTICATE_FAIL(noidcert, + require_failure_message = "We never got an identity " + "certificate"; tor_x509_cert_free(d->c2->handshake_state->id_cert); d->c2->handshake_state->id_cert = NULL) AUTHENTICATE_FAIL(noauthcert, + require_failure_message = "We never got an authentication " + "certificate"; tor_x509_cert_free(d->c2->handshake_state->auth_cert); d->c2->handshake_state->auth_cert = NULL) AUTHENTICATE_FAIL(tooshort, + require_failure_message = "Cell was way too short"; d->cell->payload_len = 3) AUTHENTICATE_FAIL(badtype, + require_failure_message = "Authenticator type was not " + "recognized"; d->cell->payload[0] = 0xff) AUTHENTICATE_FAIL(truncated_1, + require_failure_message = "Authenticator was truncated"; d->cell->payload[2]++) AUTHENTICATE_FAIL(truncated_2, + require_failure_message = "Authenticator was truncated"; d->cell->payload[3]++) AUTHENTICATE_FAIL(tooshort_1, + require_failure_message = "Authenticator was too short"; tt_int_op(d->cell->payload_len, >=, 260); d->cell->payload[2] -= 1; d->cell->payload_len -= 256;) AUTHENTICATE_FAIL(badcontent, + require_failure_message = "Some field in the AUTHENTICATE " + "cell body was not as expected"; d->cell->payload[10] ^= 0xff) AUTHENTICATE_FAIL(badsig_1, + require_failure_message = "Signature wasn't valid"; d->cell->payload[d->cell->payload_len - 5] ^= 0xff) #define TEST(name, flags) \

1 0

[tor-messenger-build/updater] Bump ctypes-otr to 0.0.2
by sukhbir＠torproject.org 31 Aug '16

31 Aug '16

commit d7fc5e4b8e975bcbf0d7283bdf206acb8ed44bb9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Aug 31 10:20:22 2016 -0700 Bump ctypes-otr to 0.0.2 --- ChangeLog | 4 +--- projects/ctypes-otr/config | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ded8549..ace3cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,9 +7,7 @@ Tor Messenger 0.2.0b1 -- * Bug 14388: Secure automatic updates for Tor Messenger * Bug 13861: Preserve user profiles after updates * Update libgcrypt to 1.6.6 for CVE-2016-6316 - * ctypes-otr - * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) - * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) + * Update ctypes-otr to 0.0.2 * Linux * Bug 18634: Switch to building Tor Messenger on Debian Wheezy * Mac diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 0a61b42..de47d55 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.1 +version: 0.0.2 git_url: https://github.com/arlolra/ctypes-otr git_hash: '[% c("version") %]' gpg_keyring: arlolra.gpg

1 0

[tor-messenger-build/updater] Set safe updateURL for default theme
by sukhbir＠torproject.org 31 Aug '16

31 Aug '16

commit 94d53d4f7623809e93404d4d0bec87d1f80ed6e7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 31 13:26:38 2016 -0400 Set safe updateURL for default theme --- projects/instantbird/config | 1 + projects/instantbird/theme-extension-update.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 7d5f790..b421403 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -83,6 +83,7 @@ input_files: - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch - filename: themes-remove-links.patch + - filename: theme-extension-update.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png diff --git a/projects/instantbird/theme-extension-update.patch b/projects/instantbird/theme-extension-update.patch new file mode 100644 index 0000000..a1585a8 --- /dev/null +++ b/projects/instantbird/theme-extension-update.patch @@ -0,0 +1,12 @@ +diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +--- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf ++++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@@ -26,6 +26,8 @@ +  + <em:name>Instantbird (default)</em:name> + <em:description>The default theme.</em:description> ++ <em:updateURL>data:text/plain,</em:updateURL> ++ <em:updateKey>-</em:updateKey> + + <!-- EXTENSION AUTHORS! + DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES

1 0

[tor-messenger-build/master] Set safe updateURL for default theme
by sukhbir＠torproject.org 31 Aug '16

31 Aug '16

commit 94d53d4f7623809e93404d4d0bec87d1f80ed6e7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 31 13:26:38 2016 -0400 Set safe updateURL for default theme --- projects/instantbird/config | 1 + projects/instantbird/theme-extension-update.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 7d5f790..b421403 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -83,6 +83,7 @@ input_files: - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch - filename: themes-remove-links.patch + - filename: theme-extension-update.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png diff --git a/projects/instantbird/theme-extension-update.patch b/projects/instantbird/theme-extension-update.patch new file mode 100644 index 0000000..a1585a8 --- /dev/null +++ b/projects/instantbird/theme-extension-update.patch @@ -0,0 +1,12 @@ +diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +--- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf ++++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@@ -26,6 +26,8 @@ +  + <em:name>Instantbird (default)</em:name> + <em:description>The default theme.</em:description> ++ <em:updateURL>data:text/plain,</em:updateURL> ++ <em:updateKey>-</em:updateKey> + + <!-- EXTENSION AUTHORS! + DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES

1 0

[tor-messenger-build/master] Bump ctypes-otr to 0.0.2
by arlo＠torproject.org 31 Aug '16

31 Aug '16

commit d7fc5e4b8e975bcbf0d7283bdf206acb8ed44bb9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Aug 31 10:20:22 2016 -0700 Bump ctypes-otr to 0.0.2 --- ChangeLog | 4 +--- projects/ctypes-otr/config | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ded8549..ace3cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,9 +7,7 @@ Tor Messenger 0.2.0b1 -- * Bug 14388: Secure automatic updates for Tor Messenger * Bug 13861: Preserve user profiles after updates * Update libgcrypt to 1.6.6 for CVE-2016-6316 - * ctypes-otr - * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) - * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) + * Update ctypes-otr to 0.0.2 * Linux * Bug 18634: Switch to building Tor Messenger on Debian Wheezy * Mac diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 0a61b42..de47d55 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.1 +version: 0.0.2 git_url: https://github.com/arlolra/ctypes-otr git_hash: '[% c("version") %]' gpg_keyring: arlolra.gpg

1 0