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

[tor-messenger-build/master] Update patch to remove links from the updater (closes #20032)
by sukhbir＠torproject.org 31 Aug '16

31 Aug '16

commit 1162c614b7ec0e21a49cc6754a35d0dc1e3dec5a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 31 17:22:30 2016 -0400 Update patch to remove links from the updater (closes #20032) --- projects/instantbird/updater-remove-links.mozpatch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch index 9832a3f..144d144 100644 --- a/projects/instantbird/updater-remove-links.mozpatch +++ b/projects/instantbird/updater-remove-links.mozpatch @@ -23,3 +23,35 @@ diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update </hbox> </vbox> </vbox> +@@ -205,8 +204,7 @@ + <separator/> + <label id="errorManual">&errorManual.label;</label> + <hbox> +- <label class="text-link" id="errorLinkLabel" value="" +- onclick="openUpdateURL(event);"/> ++ <label id="errorLinkLabel" value="" /> + </hbox> + </vbox> + </wizardpage> +@@ -223,8 +221,8 @@ + <label id="genericBackgroundErrorLabel" + hidden="true">&genericBackgroundError.label;</label> + <hbox> +- <label id="errorExtraLinkLabel" class="text-link" hidden="true" +- value="" onclick="openUpdateURL(event);"/> ++ <label id="errorExtraLinkLabel" hidden="true" ++ value="" /> + </hbox> + </vbox> + </wizardpage> +@@ -257,8 +255,8 @@ + <hbox align="center"> + <label>&finishedBackground.name;</label> + <label id="updateFinishedName" flex="1" crop="right" value=""/> +- <label id="finishedBackgroundLink" class="text-link" disabled="true" +- value="&details.link;" onclick="openUpdateURL(event);"/> ++ <label id="finishedBackgroundLink" disabled="true" ++ value="&details.link;" /> + </hbox> + <spacer flex="1"/> + <label id="finishedBackgroundMore">&finishedBackground.more;</label>

1 0

[translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed
by translation＠torproject.org 31 Aug '16

31 Aug '16

commit 837cdd28d6d0f0473e20f3f5e4dfbd157533a916 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 31 18:48:17 2016 +0000 Update translations for tor-messenger-prefsdtd_completed --- fr_CA/prefs.dtd | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd index b6ca6cf..5eccb59 100644 --- a/fr_CA/prefs.dtd +++ b/fr_CA/prefs.dtd @@ -1,4 +1,6 @@ <!ENTITY prefs.otrPreferences "Préférences OTR"> +<!ENTITY prefs.otrLabel "OTR"> +<!ENTITY prefs.coniksLabel "CONIKS"> <!ENTITY prefs.otrSettings "Paramètres OTR"> <!ENTITY prefs.requireEncryption "Exiger le chiffrement"> <!ENTITY prefs.otrKeys "Mes clefs privées"> @@ -10,4 +12,11 @@ <!ENTITY prefs.introSettings "Ces parametres s'appliquent à toutes les conversations un à un."> <!ENTITY prefs.verifyNudge "Toujours donner un coup de coude pour vérifier l'identité de votre contact"> <!ENTITY prefs.emptyAccountList "Aucun compte n'est configuré"> -<!ENTITY prefs.generate "Générer"> \ No newline at end of file +<!ENTITY prefs.generate "Générer"> +<!ENTITY prefs.coniksConnection "Connexion"> +<!ENTITY prefs.coniksServerAddress "Adresse du serveur"> +<!ENTITY prefs.coniksServerPort "Port"> +<!ENTITY prefs.coniksAccountPolicy "Règle de compte"> +<!ENTITY prefs.coniksPoliciesForAccount "Règles du compte :"> +<!ENTITY prefs.coniksPrivateLookups "Recherches privées"> +<!ENTITY prefs.coniksSignedKeyChange "Changement de clef signée"> \ No newline at end of file

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 31 Aug '16

31 Aug '16

commit eecc7454e568febc4e0da4bbc54629eefe48a2cf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 31 18:48:04 2016 +0000 Update translations for tor-messenger-prefsdtd --- fr_CA/prefs.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd index d0e4c28..5eccb59 100644 --- a/fr_CA/prefs.dtd +++ b/fr_CA/prefs.dtd @@ -13,10 +13,10 @@ <!ENTITY prefs.verifyNudge "Toujours donner un coup de coude pour vérifier l'identité de votre contact"> <!ENTITY prefs.emptyAccountList "Aucun compte n'est configuré"> <!ENTITY prefs.generate "Générer"> -<!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> +<!ENTITY prefs.coniksConnection "Connexion"> +<!ENTITY prefs.coniksServerAddress "Adresse du serveur"> <!ENTITY prefs.coniksServerPort "Port"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> -<!ENTITY prefs.coniksPrivateLookups "Private lookups"> -<!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file +<!ENTITY prefs.coniksAccountPolicy "Règle de compte"> +<!ENTITY prefs.coniksPoliciesForAccount "Règles du compte :"> +<!ENTITY prefs.coniksPrivateLookups "Recherches privées"> +<!ENTITY prefs.coniksSignedKeyChange "Changement de clef signée"> \ No newline at end of file

1 0

[tor/master] Actually, always monotime_init() in the unit tests.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 7ef4eef7641750c1e62dec69ef2125ece99a87e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:38:17 2016 -0400 Actually, always monotime_init() in the unit tests. --- 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 e3fe87c..6460713 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -244,6 +244,8 @@ main(int c, const char **v) network_init(); + monotime_init(); + struct tor_libevent_cfg cfg; memset(&cfg, 0, sizeof(cfg)); tor_libevent_initialize(&cfg);

1 0

[tor/master] Detect and suppress bug message from zlib compression bomb test
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit d4f05dcd0e0fe654d64950d70d6d54ff7a6a280e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:30:34 2016 -0400 Detect and suppress bug message from zlib compression bomb test --- src/test/log_test_helpers.h | 7 +++++++ src/test/test_util.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 039c7ae..f33ee67 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -35,6 +35,13 @@ int mock_saved_log_has_entry(void); tt_assert_msg(mock_saved_log_has_message_containing(str), \ "expected log to contain " # str); +#define expect_single_log_msg_containing(str) \ + do { \ + tt_assert_msg(mock_saved_log_has_message_containing(str), \ + "expected log to contain " # str); \ + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); \ + } while (0); + #define expect_no_log_msg(str) \ tt_assert_msg(!mock_saved_log_has_message(str), \ "expected log to not contain " # str); diff --git a/src/test/test_util.c b/src/test/test_util.c index 061398c..2ff9d77 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2216,10 +2216,17 @@ test_util_gzip_compression_bomb(void *arg) size_t result_len = 0; tor_zlib_state_t *state = NULL; + /* Make sure we can't produce a compression bomb */ + const int prev_level = setup_full_capture_of_logs(LOG_WARN); tt_int_op(-1, OP_EQ, tor_gzip_compress(&result, &result_len, one_mb, one_million, ZLIB_METHOD)); + expect_single_log_msg_containing( + "We compressed something and got an insanely high " + "compression factor; other Tors would think this " + "was a zlib bomb."); + teardown_capture_of_logs(prev_level); /* Here's a compression bomb that we made manually. */ const char compression_bomb[1039] = @@ -5464,7 +5471,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip), - UTIL_LEGACY(gzip_compression_bomb), + UTIL_TEST(gzip_compression_bomb, TT_FORK), UTIL_LEGACY(datadir), UTIL_LEGACY(memarea), UTIL_LEGACY(control_formats),

1 0

[tor/master] It is not a bug to attempt to base32_decode a non-base32 string
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 251b348d7b4c4f36bd0a3e14d10ace31c0e9bc25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:31:00 2016 -0400 It is not a bug to attempt to base32_decode a non-base32 string (Rationale: it isn't a bug to try this for a base16 or base64 string. It's just a bad input that we're detecting.) --- src/common/util_format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util_format.c b/src/common/util_format.c index 9009e1a..aef9db8 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -88,7 +88,7 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) else if (src[j] > 0x31 && src[j] < 0x38) tmp[j] = src[j] - 0x18; else if (src[j] > 0x40 && src[j] < 0x5B) tmp[j] = src[j] - 0x41; else { - log_warn(LD_BUG, "illegal character in base32 encoded string"); + log_warn(LD_GENERAL, "illegal character in base32 encoded string"); tor_free(tmp); return -1; }

1 0

[tor/master] Initialize monotonic timer code before using it in the tests
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit cfc62e2374ec34eb2892b032dd33f852daaada6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 14:34:49 2016 -0400 Initialize monotonic timer code before using it in the tests --- src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 2ff9d77..445abb9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5330,6 +5330,8 @@ test_util_monotonic_time(void *arg) uint64_t nsec1, nsec2, usec1, msec1; uint64_t nsecc1, nsecc2, usecc1, msecc1; + monotime_init(); + monotime_get(&mt1); monotime_coarse_get(&mtc1); nsec1 = monotime_absolute_nsec(); @@ -5374,6 +5376,7 @@ static void test_util_monotonic_time_ratchet(void *arg) { (void)arg; + monotime_init(); monotime_reset_ratchets_for_testing(); /* win32, performance counter ratchet. */

1 0

[tor/master] setup_capture_of_logs: no longer suppress log messages
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit f74916a98f97c7e80e46400e921d54466285d1fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 12:51:22 2016 -0400 setup_capture_of_logs: no longer suppress log messages Previously setup_capture_of_logs would prevent log messages from going to the console entirely. That's a problem, since sometimes log messages are bugs! Now setup_capture_of_logs() acts sensibly. If you really do need to keep a message from going to the console entirely, there is setup_full_capture_of_logs(). But only use that if you're prepared to make sure that there are no extraneous messages generated at all. --- src/common/log.c | 5 +++++ src/common/torlog.h | 5 +++++ src/test/log_test_helpers.c | 16 +++++++++++++++- src/test/log_test_helpers.h | 5 +++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index cb62a37..71b6790 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -534,6 +534,11 @@ tor_log(int severity, log_domain_mask_t domain, const char *format, ...) if (severity > log_global_min_severity_) return; va_start(ap,format); +#ifdef TOR_UNIT_TESTS + if (domain & LD_NO_MOCK) + logv__real(severity, domain, NULL, NULL, format, ap); + else +#endif logv(severity, domain, NULL, NULL, format, ap); va_end(ap); } diff --git a/src/common/torlog.h b/src/common/torlog.h index 80f37e0..6732a42 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -109,6 +109,11 @@ * would. Used as a flag, not a log domain. */ #define LD_NOFUNCNAME (1u<<30) +#ifdef TOR_UNIT_TESTS +/** This log message should not be intercepted by mock_saving_logv */ +#define LD_NO_MOCK (1u<<29) +#endif + /** Mask of zero or more log domains, OR'd together. */ typedef uint32_t log_domain_mask_t; diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 1828689..8b67c39 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -6,6 +6,16 @@ static smartlist_t *saved_logs = NULL; +static int echo_to_real_logs = 1; + +int +setup_full_capture_of_logs(int new_level) +{ + int result = setup_capture_of_logs(new_level); + echo_to_real_logs = 0; + return result; +} + int setup_capture_of_logs(int new_level) { @@ -14,6 +24,7 @@ setup_capture_of_logs(int new_level) mock_clean_saved_logs(); saved_logs = smartlist_new(); MOCK(logv, mock_saving_logv); + echo_to_real_logs = 1; return previous_log; } @@ -108,7 +119,6 @@ mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) { - (void)domain; char *buf = tor_malloc_zero(10240); int n; n = tor_vsnprintf(buf,10240,format,ap); @@ -127,5 +137,9 @@ mock_saving_logv(int severity, log_domain_mask_t domain, if (!saved_logs) saved_logs = smartlist_new(); smartlist_add(saved_logs, e); + + if (echo_to_real_logs) { + tor_log(severity, domain|LD_NO_MOCK, "%s", e->generated_msg); + } } diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index d767453..2cb76b2 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -22,6 +22,7 @@ void mock_saving_logv(int severity, log_domain_mask_t domain, void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level); +int setup_full_capture_of_logs(int new_level); void teardown_capture_of_logs(int prev); int mock_saved_log_has_message(const char *msg); @@ -33,6 +34,10 @@ int mock_saved_log_has_entry(void); tt_assert_msg(mock_saved_log_has_message(str), \ "expected log to contain " # str); +#define expect_log_msg_containing(str) \ + tt_assert_msg(mock_saved_log_has_message_containing(str), \ + "expected log to contain " # str); + #define expect_no_log_msg(str) \ tt_assert_msg(!mock_saved_log_has_message(str), \ "expected log to not contain " # str);

1 0

[tor/master] Use setup_full_capture_of_logs() where appropriate.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit d5614b2102d3d9c6deb7190f77106ab7c0ef78ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 12:53:18 2016 -0400 Use setup_full_capture_of_logs() where appropriate. --- src/test/test_address.c | 5 ++++- src/test/test_compat_libevent.c | 12 +++++++++++- src/test/test_util.c | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index b4638f0..e984bea 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -824,9 +824,12 @@ test_address_get_if_addrs6_list_no_internal(void *arg) (void)arg; /* We might drop a log_err */ - int prev_level = setup_capture_of_logs(LOG_ERR); + int prev_level = setup_full_capture_of_logs(LOG_ERR); results = get_interface_address6_list(LOG_ERR, AF_INET6, 0); tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1); + if (smartlist_len(mock_saved_logs()) == 1) { + expect_log_msg_containing("connect() failed"); + } teardown_capture_of_logs(prev_level); tt_assert(results != NULL); diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c index f13eb81..5e14be5 100644 --- a/src/test/test_compat_libevent.c +++ b/src/test/test_compat_libevent.c @@ -20,31 +20,36 @@ static void test_compat_libevent_logging_callback(void *ignored) { (void)ignored; - int previous_log = setup_capture_of_logs(LOG_DEBUG); + int previous_log = setup_full_capture_of_logs(LOG_DEBUG); libevent_logging_callback(_EVENT_LOG_DEBUG, "hello world"); expect_log_msg("Message from libevent: hello world\n"); expect_log_severity(LOG_DEBUG); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_MSG, "hello world another time"); expect_log_msg("Message from libevent: hello world another time\n"); expect_log_severity(LOG_INFO); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_WARN, "hello world a third time"); expect_log_msg("Warning from libevent: hello world a third time\n"); expect_log_severity(LOG_WARN); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_ERR, "hello world a fourth time"); expect_log_msg("Error from libevent: hello world a fourth time\n"); expect_log_severity(LOG_ERR); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(42, "hello world a fifth time"); expect_log_msg("Message [42] from libevent: hello world a fifth time\n"); expect_log_severity(LOG_WARN); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_DEBUG, @@ -75,21 +80,26 @@ test_compat_libevent_logging_callback(void *ignored) "012345678901234567890123456789" "012345678901234567890123456789\n"); expect_log_severity(LOG_DEBUG); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(42, "xxx\n"); expect_log_msg("Message [42] from libevent: xxx\n"); expect_log_severity(LOG_WARN); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); suppress_libevent_log_msg("something"); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_MSG, "hello there"); expect_log_msg("Message from libevent: hello there\n"); expect_log_severity(LOG_INFO); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); mock_clean_saved_logs(); libevent_logging_callback(_EVENT_LOG_MSG, "hello there something else"); expect_no_log_msg("hello there something else"); + if (mock_saved_logs()) + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 0); // No way of verifying the result of this, it seems =/ configure_libevent_logging(); diff --git a/src/test/test_util.c b/src/test/test_util.c index 5432b2c..061398c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5254,9 +5254,11 @@ test_util_pwdb(void *arg) tt_assert(found); tor_free(dir); - prev_level = setup_capture_of_logs(LOG_ERR); /* We should do a LOG_ERR */ + /* We should do a LOG_ERR */ + prev_level = setup_full_capture_of_logs(LOG_ERR); dir = get_user_homedir(badname); tt_assert(dir == NULL); + expect_log_msg_containing("not found"); tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); teardown_capture_of_logs(prev_level); prev_level = -100;

