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

[tor/master] test: Add base32_encode/decode unit tests
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit f4f9a9be40877cbd3d4311ba696a07d316760095 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jun 13 11:20:09 2016 -0400 test: Add base32_encode/decode unit tests Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_util_format.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index a25054c..c27b3a5 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -289,6 +289,96 @@ test_util_format_base16_decode(void *ignored) tor_free(real_dst); } +static void +test_util_format_base32_encode(void *arg) +{ + (void) arg; + size_t real_dstlen = 32; + char *dst = tor_malloc_zero(real_dstlen); + + /* Basic use case that doesn't require a source length correction. */ + { + /* Length of 10 bytes. */ + const char *src = "blahbleh12"; + size_t srclen = strlen(src); + /* Expected result encoded base32. This was created using python as + * such (and same goes for all test case.): + * + * b = bytes("blahbleh12", 'utf-8') + * base64.b32encode(b) + * (result in lower case) + */ + const char *expected = "mjwgc2dcnrswqmjs"; + + base32_encode(dst, base32_encoded_size(srclen), src, srclen); + tt_mem_op(expected, OP_EQ, dst, strlen(expected)); + /* Encode but to a larger size destination. */ + memset(dst, 0, real_dstlen); + base32_encode(dst, real_dstlen, src, srclen); + tt_mem_op(expected, OP_EQ, dst, strlen(expected)); + } + + + /* Non multiple of 5 for the source buffer length. */ + { + /* Length of 8 bytes. */ + const char *expected = "mjwgc2dcnrswq"; + const char *src = "blahbleh"; + size_t srclen = strlen(src); + + memset(dst, 0, real_dstlen); + base32_encode(dst, base32_encoded_size(srclen), src, srclen); + tt_mem_op(expected, OP_EQ, dst, strlen(expected)); + } + + done: + tor_free(dst); +} + +static void +test_util_format_base32_decode(void *arg) +{ + (void) arg; + int ret; + size_t real_dstlen = 32; + char *dst = tor_malloc_zero(real_dstlen); + + /* Basic use case. */ + { + /* Length of 10 bytes. */ + const char *expected = "blahbleh12"; + /* Expected result encoded base32. */ + const char *src = "mjwgc2dcnrswqmjs"; + + ret = base32_decode(dst, strlen(expected), src, strlen(src)); + tt_int_op(ret, ==, 0); + tt_str_op(expected, OP_EQ, dst); + } + + /* Non multiple of 5 for the source buffer length. */ + { + /* Length of 8 bytes. */ + const char *expected = "blahbleh"; + const char *src = "mjwgc2dcnrswq"; + + ret = base32_decode(dst, strlen(expected), src, strlen(src)); + tt_int_op(ret, ==, 0); + tt_mem_op(expected, OP_EQ, dst, strlen(expected)); + } + + /* Invalid values. */ + { + /* Invalid character '#'. */ + ret = base32_decode(dst, real_dstlen, "#abcde", 6); + tt_int_op(ret, ==, -1); + /* Make sure the destination buffer has been zeroed even on error. */ + tt_int_op(tor_mem_is_zero(dst, real_dstlen), ==, 1); + } + +done: + tor_free(dst); +} + struct testcase_t util_format_tests[] = { { "unaligned_accessors", test_util_format_unaligned_accessors, 0, NULL, NULL }, @@ -297,6 +387,10 @@ struct testcase_t util_format_tests[] = { NULL, NULL }, { "base64_decode", test_util_format_base64_decode, 0, NULL, NULL }, { "base16_decode", test_util_format_base16_decode, 0, NULL, NULL }, + { "base32_encode", test_util_format_base32_encode, 0, + NULL, NULL }, + { "base32_decode", test_util_format_base32_decode, 0, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'bug18280_029_03_nm_squashed'
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 48b25e6811bb822542ea898e30aebc75e185f29d Merge: 94762e3 f4f9a9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 13:53:57 2016 -0400 Merge branch 'bug18280_029_03_nm_squashed' src/common/util_format.c | 36 +++++++++++------ src/common/util_format.h | 1 + src/test/test_util_format.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 12 deletions(-)

1 0

[torbirdy/master] Bug 6314: Ensure Date header uses UTC string
by sukhbir＠torproject.org 17 Jun '16

17 Jun '16

commit 230ba97882424d35e12794c45db7c6715fe753f9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 16 16:49:58 2016 -0700 Bug 6314: Ensure Date header uses UTC string --- components/torbirdy.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 84ea9c7..d4743e0 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -392,9 +392,11 @@ function sanitizeDateHeaders() { let roundedDate = new Date(date.getTime()); // Round down to the nearest minute. roundedDate.setSeconds(0); - // Use the headeremitter's addDate function to format it properly. - // `this` magically refers to the headeremitter object. - this.addDate(roundedDate); + // Use the headeremitter's internal `addText` function to inject the + // Date header. `this` magically refers to the headeremitter object. + // Date.toUTCString() produces an RFC 1123-formatted date string. + // We replace the "GMT" symbol with "+0000" because it is preferred. + this.addText(roundedDate.toUTCString().replace(/GMT$/, "+0000"), false); }); }

1 0

[torbirdy/master] Merge pull request #32 from arthuredelstein/6314+1
by sukhbir＠torproject.org 17 Jun '16

17 Jun '16

commit 385f4ab430f6d4462b055543f2c54297a70ec5ff Merge: 1319ae8 230ba97 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 17 11:44:07 2016 -0400 Merge pull request #32 from arthuredelstein/6314+1 Bug 6314: Ensure Date header uses UTC string components/torbirdy.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.2
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 4675811efa2cdc1d9d61a4420735d18ce1bdb417 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 15:10:50 2016 +0000 Release preparations for 6.0.2 Version bumps, Changelog update and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ gitian/versions | 4 ++-- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3fb411e..6325c23 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 6.0.2 -- June 21 + * All Platforms + * Update Torbutton to 1.9.5.5 + * Bug 19417: Clear asmjscache + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Windows + * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Linux + * Bug 19276: Disable Xrender due to possible performance regressions + Tor Browser 6.0.1 -- June 7 * All Platforms * Update Firefox to 45.2.0esr diff --git a/gitian/versions b/gitian/versions index 8bbfeb3..6dbc151 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.5.4 +TORBUTTON_TAG=1.9.5.5 HTTPSE_TAG=5.1.9 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index e7ea1a7..4e89b8a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -13,15 +13,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.0a5 - release: 6.0.1 + release: 6.0.2 versions: - 6.0.1: + 6.0.2: platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-602-released + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.2 incremental_from: - - 5.5.5 - 6.0 + - 6.0.1 migrate_archs: osx32: osx64 osx32:

1 0

[chutney/master] Allow specifying the Chutney data directory.
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 05047a2dff5e11da177e855de90c4a2455c79c6c Author: anonym <anonym(a)riseup.net> Date: Thu Apr 14 21:41:13 2016 +0200 Allow specifying the Chutney data directory. It is controlled with the CHUTNEY_DATA_DIR environment variable, but defaults to the 'net' sub-directory of the Chutney source tree. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 8bb4c6a..6a507e8 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -669,7 +669,7 @@ DEFAULTS = { 'hs_directory': 'hidden_service', 'hs-hostname': None, 'connlimit': 60, - 'net_base_dir': 'net', + 'net_base_dir': os.environ.get('CHUTNEY_DATA_DIR', 'net'), 'tor': os.environ.get('CHUTNEY_TOR', 'tor'), 'tor-gencert': os.environ.get('CHUTNEY_TOR_GENCERT', None), 'auth_cert_lifetime': 12,

1 0

[chutney/master] Document CHUTNEY_DATA_DIR
by nickm＠torproject.org 17 Jun '16

17 Jun '16

commit 360d88a936670a90b21f0d2cff3300ca454b1ae6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 10:53:35 2016 -0400 Document CHUTNEY_DATA_DIR --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index 3e4b1f5..e0eb457 100644 --- a/README +++ b/README @@ -66,3 +66,6 @@ The configuration files: The working files: chutney sticks its working files, including all data directories, log files, etc, in ./net/. Each tor instance gets a subdirectory of net/nodes. + + You can override the directory "./net" with the CHUTNEY_DATA_DIR + environment variable.

1 0

[torbutton/maint-1.9.5] Release preparations for 1.9.5.5
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 752bf7244bf20141003bfd6da06aaab92be2fae7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 14:48:30 2016 +0000 Release preparations for 1.9.5.5 Changelog update, version bump --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index ecf6cba..77ba290 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.5.5 + * Bug 19417: Clear asmjscache + 1.9.5.4 * Bug 18466: Make Torbutton compatible with Firefox ESR 45 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu diff --git a/src/install.rdf b/src/install.rdf index 44affa3..ac45b1d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.4</em:version> + <em:version>1.9.5.5</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-1.9.5] Bug 19417: Clear asmjscache
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit ecc71020f6e3e6db5a2e8dc87af354cf2c86733b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 09:49:16 2016 +0000 Bug 19417: Clear asmjscache This patch clears the asmjscache (and the IndexedDB storage) on New Identity and during start-up. The latter is a suboptimal workaround we deploy until the asmjscache is Private Browsing Mode aware. InedxedDB storage is not so urgent as IndexedDB is not working in Private Browsing Mode anyway. --- src/chrome/content/torbutton.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a293c44..539bd88 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -578,6 +578,23 @@ function torbutton_init() { torbutton_update_security_slider(); } + // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we + // don't allow things saved to disk. This is an ad-hoc fix to work around + // #19417. Once this is properly solved we should remove this code again. + if (m_tb_prefs.getBoolPref("extensions.torbutton.block_disk")) { + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + } + // set panel style from preferences torbutton_set_panel_style(); @@ -1677,6 +1694,7 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions + * k. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1824,6 +1842,21 @@ function torbutton_do_new_identity() { window.alert("Torbutton: Unexpected error during cache clearing: "+e); } + torbutton_log(3, "New Identity: Clearing storage"); + + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + torbutton_log(5, "Exception on storage clearing: "+e); + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage"); if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) {

1 0

[torbutton/master] Bug 19417: Clear asmjscache
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit e264e6027a78488f9813e3796d29f52df1a189ba Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 09:49:16 2016 +0000 Bug 19417: Clear asmjscache This patch clears the asmjscache (and the IndexedDB storage) on New Identity and during start-up. The latter is a suboptimal workaround we deploy until the asmjscache is Private Browsing Mode aware. InedxedDB storage is not so urgent as IndexedDB is not working in Private Browsing Mode anyway. --- src/chrome/content/torbutton.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e0e541b..f69fd8a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -578,6 +578,23 @@ function torbutton_init() { torbutton_update_security_slider(); } + // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we + // don't allow things saved to disk. This is an ad-hoc fix to work around + // #19417. Once this is properly solved we should remove this code again. + if (m_tb_prefs.getBoolPref("extensions.torbutton.block_disk")) { + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + } + // set panel style from preferences torbutton_set_panel_style(); @@ -1677,6 +1694,7 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions + * k. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1824,6 +1842,21 @@ function torbutton_do_new_identity() { window.alert("Torbutton: Unexpected error during cache clearing: "+e); } + torbutton_log(3, "New Identity: Clearing storage"); + + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + torbutton_log(5, "Exception on storage clearing: "+e); + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage"); if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) {

1 0