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

[tor/master] Fix unit tests for 24050.
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit eb1976202e289d44633127d9dd2d6f96df832def Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:36 2017 -0500 Fix unit tests for 24050. --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 89f9b3e2a..88a0da981 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4118,7 +4118,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); #endif @@ -4454,7 +4454,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1); // Test success with no cache ipv4 DNS

1 0

[tor/release-0.3.2] Fix unit tests for 24050.
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit eb1976202e289d44633127d9dd2d6f96df832def Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:36 2017 -0500 Fix unit tests for 24050. --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 89f9b3e2a..88a0da981 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4118,7 +4118,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); #endif @@ -4454,7 +4454,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1); // Test success with no cache ipv4 DNS

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 20fa6a38839ee4882b7fe8d53840ba3087a1b4a6 Merge: 6a9c3d6e3 f0007f2b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:06:14 2017 -0500 Merge branch 'maint-0.3.2' src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit f0007f2b8d3fe981fc627eee0facfe828142a1fa Merge: 9b44bb49b eb1976202 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:49 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc src/test/test_config.c index 1c0dab39c,88a0da981..e7380c1d1 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -4003,9 -4118,9 +4003,9 @@@ test_config_parse_port_config__ports__p tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); -#endif +#endif /* defined(_WIN32) */ // Test failure if we have no ipv4 and no ipv6 and no onion (DNS only) config_free_lines(config_port_invalid); config_port_invalid = NULL;

1 0

[tor-browser-build/master] Release preparations for 7.5a9
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit 9d501237c3f8269ce7ea97787bf5773d452c3e5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 08:57:10 2017 +0000 Release preparations for 7.5a9 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/sandbox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 7 +++---- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 5b64726..0123357 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.0 + firefox_platform_version: 52.5.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 237272b..57e1338 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.10.30 +version: 2017.11.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/sandbox/config b/projects/sandbox/config index 03b6f6d..a7ed768 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.15 +version: 0.0.16 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e458f61..9d9a975 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 7.5a9 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update Tor to 0.3.2.5-alpha + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + * Update sandboxed-tor-browser to 0.0.16 + Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 06400be..c00af05 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c + sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor/config b/projects/tor/config index e704f13..c49ebb5 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.4-alpha +version: 0.3.2.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index f4fbb08..62b7902 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a8' - torbrowser_build: 'build3' + torbrowser_version: '7.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a6 - - 7.5a7 + - 7.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit fd56a5b5d2c822166baaf8bfb7baeef404e6b51a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 07:47:32 2017 +0000 Release preparations for 7.0.11 Versions bump, changelog update, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cecf4e9..1abe1ba 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 7.0.11 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + Tor Browser 7.0.10 -- November 14 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/gitian/versions b/gitian/versions index 1f08327..26545b9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.0esr +FIREFOX_VERSION=52.5.1esr TORBROWSER_UPDATE_CHANNEL=release @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.8 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.10.30 +HTTPSE_TAG=2017.11.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c +NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 628b131..dda82ef 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.10 + release: 7.0.11 versions: - 7.0.10: - platformVersion: 52.5.0 - detailsURL: https://blog.torproject.org/tor-browser-7010-released + 7.0.11: + platformVersion: 52.5.1 + detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - - 7.0.8 - - 7.0.9 + - 7.0.10 migrate_archs: osx32: osx64 migrate_langs:

1 0

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

28 Nov '17

commit e51fa298686fa6e4cbd9cd7ddd0a8a43ec358bb5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 28 22:47:07 2017 +0000 Update translations for tails-misc_completed --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 587a08dca..8a3f8ed3b 100644 --- a/ru.po +++ b/ru.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-09 19:07+0000\n" +"PO-Revision-Date: 2017-11-28 22:24+0000\n" "Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

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

28 Nov '17

commit 504edc35358339fd6b04173ff2635f669baf0406 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 28 22:47:02 2017 +0000 Update translations for tails-misc --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 587a08dca..8a3f8ed3b 100644 --- a/ru.po +++ b/ru.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-09 19:07+0000\n" +"PO-Revision-Date: 2017-11-28 22:24+0000\n" "Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[bridgedb/develop] Fix error in usage of redirectTo() with a malicious request.
by isis＠torproject.org 28 Nov '17

28 Nov '17

commit 77776deaad380d9a48524c69533bf566a7a1406b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 28 19:43:10 2017 +0000 Fix error in usage of redirectTo() with a malicious request. * FIXES #24460: https://bugs.torproject.org/24460 --- bridgedb/distributors/https/server.py | 6 ++++-- bridgedb/test/test_https_server.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index 352a838..d4771a6 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -410,8 +410,10 @@ class CaptchaProtectedResource(CustomErrorHandlingResource, CSPResource): try: challenge = request.args['captcha_challenge_field'][0] response = request.args['captcha_response_field'][0] - except Exception: # pragma: no cover - return redirectTo(request.URLPath(), request) + except Exception as error: + logging.debug(("Client CAPTCHA solution to HTTPS distributor server" + "didn't include correct HTTP arguments: %s" % error)) + return redirectTo(type(b'')(request.URLPath()), request) return (challenge, response) def checkSolution(self, request): diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index dbd177f..13ec20e 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -372,6 +372,20 @@ class GimpCaptchaProtectedResourceTests(unittest.TestCase): self.assertEqual(challenge, expectedChallenge) self.assertEqual(response, expectedResponse) + def test_extractClientSolution_missing_arguments(self): + """A solution with missing arguments (the solution field) should + return a very agressive redirect to the originally requested, + CAPTCHA-protected page. + """ + expectedChallenge = '23232323232323232323' + + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', expectedChallenge) + + response = self.captchaResource.extractClientSolution(self.request) + + self.assertIn("click here", response) + def test_checkSolution(self): """checkSolution() should return False is the solution is invalid.""" expectedChallenge = '23232323232323232323'

1 0

[bridgedb/develop] Fix failing unittest after #24433 merge.
by isis＠torproject.org 28 Nov '17

28 Nov '17

commit a316083e1a3a9eedcc6aa5d27c053f4974f8cf39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 28 02:33:05 2017 +0000 Fix failing unittest after #24433 merge. --- bridgedb/test/test_distributors_moat_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index 2145541..95796d1 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -882,7 +882,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): 'transport': 'obfs4', 'challenge': challenge, 'solution': self.solution, - 'qrcode': True, + 'qrcode': 'true', }] } encoded_data = json.dumps(data)

1 0