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

[tor/master] Merge remote-tracking branch 'asn/bug21971'
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit afe1af7de6787e1f63dadde798b7f806be0c138b Merge: eeb266c 0c39cef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 18 21:38:28 2017 -0400 Merge remote-tracking branch 'asn/bug21971' src/test/test_circuitlist.c | 16 ++++++++-------- src/test/test_hs_intropoint.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-)

1 0

[tor/master] prop224 tests: Remove useless NULL check before circuit_free().
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit 0c39cefc5207cabcd648201f69899574b6844007 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 17 16:36:55 2017 +0300 prop224 tests: Remove useless NULL check before circuit_free(). Addresses coverity issue CID 1405130. --- src/test/test_circuitlist.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 520aaf3..344ab27 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -388,6 +388,7 @@ test_hs_circuitmap_isolation(void *arg) const uint8_t tok1[REND_TOKEN_LEN] = "bet i got some of th"; circ1 = or_circuit_new(0, NULL); + tt_assert(circ1); circ1->base_.purpose = CIRCUIT_PURPOSE_REND_POINT_WAITING; /* check that circuitmap is empty right? */ @@ -408,10 +409,13 @@ test_hs_circuitmap_isolation(void *arg) const uint8_t tok2[REND_TOKEN_LEN] = "you dont know anythi"; circ2 = origin_circuit_new(); + tt_assert(circ2); circ2->base_.purpose = CIRCUIT_PURPOSE_S_ESTABLISH_INTRO; circ3 = or_circuit_new(0, NULL); + tt_assert(circ3); circ3->base_.purpose = CIRCUIT_PURPOSE_INTRO_POINT; circ4 = origin_circuit_new(); + tt_assert(circ4); circ4->base_.purpose = CIRCUIT_PURPOSE_S_ESTABLISH_INTRO; /* Register circ2 with tok2 as service-side intro v2 circ */ @@ -437,14 +441,10 @@ test_hs_circuitmap_isolation(void *arg) } done: - if (circ1) - circuit_free(TO_CIRCUIT(circ1)); - if (circ2) - circuit_free(TO_CIRCUIT(circ2)); - if (circ3) - circuit_free(TO_CIRCUIT(circ3)); - if (circ4) - circuit_free(TO_CIRCUIT(circ4)); + circuit_free(TO_CIRCUIT(circ1)); + circuit_free(TO_CIRCUIT(circ2)); + circuit_free(TO_CIRCUIT(circ3)); + circuit_free(TO_CIRCUIT(circ4)); } struct testcase_t circuitlist_tests[] = {

1 0

[tor/master] prop224 tests: Don't use tt_size_op to compare ssize_t.
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit a3ce303432f35a6f06f63f0679b9bb577f88dc3c Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Apr 17 16:23:58 2017 +0300 prop224 tests: Don't use tt_size_op to compare ssize_t. Addresses coverity CID 1405129. --- src/test/test_hs_intropoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 7bcd568..ef5cb46 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -777,11 +777,11 @@ test_received_introduce1_handling(void *arg) { cell = helper_create_introduce1_cell(); ssize_t request_len = trn_cell_introduce1_encoded_len(cell); - tt_size_op(request_len, OP_GT, 0); + tt_int_op((int)request_len, OP_GT, 0); request = tor_malloc_zero(request_len); ssize_t encoded_len = trn_cell_introduce1_encode(request, request_len, cell); - tt_size_op(encoded_len, OP_GT, 0); + tt_int_op((int)encoded_len, OP_GT, 0); circ = helper_create_intro_circuit(); or_circuit_t *service_circ = helper_create_intro_circuit(); @@ -812,7 +812,7 @@ test_received_introduce1_handling(void *arg) request = tor_malloc_zero(request_len + 256); ssize_t encoded_len = trn_cell_introduce1_encode(request, request_len, cell); - tt_size_op(encoded_len, OP_GT, 0); + tt_int_op((int)encoded_len, OP_GT, 0); circ = helper_create_intro_circuit(); or_circuit_t *service_circ = helper_create_intro_circuit();

1 0

[tor/master] Merge remote-tracking branches 'sebastian/consdiff_add' and 'sebastian/consdiff_newline'
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit eeb266c1395e582f1480f49316a5014ac77e8f50 Merge: 4596435 5a7e39c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 18 21:31:53 2017 -0400 Merge remote-tracking branches 'sebastian/consdiff_add' and 'sebastian/consdiff_newline' src/or/consdiff.c | 2 +- src/test/test_consdiff.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/master] Don't accept ranges for add commands in consdiff
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit 459643502b8958b44852d304cd1846d027628fc6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 17 06:46:23 2017 +0200 Don't accept ranges for add commands in consdiff Fixes ticket #21963 --- src/or/consdiff.c | 9 +++++++++ src/test/test_consdiff.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/or/consdiff.c b/src/or/consdiff.c index d2a2af1..3481c8f 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -795,6 +795,7 @@ apply_ed_diff(const smartlist_t *cons1, const smartlist_t *diff, diff_line[diff_cdline->len] = 0; const char *ptr = diff_line; int start = 0, end = 0; + int had_range = 0; if (get_linenum(&ptr, &start) < 0) { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " "an ed command was missing a line number."); @@ -802,6 +803,7 @@ apply_ed_diff(const smartlist_t *cons1, const smartlist_t *diff, } if (*ptr == ',') { /* Two-item range */ + had_range = 1; ++ptr; if (get_linenum(&ptr, &end) < 0) { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " @@ -850,6 +852,13 @@ apply_ed_diff(const smartlist_t *cons1, const smartlist_t *diff, goto error_cleanup; } + /* 'a' commands are not allowed to have ranges. */ + if (had_range && action == 'a') { + log_warn(LD_CONSDIFF, "Could not apply consensus diff because " + "it wanted to add lines after a range."); + goto error_cleanup; + } + /* Add unchanged lines. */ for (; j && j > end; --j) { cdline_t *cons_line = smartlist_get(cons1, j-1); diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 1b4e2ad..6c3a8e0 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -687,6 +687,15 @@ test_consdiff_apply_ed_diff(void *arg) smartlist_clear(diff); + /* Unexpected range for add command. */ + smartlist_add_linecpy(diff, area, "1,2a"); + mock_clean_saved_logs(); + cons2 = apply_ed_diff(cons1, diff, 0); + tt_ptr_op(NULL, OP_EQ, cons2); + expect_single_log_msg_containing("add lines after a range"); + + smartlist_clear(diff); + /* Script is not in reverse order. */ smartlist_add_linecpy(diff, area, "1d"); smartlist_add_linecpy(diff, area, "3d");

