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

[gettor/master] Update stats update to add locale
by hiro＠torproject.org 23 May '19

23 May '19

commit 1f016f1f72d18e049722df70564bfd6d92e4c340 Author: hiro <hiro(a)torproject.org> Date: Thu May 23 17:14:08 2019 +0200 Update stats update to add locale --- gettor/services/email/sendmail.py | 3 ++- gettor/utils/db.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 0af0af8..82c3288 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -208,7 +208,8 @@ class Sendmail(object): ) yield self.conn.update_stats( - command="links", platform=platform, service="email" + command="links", platform=platform, language=locale, + service="email" ) yield self.conn.update_request( diff --git a/gettor/utils/db.py b/gettor/utils/db.py index 73610ed..083020d 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -83,17 +83,17 @@ class SQLite3(object): query, (hid, status, id, service, date) ).addCallback(self.query_callback).addErrback(self.query_errback) - def update_stats(self, command, service, platform=None): + def update_stats(self, command, service, platform=None, language='en'): """ Update statistics to the database """ now_str = datetime.now().strftime("%Y%m%d") - query = "REPLACE INTO stats(num_requests, platform, "\ + query = "REPLACE INTO stats(num_requests, platform, language, "\ "command, service, date) VALUES(COALESCE((SELECT num_requests FROM stats "\ - "WHERE date=?)+1, 0), ?, ?, ?, ?) "\ + "WHERE date=?)+1, 0), ?, ?, ?, ?, ?) "\ return self.dbpool.runQuery( - query, (now_str,platform, command, service, now_str) + query, (now_str, platform, language, command, service, now_str) ).addCallback(self.query_callback).addErrback(self.query_errback) def get_links(self, platform, language, status):

1 0

[tor-browser-build/master] Compile go-webrtc with a non executable stack
by gk＠torproject.org 23 May '19

23 May '19

commit 24f585bf1851bfa022128a5b587b7c0940ec775c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon May 13 22:44:22 2019 +0000 Compile go-webrtc with a non executable stack Ensure that cgo programs can be built with the nonexecstack ld flag Fix for bug #30451 --- projects/go-webrtc/config | 2 +- projects/go/config | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 5dbee5f..ba1e801 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: dcbfc825aa33471253a5da1834d499257e05d557 +git_hash: ed20e74ef428d6149a95bab8e63afb47af55c204 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/go/config b/projects/go/config index c039b04..792da10 100644 --- a/projects/go/config +++ b/projects/go/config @@ -15,6 +15,10 @@ var: export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" + [% IF c("var/linux") -%] + export CGO_LDFLAGS_ALLOW="-z|noexecstack" + export CGO_LDFLAGS="-z noexecstack" + [% END -%] [% IF c("var/linux-i686") -%] export CGO_ENABLED=1 [% END -%]

1 0

[gettor/master] Refactor email and add tests for email and locales support
by hiro＠torproject.org 23 May '19

23 May '19