1 0

[tor/master] Work even harder not to suppress logging messages unless we mean to.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 871b711f1016d0394ca1aae84cdfa267d213eb45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 13:12:36 2016 -0400 Work even harder not to suppress logging messages unless we mean to. --- src/test/log_test_helpers.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index d6982ae..2c99da8 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -23,6 +23,9 @@ static smartlist_t *saved_logs = NULL; /** Boolean: should we also send messages to the test-runner? */ static int echo_to_real_logs = 1; +/** Record logs at this level or more severe */ +static int record_logs_at_level = LOG_ERR; + /** * As setup_capture_of_logs, but do not relay log messages into the main * logging system. @@ -50,8 +53,15 @@ 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; + + /* Only change the log_global_min_severity_ if we're making things _more_ + * verbose. Otherwise we could prevent real log messages that the test- + * runner wanted. + */ + if (log_global_min_severity_ < new_level) + log_global_min_severity_ = new_level; + + record_logs_at_level = new_level; mock_clean_saved_logs(); saved_logs = smartlist_new(); MOCK(logv, mock_saving_logv); @@ -178,6 +188,18 @@ mock_saving_logv(int severity, log_domain_mask_t domain, buf[n]='\n'; buf[n+1]='\0'; + if (echo_to_real_logs) { + tor_log(severity, domain|LD_NO_MOCK, "%s", buf); + } + + if (severity > record_logs_at_level) { + tor_free(buf); + return; + } + + if (!saved_logs) + saved_logs = smartlist_new(); + mock_saved_log_entry_t *e = tor_malloc_zero(sizeof(mock_saved_log_entry_t)); e->severity = severity; e->funcname = funcname; @@ -186,12 +208,5 @@ mock_saving_logv(int severity, log_domain_mask_t domain, e->generated_msg = tor_strdup(buf); tor_free(buf); - if (!saved_logs) - saved_logs = smartlist_new(); smartlist_add(saved_logs, e); - - if (echo_to_real_logs) { - tor_log(severity, domain|LD_NO_MOCK, "%s", e->generated_msg); - } } -

1 0