1 0

[tor/master] Fix diff generation with line added at start
by nickm＠torproject.org 19 Apr '17

19 Apr '17

commit 5a7e39c0cbca3f2b94834167154472a61fc34a03 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 17 10:07:31 2017 +0200 Fix diff generation with line added at start The consdiff generation logic would skip over lines added at the start of the second file, and generate a diff that it would the immediately refuse because it couldn't be used to reproduce the second file from the first. Fixes #21996. --- src/or/consdiff.c | 2 +- src/test/test_consdiff.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/or/consdiff.c b/src/or/consdiff.c index d2a2af1..cd22fd4 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -671,7 +671,7 @@ gen_ed_diff(const smartlist_t *cons1, const smartlist_t *cons2, */ i1=len1-1, i2=len2-1; char buf[128]; - while (i1 > 0 || i2 > 0) { + while (i1 >= 0 || i2 >= 0) { int start1x, start2x, end1, end2, added, deleted; diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 1b4e2ad..193d524 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -622,6 +622,17 @@ test_consdiff_gen_ed_diff(void *arg) tt_str_eq_line(".", smartlist_get(diff, 5)); tt_str_eq_line("2d", smartlist_get(diff, 6)); + smartlist_clear(cons1); + smartlist_clear(cons2); + consensus_split_lines(cons1, "B\n", area); + consensus_split_lines(cons2, "A\nB\n", area); + diff = gen_ed_diff(cons1, cons2, area); + tt_ptr_op(NULL, OP_NE, diff); + tt_int_op(3, OP_EQ, smartlist_len(diff)); + tt_str_eq_line("0a", smartlist_get(diff, 0)); + tt_str_eq_line("A", smartlist_get(diff, 1)); + tt_str_eq_line(".", smartlist_get(diff, 2)); + /* TODO: small real use-cases, i.e. consensuses. */ done:

1 0

[stem/master] Make interpreter integ test work with all targets
by atagar＠torproject.org 18 Apr '17

18 Apr '17

commit d9fa8fb42f764ee75008713cc9fe12b5e645e58b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 18 10:15:40 2017 -0700 Make interpreter integ test work with all targets Oops, this new test was only compatable with the default target. Having it account for others so it runs with '--target RUN_ALL'. Caught thanks to our jenkins test runs. --- test/integ/interpreter.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/test/integ/interpreter.py b/test/integ/interpreter.py index 4681c57..5e7c94b 100644 --- a/test/integ/interpreter.py +++ b/test/integ/interpreter.py @@ -11,15 +11,37 @@ import stem.util.system import test.runner import test.util +from test.util import require_controller + PROMPT_CMD = os.path.join(test.util.STEM_BASE, 'tor-prompt') +def _run_prompt(*args): + if test.runner.Torrc.SOCKET not in test.runner.get_runner().get_options(): + return stem.util.system.call([PROMPT_CMD, '--interface', test.runner.CONTROL_PORT] + list(args)) + else: + return stem.util.system.call([PROMPT_CMD, '--socket', test.runner.CONTROL_SOCKET_PATH] + list(args)) + + class TestInterpreter(unittest.TestCase): + @require_controller def test_running_command(self): + # We'd need to provide the password to stdin. Fine test to add later but + # not gonna hassle for now. + + if test.runner.Torrc.PASSWORD in test.runner.get_runner().get_options(): + self.skipTest('password auth unsupported') + return + expected = ['250-config-file=%s' % test.runner.get_runner().get_torrc_path(), '250 OK'] - self.assertEqual(expected, stem.util.system.call([PROMPT_CMD, '--interface', test.runner.CONTROL_PORT, '--run', 'GETINFO config-file'])) + self.assertEqual(expected, _run_prompt('--run', 'GETINFO config-file')) + @require_controller def test_running_file(self): + if test.runner.Torrc.PASSWORD in test.runner.get_runner().get_options(): + self.skipTest('password auth unsupported') + return + expected = [ '250-config-file=%s' % test.runner.get_runner().get_torrc_path(), '250 OK', @@ -32,4 +54,4 @@ class TestInterpreter(unittest.TestCase): tmp.write('GETINFO config-file\nGETINFO version') tmp.flush() - self.assertEqual(expected, stem.util.system.call([PROMPT_CMD, '--interface', test.runner.CONTROL_PORT, '--run', tmp.name])) + self.assertEqual(expected, _run_prompt('--run', tmp.name))