commit 58c45eabc58377595ad217522ab22c54c8a776e5 Author: hiro <hiro(a)torproject.org> Date: Thu May 23 16:39:32 2019 +0200 Refactor email and add tests for email and locales support --- gettor.conf.json | 1 - gettor/parse/email.py | 93 ++++++++++++++++++++++++------------- gettor/services/email/sendmail.py | 9 ++-- gettor/utils/settings.py | 1 - share/locale/available_locales.json | 15 ++++-- tests/conftests.py | 3 ++ tests/test_email_service.py | 33 +++++++++++++ tests/test_locales.py | 7 +-- 8 files changed, 118 insertions(+), 44 deletions(-) diff --git a/gettor.conf.json b/gettor.conf.json index 6a9b420..b3f331d 100644 --- a/gettor.conf.json +++ b/gettor.conf.json @@ -1,6 +1,5 @@ { "platforms": ["linux", "osx", "windows"], - "languages": ["en", "es", "pt"], "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db", "email_parser_logfile": "/srv/gettor.torproject.org/home/gettor/log/email_parser.log", "email_requests_limit": 5, diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 7a88f70..99d90c6 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -28,7 +28,7 @@ from twisted.internet import defer from twisted.enterprise import adbapi from ..utils.db import SQLite3 - +from ..utils import strings class AddressError(Exception): """ @@ -57,26 +57,7 @@ class EmailParser(object): self.dkim = dkim self.to_addr = to_addr - - def parse(self, msg_str): - """ - Parse message content. Check if email address is well formed, if DKIM - signature is valid, and prevent service flooding. Finally, look for - commands to process the request. Current commands are: - - - links: request links for download. - - help: help request. - - :param msg_str (str): incomming message as string. - - :return dict with email address and command (`links` or `help`). - """ - - platforms = self.settings.get("platforms") - languages = self.settings.get("languages") - log.msg("Building email message from string.", system="email parser") - msg = message_from_string(msg_str) - + def normalize(self, msg): # Normalization will convert <Alice Wonderland> alice(a)wonderland.net # into alice(a)wonderland.net name, norm_addr = parseaddr(msg['From']) @@ -85,7 +66,10 @@ class EmailParser(object): "Normalizing and validating FROM email address.", system="email parser" ) + return name, norm_addr, to_name, norm_to_addr + + def validate(self, norm_addr, msg): # Validate_email will do a bunch of regexp to see if the email address # is well address. Additional options for validate_email are check_mx # and verify, which check if the SMTP host and email address exist. @@ -95,6 +79,8 @@ class EmailParser(object): "Email address normalized and validated.", system="email parser" ) + return True + else: log.err( "Error normalizing/validating email address.", @@ -102,17 +88,8 @@ class EmailParser(object): ) raise AddressError("Invalid email address {}".format(msg['From'])) - hid = hashlib.sha256(norm_addr.encode('utf-8')) - log.msg( - "Request from {}".format(hid.hexdigest()), system="email parser" - ) - - if self.to_addr: - if self.to_addr != norm_to_addr: - log.msg("Got request for a different instance of gettor") - log.msg("Intended recipient: {}".format(norm_to_addr)) - return {} + def dkim_verify(self, msg_str, norm_addr): # DKIM verification. Simply check that the server has verified the # message's signature if self.dkim: @@ -121,6 +98,7 @@ class EmailParser(object): # string, so DKIM will fail. Use the original string instead if dkim.verify(msg_str): log.msg("Valid DKIM signature.", system="email parser") + return True else: log.msg("Invalid DKIM signature.", system="email parser") username, domain = norm_addr.split("@") @@ -129,7 +107,12 @@ class EmailParser(object): hid.hexdigest(), domain ) ) + # Is this even useful like this? + else: + return True + + def build_request(self, msg_str, norm_addr, languages, platforms): # Search for commands keywords subject_re = re.compile(r"Subject: (.*)\r\n") subject = subject_re.search(msg_str) @@ -167,6 +150,54 @@ class EmailParser(object): return request + def parse(self, msg_str): + """ + Parse message content. Check if email address is well formed, if DKIM + signature is valid, and prevent service flooding. Finally, look for + commands to process the request. Current commands are: + + - links: request links for download. + - help: help request. + + :param msg_str (str): incomming message as string. + + :return dict with email address and command (`links` or `help`). + """ + + log.msg("Building email message from string.", system="email parser") + + platforms = self.settings.get("platforms") + languages = [*strings.get_locales().keys()] + msg = message_from_string(msg_str) + + name, norm_addr, to_name, norm_to_addr = self.normalize(msg) + + try: + self.validate(norm_addr, msg) + except AddressError as e: + log.message("Address error: {}".format(e.args)) + + hid = hashlib.sha256(norm_addr.encode('utf-8')) + log.msg( + "Request from {}".format(hid.hexdigest()), system="email parser" + ) + + if self.to_addr: + if self.to_addr != norm_to_addr: + log.msg("Got request for a different instance of gettor") + log.msg("Intended recipient: {}".format(norm_to_addr)) + return {} + + try: + self.dkim_verify(msg_str, norm_addr) + except ValueError as e: + log.msg("DKIM error: {}".format(e.args)) + + request = self.build_request(msg_str, norm_addr, languages, platforms) + + return request + + @defer.inlineCallbacks def parse_callback(self, request): """ diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 52b50f5..0af0af8 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -124,7 +124,7 @@ class Sendmail(object): for request in help_requests: id = request[0] - date = request[4] + date = request[5] hid = hashlib.sha256(id.encode('utf-8')) log.info( @@ -164,11 +164,10 @@ class Sendmail(object): if not language: language = 'en' - locales = { 'en': 'en-US', - 'es': 'es-ES', - 'pt': 'pt-BR'} + locales = strings.get_locales() + strings.load_strings(language) - locale = locales[language] + locale = locales[language]['locale'] log.info("Getting links for {}.".format(platform)) links = yield self.conn.get_links( diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 922cfe9..b301117 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -59,7 +59,6 @@ class Settings(object): else: self._settings = { "platforms": ["linux", "osx", "windows"], - "languages": ["en", "es", "pt"], "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db", "email_parser_logfile": "/srv/gettor.torproject.org/home/gettor/log/email_parser.log", "email_requests_limit": 5, diff --git a/share/locale/available_locales.json b/share/locale/available_locales.json index d91a253..8c3c037 100644 --- a/share/locale/available_locales.json +++ b/share/locale/available_locales.json @@ -1,5 +1,14 @@ { - "en": "English", - "es": "Español", - "pt": "Português Brasil" + "en": { + "language": "English", + "locale": "en-US" + }, + "es": { + "language": "Español", + "locale": "es-ES" + }, + "pt": { + "language": "Português Brasil", + "locale": "pt-BR" + } } diff --git a/tests/conftests.py b/tests/conftests.py index eaf1098..1f73f21 100644 --- a/tests/conftests.py +++ b/tests/conftests.py @@ -6,3 +6,6 @@ from gettor.utils import options from gettor.utils import strings from gettor.services.email import sendmail from gettor.parse.email import EmailParser, AddressError, DKIMError + +from email import message_from_string +from email.utils import parseaddr diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 9abef57..9d50f5f 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -13,6 +13,7 @@ class EmailServiceTests(unittest.TestCase): def setUp(self): self.settings = conftests.options.parse_settings() self.sm_client = conftests.sendmail.Sendmail(self.settings) + self.locales = conftests.strings.get_locales() def tearDown(self): print("tearDown()") @@ -25,6 +26,38 @@ class EmailServiceTests(unittest.TestCase): request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: help\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org") self.assertEqual(request["command"], "help") + def test_normalize_msg(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: help\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org" + msg = conftests.message_from_string(msg_str) + request = ep.normalize(msg) + self.assertEqual(request, ('silvia [hiro]', 'hiro(a)torproject.org', '', 'gettor(a)torproject.org')) + + def test_validate_msg(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: help\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org" + msg = conftests.message_from_string(msg_str) + request = ep.validate("hiro(a)torproject.org", msg) + assert request + + def test_dkim_verify(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: help\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org" + msg = conftests.message_from_string(msg_str) + request = ep.dkim_verify(msg, "hiro(a)torproject.org") + assert request + + def test_build_request(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\r\n osx es" + msg = conftests.message_from_string(msg_str) + languages = [*self.locales.keys()] + platforms = self.settings.get('platforms') + request = ep.build_request(msg_str, "hiro(a)torproject.org", languages, platforms) + self.assertEqual(request["command"], "links") + self.assertEqual(request["platform"], "osx") + self.assertEqual(request["language"], "es") + def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en") diff --git a/tests/test_locales.py b/tests/test_locales.py index 39cdac5..b6eb777 100644 --- a/tests/test_locales.py +++ b/tests/test_locales.py @@ -18,9 +18,6 @@ class EmailServiceTests(unittest.TestCase): def tearDown(self): print("tearDown()") - def test_get_available_locales(self): - self.assertEqual({"en": "English", "es": "Español", "pt": "Português Brasil"}, self.locales) - def test_load_en_strings(self): conftests.strings.load_strings("en") self.assertEqual(conftests.strings._("smtp_mirrors_subject"), "[GetTor] Mirrors") @@ -33,5 +30,9 @@ class EmailServiceTests(unittest.TestCase): conftests.strings.load_strings("es") self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] Ayuda") + def test_locale_supported(self): + self.assertEqual(self.locales['en']['language'], "English") + self.assertEqual(self.locales['es']['locale'], "es-ES") + if __name__ == "__main__": unittest.main()

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 May '19

23 May '19

commit 40c8d1d21390c9eee0b0ba07c93645a9f1768308 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 14:17:08 2019 +0000 Update translations for tails-misc --- ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja.po b/ja.po index 2ef6ce41a..ce0c5fae2 100644 --- a/ja.po +++ b/ja.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 323484, 2018 +# 323484, 2018-2019 # 987 pluto <pluto987(a)protonmail.com>, 2019 # ABE Tsunehiko, 2015 # Arbert Sporocyst <EncryptedBrother(a)protonmail.com>, 2018 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-18 19:31+0200\n" -"PO-Revision-Date: 2019-05-19 13:21+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-05-23 13:56+0000\n" +"Last-Translator: 323484\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -801,7 +801,7 @@ msgstr "このアップリケーションはVeraCryptプロジェクトやIDRIX #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 msgid "_Open" -msgstr "" +msgstr "開く (_O)" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38 msgid "Lock this volume" @@ -809,7 +809,7 @@ msgstr "ボリュームをロックする" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52 msgid "_Unlock" -msgstr "" +msgstr "ロック解除 (_U)" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 msgid "Detach this volume"

1 0

[tor/master] Give tinytest a function to say whether the current test has failed
by dgoulet＠torproject.org 23 May '19

23 May '19

commit e4feb4ad01e7f3de592adbecd7f1ffae040f51ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:47:43 2019 -0400 Give tinytest a function to say whether the current test has failed --- src/ext/tinytest.c | 6 ++++++ src/ext/tinytest.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c index 16f11e463..239fdd0a3 100644 --- a/src/ext/tinytest.c +++ b/src/ext/tinytest.c @@ -492,6 +492,12 @@ tinytest_set_test_skipped_(void) cur_test_outcome = SKIP; } +int +tinytest_cur_test_has_failed(void) +{ + return (cur_test_outcome == FAIL); +} + char * tinytest_format_hex_(const void *val_, unsigned long len) { diff --git a/src/ext/tinytest.h b/src/ext/tinytest.h index ed07b26bc..05c2fda05 100644 --- a/src/ext/tinytest.h +++ b/src/ext/tinytest.h @@ -72,6 +72,9 @@ struct testlist_alias_t { }; #define END_OF_ALIASES { NULL, NULL } +/** Return true iff the current test has failed. */ +int tinytest_cur_test_has_failed(void); + /** Implementation: called from a test to indicate failure, before logging. */ void tinytest_set_test_failed_(void); /** Implementation: called from a test to indicate that we're skipping. */

1 0

[tor/master] Testing: allow the user to pass a seed in for reproducible-RNG tests
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 72e9c427b81a1d31f28c8398f516fa7892200ef3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 20:05:53 2019 -0400 Testing: allow the user to pass a seed in for reproducible-RNG tests The environment variable TOR_TEST_RNG_SEED, if provided, is a hex value for the RNG seed. --- src/test/rng_test_helpers.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/test/rng_test_helpers.c b/src/test/rng_test_helpers.c index c4243f5e9..1ee267230 100644 --- a/src/test/rng_test_helpers.c +++ b/src/test/rng_test_helpers.c @@ -124,9 +124,22 @@ enable_deterministic_rng_impl(const uint8_t *seed, size_t seed_len) void testing_enable_reproducible_rng(void) { - uint8_t seed[16]; - crypto_rand((char*)seed, sizeof(seed)); - enable_deterministic_rng_impl(seed, sizeof(seed)); + const char *provided_seed = getenv("TOR_TEST_RNG_SEED"); + if (provided_seed) { + size_t hexlen = strlen(provided_seed); + size_t seedlen = hexlen / 2; + uint8_t *seed = tor_malloc(hexlen / 2); + if (base16_decode((char*)seed, seedlen, provided_seed, hexlen) < 0) { + puts("Cannot decode value in TOR_TEST_RNG_SEED"); + exit(1); + } + enable_deterministic_rng_impl(seed, seedlen); + tor_free(seed); + } else { + uint8_t seed[16]; + crypto_rand((char*)seed, sizeof(seed)); + enable_deterministic_rng_impl(seed, sizeof(seed)); + } } /**

1 0

[tor/master] Use new RNG and tinytest code to simplify prob_distr tests
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 2d467544feadeefa9a484142c433170c66d32786 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:51:16 2019 -0400 Use new RNG and tinytest code to simplify prob_distr tests Since the reproducible RNG dumps its own seed, we don't need to do it for it. Since tinytest can tell us if the test failed, we don't need our own test_failed booleans. --- src/test/test_prob_distr.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/test/test_prob_distr.c b/src/test/test_prob_distr.c index 747c3d98e..0ecbf65f4 100644 --- a/src/test/test_prob_distr.c +++ b/src/test/test_prob_distr.c @@ -1119,13 +1119,14 @@ test_psi_dist_sample(const struct dist *dist) } static void -dump_seed(void) +write_stochastic_warning(void) { - printf("\n" + if (tinytest_cur_test_has_failed()) { + printf("\n" "NOTE: This is a stochastic test, and we expect it to fail from\n" "time to time, with some low probability. If you see it fail more\n" "than one trial in 100, though, please tell us.\n\n"); - testing_dump_reproducible_rng_seed(); + } } static void @@ -1180,7 +1181,7 @@ test_stochastic_uniform(void *arg) done: if (tests_failed) { - dump_seed(); + write_stochastic_warning(); } testing_disable_reproducible_rng(); } @@ -1273,7 +1274,7 @@ test_stochastic_genpareto(void *arg) done: if (tests_failed) { - dump_seed(); + write_stochastic_warning(); } testing_disable_reproducible_rng(); } @@ -1301,7 +1302,7 @@ test_stochastic_geometric(void *arg) done: if (tests_failed) { - dump_seed(); + write_stochastic_warning(); } testing_disable_reproducible_rng(); } @@ -1328,7 +1329,7 @@ test_stochastic_logistic(void *arg) done: if (tests_failed) { - dump_seed(); + write_stochastic_warning(); } testing_disable_reproducible_rng(); } @@ -1337,7 +1338,6 @@ static void test_stochastic_log_logistic(void *arg) { bool ok = 0; - bool tests_failed = true; (void) arg; testing_enable_reproducible_rng(); @@ -1351,12 +1351,8 @@ test_stochastic_log_logistic(void *arg) ok = test_stochastic_log_logistic_impl(exp(-10), 1e-2); tt_assert(ok); - tests_failed = false; - done: - if (tests_failed) { - dump_seed(); - } + write_stochastic_warning(); testing_disable_reproducible_rng(); } @@ -1364,7 +1360,6 @@ static void test_stochastic_weibull(void *arg) { bool ok = 0; - bool tests_failed = true; (void) arg; testing_enable_reproducible_rng(); @@ -1380,12 +1375,8 @@ test_stochastic_weibull(void *arg) ok = test_stochastic_weibull_impl(10, 1); tt_assert(ok); - tests_failed = false; - done: - if (tests_failed) { - dump_seed(); - } + write_stochastic_warning(); testing_disable_reproducible_rng(); UNMOCK(crypto_rand); }

1 0

[tor/master] Make testing_disable_reproducible_rng() log seed on test failure
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 261d43cdd5f9dbd9b67303f8c8042a38a37995ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:49:50 2019 -0400 Make testing_disable_reproducible_rng() log seed on test failure This should let us simplify test_prob_distr.c and other stuff in the future. --- src/test/rng_test_helpers.c | 17 ++++++++++++++++- src/test/rng_test_helpers.h | 3 +-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/test/rng_test_helpers.c b/src/test/rng_test_helpers.c index 262d380bd..c4243f5e9 100644 --- a/src/test/rng_test_helpers.c +++ b/src/test/rng_test_helpers.c @@ -17,6 +17,7 @@ #include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" +#include "ext/tinytest.h" #include "test/rng_test_helpers.h" @@ -54,7 +55,8 @@ static uint8_t rng_seed[16]; static crypto_xof_t *rng_xof = NULL; /** - * Print the seed for our PRNG to stdout. We use this when we're + * Print the seed for our PRNG to stdout. We use this when we're failed + * test that had a reproducible RNG set. **/ void testing_dump_reproducible_rng_seed(void) @@ -224,3 +226,16 @@ testing_disable_rng_override(void) rng_is_replaced = false; } + +/** + * As testing_disable_rng_override(), but dump the seed if the current + * test has failed. + */ +void +testing_disable_reproducible_rng(void) +{ + if (tinytest_cur_test_has_failed()) { + testing_dump_reproducible_rng_seed(); + } + testing_disable_rng_override(); +} diff --git a/src/test/rng_test_helpers.h b/src/test/rng_test_helpers.h index 907099450..d7925148a 100644 --- a/src/test/rng_test_helpers.h +++ b/src/test/rng_test_helpers.h @@ -14,8 +14,7 @@ void testing_prefilled_rng_reset(void); void testing_disable_rng_override(void); -#define testing_disable_reproducible_rng() \ - testing_disable_rng_override() +void testing_disable_reproducible_rng(void); #define testing_disable_deterministic_rng() \ testing_disable_rng_override() #define testing_disable_prefilled_rng() \

1 0

[tor/master] Use reproducible RNG logic in circuitpadding tests.
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 536ba09ad1903f36fbb4a5a9e3a205f8142d8d1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 20:12:50 2019 -0400 Use reproducible RNG logic in circuitpadding tests. --- src/test/test_circuitpadding.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index db175fece..4dc284423 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -34,6 +34,8 @@ #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" +#include "test/rng_test_helpers.h" + /* Start our monotime mocking at 1 second past whatever monotime_init() * thought the actual wall clock time was, for platforms with bad resolution * and weird timevalues during monotime_init() before mocking. */ @@ -300,6 +302,7 @@ test_circuitpadding_rtt(void *arg) MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); MOCK(circpad_send_command_to_hop, circpad_send_command_to_hop_mock); + testing_enable_reproducible_rng(); dummy_channel.cmux = circuitmux_alloc(); relay_side = TO_CIRCUIT(new_fake_orcirc(&dummy_channel, &dummy_channel)); @@ -403,6 +406,7 @@ test_circuitpadding_rtt(void *arg) UNMOCK(circuit_package_relay_cell); UNMOCK(circuitmux_attach_circuit); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); return; } @@ -524,6 +528,7 @@ test_circuitpadding_token_removal_higher(void *arg) /* Mock it up */ MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Setup test environment (time etc.) */ client_side = (circuit_t *)origin_circuit_new(); @@ -617,6 +622,7 @@ test_circuitpadding_token_removal_higher(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } /** Test lower token removal strategy by bin */ @@ -629,6 +635,7 @@ test_circuitpadding_token_removal_lower(void *arg) /* Mock it up */ MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Setup test environment (time etc.) */ client_side = (circuit_t *)origin_circuit_new(); @@ -715,6 +722,7 @@ test_circuitpadding_token_removal_lower(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } /** Test closest token removal strategy by bin */ @@ -727,6 +735,7 @@ test_circuitpadding_closest_token_removal(void *arg) /* Mock it up */ MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Setup test environment (time etc.) */ client_side = (circuit_t *)origin_circuit_new(); @@ -821,6 +830,7 @@ test_circuitpadding_closest_token_removal(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } /** Test closest token removal strategy with usec */ @@ -833,6 +843,7 @@ test_circuitpadding_closest_token_removal_usec(void *arg) /* Mock it up */ MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Setup test environment (time etc.) */ client_side = (circuit_t *)origin_circuit_new(); @@ -932,6 +943,7 @@ test_circuitpadding_closest_token_removal_usec(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } /** Test closest token removal strategy with usec */ @@ -944,6 +956,7 @@ test_circuitpadding_token_removal_exact(void *arg) /* Mock it up */ MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Setup test environment (time etc.) */ client_side = (circuit_t *)origin_circuit_new(); @@ -991,6 +1004,7 @@ test_circuitpadding_token_removal_exact(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } #undef BIG_HISTOGRAM_LEN @@ -1003,6 +1017,8 @@ test_circuitpadding_tokens(void *arg) int64_t actual_mocked_monotime_start; (void)arg; + testing_enable_reproducible_rng(); + /** Test plan: * * 1. Test symmetry between bin_to_usec and usec_to_bin @@ -1256,6 +1272,7 @@ test_circuitpadding_tokens(void *arg) free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); monotime_disable_test_mocking(); tor_free(circ_client_machine.states); + testing_disable_reproducible_rng(); } void @@ -1283,6 +1300,7 @@ test_circuitpadding_wronghop(void *arg) /* Mock this function so that our cell counting tests don't get confused by * padding that gets sent by scheduled timers. */ MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); client_side = (circuit_t *)origin_circuit_new(); dummy_channel.cmux = circuitmux_alloc(); @@ -1456,6 +1474,7 @@ test_circuitpadding_wronghop(void *arg) UNMOCK(circuit_package_relay_cell); UNMOCK(circuitmux_attach_circuit); nodes_free(); + testing_disable_reproducible_rng(); } void @@ -1758,6 +1777,7 @@ test_circuitpadding_conditions(void *arg) int64_t actual_mocked_monotime_start; (void)arg; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); + testing_enable_reproducible_rng(); nodes_init(); dummy_channel.cmux = circuitmux_alloc(); @@ -1862,6 +1882,7 @@ test_circuitpadding_conditions(void *arg) done: /* XXX: Free everything */ + testing_disable_reproducible_rng(); return; } @@ -2191,6 +2212,7 @@ test_circuitpadding_sample_distribution(void *arg) /* mock this function so that we dont actually schedule any padding */ MOCK(circpad_machine_schedule_padding, circpad_machine_schedule_padding_mock); + testing_enable_reproducible_rng(); /* Initialize a machine with multiple probability distributions */ circpad_machines_init(); @@ -2223,6 +2245,7 @@ test_circuitpadding_sample_distribution(void *arg) done: free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); UNMOCK(circpad_machine_schedule_padding); + testing_disable_reproducible_rng(); } static circpad_decision_t @@ -2248,6 +2271,7 @@ test_circuitpadding_machine_rate_limiting(void *arg) * really care about padding counts */ MOCK(circpad_machine_spec_transition, circpad_machine_spec_transition_mock); MOCK(circpad_send_command_to_hop, circpad_send_command_to_hop_mock); + testing_enable_reproducible_rng(); /* Setup machine and circuits */ client_side = TO_CIRCUIT(origin_circuit_new()); @@ -2301,6 +2325,7 @@ test_circuitpadding_machine_rate_limiting(void *arg) done: free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); + testing_disable_reproducible_rng(); } /* Test global padding rate limits */ @@ -2320,6 +2345,7 @@ test_circuitpadding_global_rate_limiting(void *arg) MOCK(circuit_package_relay_cell, circuit_package_relay_cell_mock); MOCK(monotime_absolute_usec, mock_monotime_absolute_usec); + testing_enable_reproducible_rng(); monotime_init(); monotime_enable_test_mocking(); @@ -2399,6 +2425,7 @@ test_circuitpadding_global_rate_limiting(void *arg) circuitmux_free(dummy_channel.cmux); SMARTLIST_FOREACH(vote1.net_params, char *, cp, tor_free(cp)); smartlist_free(vote1.net_params); + testing_disable_reproducible_rng(); } /* Test reduced and disabled padding */ @@ -2409,6 +2436,7 @@ test_circuitpadding_reduce_disable(void *arg) int64_t actual_mocked_monotime_start; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); + testing_enable_reproducible_rng(); nodes_init(); dummy_channel.cmux = circuitmux_alloc(); @@ -2548,6 +2576,7 @@ test_circuitpadding_reduce_disable(void *arg) free_fake_orcirc(relay_side); circuitmux_detach_all_circuits(dummy_channel.cmux, NULL); circuitmux_free(dummy_channel.cmux); + testing_disable_reproducible_rng(); } #define TEST_CIRCUITPADDING(name, flags) \

1 0

[tor/master] Travis: fix an rng seed for coverage builds.
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 669f6e34eaae0d6937825bdb345f37912123ddd6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 20:16:35 2019 -0400 Travis: fix an rng seed for coverage builds. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f78333611..330388aa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" ## We only want to check these build option combinations once ## (they shouldn't vary by compiler or OS) ## We run rust and coverage with hardening off, which seems like enough

1 0