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

[tor/master] Improve unit test coverage for compression code.
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit 3a073c463dbade2171a1a6ec1558bd81c0ff27f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 12:20:02 2017 -0400 Improve unit test coverage for compression code. These tests try uncompressing garbage, verify that we won't make compression bombs, and verify that we won't uncompress compression bombs. --- src/common/compress.c | 4 +- src/common/compress.h | 3 +- src/test/test_util.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 3 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index 520148f83..c13a3b0ae 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -51,8 +51,8 @@ static atomic_counter_t total_compress_allocation; /** Return true if uncompressing an input of size <b>in_size</b> to an input of * size at least <b>size_out</b> looks like a compression bomb. */ -int -tor_compress_is_compression_bomb(size_t size_in, size_t size_out) +MOCK_IMPL(int, +tor_compress_is_compression_bomb,(size_t size_in, size_t size_out)) { if (size_in == 0 || size_out < CHECK_FOR_COMPRESSION_BOMB_AFTER) return 0; diff --git a/src/common/compress.h b/src/common/compress.h index ecb20668e..23a981747 100644 --- a/src/common/compress.h +++ b/src/common/compress.h @@ -45,7 +45,8 @@ int tor_uncompress(char **out, size_t *out_len, compress_method_t detect_compression_method(const char *in, size_t in_len); -int tor_compress_is_compression_bomb(size_t size_in, size_t size_out); +MOCK_DECL(int,tor_compress_is_compression_bomb,(size_t size_in, + size_t size_out)); int tor_compress_supports_method(compress_method_t method); unsigned tor_compress_get_supported_method_bitmask(void); diff --git a/src/test/test_util.c b/src/test/test_util.c index 49ebdf211..162f6fbc0 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2481,6 +2481,125 @@ test_util_decompress_concatenated(void *arg) } static void +test_util_decompress_junk_impl(compress_method_t method) +{ + char input[4096]; + char *result = NULL, *result2 = NULL; + size_t szr, szr2, sz; + int r; + + /* This shouldn't be a compressed string according to any method. */ + strlcpy(input, "This shouldn't be a compressed string by any means.", + sizeof(input)); + sz = strlen(input); + setup_capture_of_logs(LOG_WARN); + r = tor_uncompress(&result, &szr, input, sz, method, 0, LOG_WARN); + tt_int_op(r, OP_EQ, -1); + tt_ptr_op(result, OP_EQ, NULL); + expect_log_msg_containing("Error while uncompressing data: bad input?"); + mock_clean_saved_logs(); + + /* Now try again, with a compressed object that starts out good and turns to + junk. */ + crypto_rand(input, sizeof(input)); + r = tor_compress(&result, &szr, input, sizeof(input), method); + tt_int_op(r, OP_EQ, 0); + crypto_rand(result+szr/2, szr-(szr/2)); // trash the 2nd half of the result + r = tor_uncompress(&result2, &szr2, result, szr, method, 0, LOG_WARN); + tt_int_op(r, OP_EQ, -1); + expect_log_msg_containing("Error while uncompressing data: bad input?"); + + done: + teardown_capture_of_logs(); + tor_free(result); + tor_free(result2); +} + +static void +test_util_decompress_junk(void *arg) +{ + const char *methodname = arg; + tt_assert(methodname); + + compress_method_t method = compression_method_get_by_name(methodname); + tt_int_op(method, OP_NE, UNKNOWN_METHOD); + if (! tor_compress_supports_method(method)) { + tt_skip(); + } + + test_util_decompress_junk_impl(method); + done: + ; +} + +/* mock replacement for tor_compress_is_compression_bomb that doesn't + * believe in compression bombs. */ +static int +mock_is_never_compression_bomb(size_t in, size_t out) +{ + (void)in; + (void) out; + return 0; +} + +static void +test_util_decompress_dos_impl(compress_method_t method) +{ + char *input; + char *result = NULL, *result2 = NULL; + size_t szr, szr2; + int r; + + const size_t big = 1024*1024; + /* one megabyte of 0s. */ + input = tor_malloc_zero(big); + + /* Compress it into "result": it should fail. */ + setup_full_capture_of_logs(LOG_WARN); + r = tor_compress(&result, &szr, input, big, method); + tt_int_op(r, OP_EQ, -1); + expect_log_msg_containing( + "other Tors would think this was a compression bomb"); + teardown_capture_of_logs(); + + /* Try again, but this time suppress compression-bomb detection */ + MOCK(tor_compress_is_compression_bomb, mock_is_never_compression_bomb); + r = tor_compress(&result, &szr, input, big, method); + UNMOCK(tor_compress_is_compression_bomb); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(result, OP_NE, NULL); + + /* We should refuse to uncomrpess it again, since it looks like a + * compression bomb. */ + setup_capture_of_logs(LOG_WARN); + r = tor_uncompress(&result2, &szr2, result, szr, method, 0, LOG_WARN); + tt_int_op(r, OP_EQ, -1); + expect_log_msg_containing("bomb; abandoning stream"); + + done: + teardown_capture_of_logs(); + tor_free(result); + tor_free(result2); +} + +static void +test_util_decompress_dos(void *arg) +{ + const char *methodname = arg; + tt_assert(methodname); + + compress_method_t method = compression_method_get_by_name(methodname); + tt_int_op(method, OP_NE, UNKNOWN_METHOD); + if (! tor_compress_supports_method(method)) { + tt_skip(); + } + + test_util_decompress_dos_impl(method); + done: + ; +} + +static void test_util_gzip_compression_bomb(void *arg) { /* A 'compression bomb' is a very small object that uncompresses to a huge @@ -5917,6 +6036,16 @@ test_util_get_unquoted_path(void *arg) &passthrough_setup, \ (char*)(identifier) } +#define COMPRESS_JUNK(name, identifier) \ + { "compress_junk/" #name, test_util_decompress_junk, 0, \ + &passthrough_setup, \ + (char*)(identifier) } + +#define COMPRESS_DOS(name, identifier) \ + { "compress_dos/" #name, test_util_decompress_dos, 0, \ + &passthrough_setup, \ + (char*)(identifier) } + #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) @@ -5951,6 +6080,14 @@ struct testcase_t util_tests[] = { COMPRESS_CONCAT(lzma, "x-tor-lzma"), COMPRESS_CONCAT(zstd, "x-zstd"), COMPRESS_CONCAT(none, "identity"), + COMPRESS_JUNK(zlib, "deflate"), + COMPRESS_JUNK(gzip, "gzip"), + COMPRESS_JUNK(lzma, "x-tor-lzma"), + COMPRESS_DOS(zlib, "deflate"), + COMPRESS_DOS(gzip, "gzip"), + COMPRESS_DOS(lzma, "x-tor-lzma"), + // Disabled for now, since it triggers #23551 + // COMPRESS_DOS(zstd, "x-zstd"), UTIL_TEST(gzip_compression_bomb, TT_FORK), UTIL_LEGACY(datadir), UTIL_LEGACY(memarea),

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit b3e5192d283666fce8b4643ed2b8b10de441e894 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:19:29 2017 +0000 Update translations for tor-messenger-authdtd --- ga/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/auth.dtd b/ga/auth.dtd index 75c24e244..83280cc92 100644 --- a/ga/auth.dtd +++ b/ga/auth.dtd @@ -4,7 +4,7 @@ <!ENTITY authDialog.help "Cabhair"> <!ENTITY authDialog.yes "Tá"> <!ENTITY authDialog.no "Níl"> -<!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> +<!ENTITY authDialog.verified "Dheimhnigh mé gurb é seo an méarlorg ceart."> <!ENTITY authDialog.yourFingerprint "Do mhéarlorg"> <!ENTITY authDialog.theirFingerprint "A méarlorg, mar dhea"> <!ENTITY authDialog.manualVerification "Manual fingerprint verification">

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit fa213e20f2e10123ea8ed7be2f5b47118e8e654a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:19:19 2017 +0000 Update translations for tails-onioncircuits --- ga/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/onioncircuits.pot b/ga/onioncircuits.pot index 81fb4f22a..ea753bc41 100644 --- a/ga/onioncircuits.pot +++ b/ga/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2017-09-26 00:32+0000\n" +"PO-Revision-Date: 2017-09-28 16:07+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "Stádas" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "Cliceáil ciorcad chun tuilleadh sonraí a fháil faoina athsheachadáin Tor." #: ../onioncircuits:221 msgid "The connection to Tor was lost..."

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit e5914d409c61740f12c20262cab4505d50dbeaa6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:19:00 2017 +0000 Update translations for tails-openpgp-applet --- ga/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/openpgp-applet.pot b/ga/openpgp-applet.pot index 1fc1c6ad6..723eb4828 100644 --- a/ga/openpgp-applet.pot +++ b/ga/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-26 00:53+0000\n" +"PO-Revision-Date: 2017-09-28 16:06+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #: bin/openpgp-applet:232 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "Criptigh an Ghearrthaisce le _Frása Faire" #: bin/openpgp-applet:235 msgid "Sign/Encrypt Clipboard with Public _Keys"

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit c87ac5cd8561102e68d13f03e308d35e22089537 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:18:41 2017 +0000 Update translations for torbutton-aboutdialogdtd --- ga/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/aboutdialog.dtd b/ga/aboutdialog.dtd index 861c3a2b9..66f55430e 100644 --- a/ga/aboutdialog.dtd +++ b/ga/aboutdialog.dtd @@ -1,11 +1,11 @@ <!ENTITY project.start "Tá &brandShortName; forbartha ag">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.end ", eagraíocht neamhbhrabhúis a chosnaíonn do phríobháideachas agus do shaoirse ar líne."> <!ENTITY help.start "Want to help? ">  -<!ENTITY help.donateLink "Donate"> +<!ENTITY help.donateLink "Síntiúis"> <!ENTITY help.or "nó">  <!ENTITY help.getInvolvedLink "glac páirt">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit e59a2ed40b5843b22dbe29967b23bee7e25f14c0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:17:59 2017 +0000 Update translations for torbutton-torbuttondtd --- ga/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd index 830dfa1cb..835deca5e 100644 --- a/ga/torbutton.dtd +++ b/ga/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ciorcad Nua Tor don Suíomh seo"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Socruithe Slándála..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Socruithe Líonra Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 61acccb595c70c2fccfaeb545d631db3811a3f23 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:17:43 2017 +0000 Update translations for torbutton-branddtd --- ga/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/brand.dtd b/ga/brand.dtd index f5dcddde4..635ca438d 100644 --- a/ga/brand.dtd +++ b/ga/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Brabhsálaí Tor"> <!ENTITY brandFullName "Brabhsálaí Tor"> <!ENTITY vendorShortName "Tionscadal Tor"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Is trádmharcanna de chuid Fondúireacht Mozilla 'Firefox' agus lógónna Firefox.">  <!ENTITY plugins.installed.find "Click to load installed system plugins">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 7341f05fb700f63497debfcb13352ec23ccf2111 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:17:24 2017 +0000 Update translations for abouttor-homepage --- ga/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/aboutTor.dtd b/ga/aboutTor.dtd index a0fedffe0..68a92eb9e 100644 --- a/ga/aboutTor.dtd +++ b/ga/aboutTor.dtd @@ -10,7 +10,7 @@ <!ENTITY aboutTor.outOfDateTorOff.label "AGUS, tá an brabhsálaí seo as dáta."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Tástáil Socruithe Líonra Tor"> <!ENTITY aboutTor.success.label "Fáilte go dtí Brabhsálaí Tor"> <!ENTITY aboutTor.success2.label "Ceangailte le líonra Tor.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 20149191d2bd68544bd7cfa006b3aaf0dc705c30 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:17:04 2017 +0000 Update translations for tor-launcher-network-settings --- ga/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/network-settings.dtd b/ga/network-settings.dtd index 648182700..1876541d9 100644 --- a/ga/network-settings.dtd +++ b/ga/network-settings.dtd @@ -11,7 +11,7 @@ <!ENTITY torSettings.yes "Tá"> <!ENTITY torSettings.no "Níl"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Cé acu díobh seo a leanas a dhéanann an cur síos is fearr ar an bhfadhb atá agat?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Cumraigh">

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit d50a409f6f03f948d76497f5aeb20a22105924fa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 16:16:11 2017 +0000 Update translations for tails-persistence-setup --- ga/ga.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index c65f9ce73..d1050867b 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-26 02:45+0000\n" +"PO-Revision-Date: 2017-09-28 16:04+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "Fáinní eochracha GnuPG agus cumraíocht" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "Cliant SSH" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts"

1 0