1 0

[stem/master] Only require 'pycodestyle.ignore' snippets to only need the prefix
by atagar＠torproject.org 18 Apr '17

18 Apr '17

commit b0542926f6debb7e6b31a62d520d4dacc7ac6127 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 18 09:47:04 2017 -0700 Only require 'pycodestyle.ignore' snippets to only need the prefix Changing our ignore rules to be a prefix match rather than an exact match. This way users don't need to deal with the headache of inline comments and such. We needed a new ignore rule because the version of pycodestyle differs between my netbook and pc, so a minor issue slipped in. --- stem/util/test_tools.py | 6 +++++- test/settings.cfg | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 0b44d3a..51ac244 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -232,6 +232,10 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa .. versionchanged:: 1.4.0 Added the prefer_single_quotes option. + .. versionchanged:: 1.6.0 + Changed 'pycodestyle.ignore' code snippets to only need to match against + the prefix. + :param list paths: paths to search for stylistic issues :param bool check_newlines: check that we have standard newlines (\\n), not windows (\\r\\n) nor classic mac (\\r) @@ -260,7 +264,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa def is_ignored(path, rule, code): for ignored_path, ignored_rule, ignored_code in ignore_for_file: - if path.endswith(ignored_path) and ignored_rule == rule and ignored_code == code.strip(): + if path.endswith(ignored_path) and ignored_rule == rule and code.strip().startswith(ignored_code): return True return False diff --git a/test/settings.cfg b/test/settings.cfg index 11137b4..f11b1f5 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -135,6 +135,7 @@ pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.n pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.microdescriptor pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.tordnsel pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.hidden_service_descriptor +pycodestyle.ignore test/util.py => E402: import test.runner # False positives from pyflakes. These are mappings between the path and the # issue.

1 0

[tor-browser-bundle/master] Pick up build3 from Mozilla and bug fixes
by gk＠torproject.org 18 Apr '17

18 Apr '17

commit 421091532d3536893e715f62cab9055cd822b95a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 18 11:26:23 2017 +0000 Pick up build3 from Mozilla and bug fixes --- Bundle-Data/Docs/ChangeLog.txt | 3 +++ gitian/versions.alpha | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3d36c6e..b2ee463 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -58,10 +58,12 @@ Tor Browser 7.0a3 -- April 20 2017 * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID * Bug 21724: Make Firefox and Tor Browser distinct macOS apps * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback * Linux * Bug 21907: Fix runtime error on CentOS 6 * Bug 21748: Fix broken Snowflake build and update bridge details * Bug 21954: Snowflake breaks the 7.0a3 build + * Bug 15910: Don't download GMPs via the local fallback * Build system * Windows * Bug 21837: Fix reproducibility of accessibility code for Windows @@ -78,6 +80,7 @@ Tor Browser 7.0a3 -- April 20 2017 * Linux * Bug 21930: NSS libraries are missing from mar-tools archive * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore * Bug 21629: Fix broken ASan builds when switching to ESR 52 Tor Browser 7.0a2-hardened -- March 7 2017 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b16341a..fffb050 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=52.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1 TOR_TAG=tor-0.3.0.5-rc TORLAUNCHER_TAG=0.2.12 TORBUTTON_TAG=1.9.7.2 @@ -48,12 +48,12 @@ GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -GITIAN_TAG=tor-browser-builder-4-3 +GITIAN_TAG=tor-browser-builder-4-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Apr '17

18 Apr '17

commit 72667935298e11ca5a0e2e5202a5d9e33981eedf Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 18 11:09:53 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This blocks downloading GMPs via the new local fallback. See: https://trac.torproject.org/projects/tor/ticket/15910#comment:25 --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e07a5a1..305666a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -195,6 +195,10 @@ pref("media.navigator.enabled", false); // clever solution for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716. pref("media.gmp-provider.enabled", false); pref("media.gmp-manager.url.override", "data:text/plain,"); +// Since ESR52 it is not enough anymore to block pinging the GMP update/download +// server. There is a local fallback that must be blocked now as well. See: +// https://bugzilla.mozilla.org/show_bug.cgi?id=1267495. +pref("media.gmp-manager.updateEnabled", false); // EME prefs: Strictly speaking these prefs don't need to be set as we are // using the --disable-eme compile flag. However, in order to not confuse users, // who might stumble upon them while looking into about:config, we set them to

1 0