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

[tor-messenger-build/master] Add browserMountPoints.inc for aboutDialog.xul on OS X
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit fde79846b12b26249b4d325872943638e6cc7e00 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jul 22 11:31:38 2016 -0400 Add browserMountPoints.inc for aboutDialog.xul on OS X --- projects/instantbird/browserMountPoints.inc | 12 ++++++++++++ projects/instantbird/build | 1 + projects/instantbird/config | 2 ++ 3 files changed, 15 insertions(+) diff --git a/projects/instantbird/browserMountPoints.inc b/projects/instantbird/browserMountPoints.inc new file mode 100644 index 0000000..e4315b0 --- /dev/null +++ b/projects/instantbird/browserMountPoints.inc @@ -0,0 +1,12 @@ +<stringbundleset id="stringbundleset"/> + +<commandset id="mainCommandSet"/> +<commandset id="baseMenuCommandSet"/> +<commandset id="placesCommands"/> + +<broadcasterset id="mainBroadcasterSet"/> + +<keyset id="mainKeyset"/> +<keyset id="baseMenuKeyset"/> + +<menubar id="main-menubar"/> \ No newline at end of file diff --git a/projects/instantbird/build b/projects/instantbird/build index 29f6124..2701591 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -54,6 +54,7 @@ done [% IF c("var/osx") -%] cp $rootdir/cert_override.txt im/app/profile +cp $rootdir/browserMountPoints.inc im/content/ [% END -%] cp $rootdir/xmppRegister* im/content/ diff --git a/projects/instantbird/config b/projects/instantbird/config index fe98a83..2e53a6a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -134,6 +134,8 @@ input_files: - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' + - filename: browserMountPoints.inc + enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python

1 0

[torbutton/master] Bug 8725: Block `resource://` based fingerprinting with nsIContentPolicy.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit 3bff5aaea6e1a732ff908527f67d1784ecf23c57 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 17 01:25:09 2016 +0000 Bug 8725: Block `resource://` based fingerprinting with nsIContentPolicy. Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… --- src/chrome.manifest | 4 ++++ src/components/content-policy.js | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index e85a205..340ed27 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -170,6 +170,10 @@ category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selec component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf} +component {4c03be7d-492f-990e-f0da-f3689e564898} components/content-policy.js +contract @torproject.org/content-policy;1 {4c03be7d-492f-990e-f0da-f3689e564898} +category content-policy ContentPolicy @torproject.org/content-policy;1 + category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1 category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 diff --git a/src/components/content-policy.js b/src/components/content-policy.js new file mode 100644 index 0000000..b4b33a7 --- /dev/null +++ b/src/components/content-policy.js @@ -0,0 +1,48 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* + * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 + * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… + */ + +const Ci = Components.interfaces, Cu = Components.utils; + +// Import XPCOMUtils object. +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +function ContentPolicy() {} + +ContentPolicy.prototype = { + classDescription: "ContentPolicy", + classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"), + contractID: "@torproject.org/content-policy;1", + QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), + + _xpcom_categories: [{category: "content-policy"}], + + shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { + // Accept if no content URI or scheme is not a resource. + if (!aContentLocation || !aContentLocation.schemeIs('resource')) + return Ci.nsIContentPolicy.ACCEPT; + + // Accept if no origin URI, or if the origin URI scheme is chrome/resource. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome')) + return Ci.nsIContentPolicy.ACCEPT; + + // Accept if resource directly loaded into a tab. + if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) + return Ci.nsIContentPolicy.ACCEPT; + + return Ci.nsIContentPolicy.REJECT_REQUEST; + }, + + shouldProcess: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeType, aExtra) { + return Ci.nsIContentPolicy.ACCEPT; + }, +}; + +// Firefox >= 4.0 (Old versions are extremely irrelevant). +var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);

1 0

[torbutton/master] Bug 8725: Consistently deny redirects to browser/addon internal URLs.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit fa67687df5fc72c0b6085d9941331277d32319f3 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Jul 16 03:37:27 2016 +0000 Bug 8725: Consistently deny redirects to browser/addon internal URLs. The browser's behavior is different depending on if a given internal resource is available or not, regardless of the fact that the actual body will not load due to the various safeguards and checks. This normalizes the behavior by denying all redirects destined for URLs with proscribed browser internal schemes (`resource`, `about`, `chrome`). --- src/components/content-policy.js | 41 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index c6c8aa9..e025ecd 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -8,7 +8,7 @@ * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… */ -const Ci = Components.interfaces, Cu = Components.utils; +const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils; // Import XPCOMUtils object. Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -21,8 +21,6 @@ ContentPolicy.prototype = { contractID: "@torproject.org/content-policy;1", QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), - _xpcom_categories: [{category: "content-policy"}], - shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { // Accept if no content URI or scheme is not a resource/chrome. if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) @@ -44,5 +42,42 @@ ContentPolicy.prototype = { }, }; +// Install a HTTP response handler to check for redirects to URLs with schemes +// that should be internal to the browser. There's various safeguards and +// checks that cause the body to be unavailable, but the `onLoad()` behavior +// is inconsistent, which results in leaking information about the specific +// user agent instance (eg: what addons are installed). +var requestObserver = { + ioService: Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService), + observerService: Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService), + + start: function() { + this.observerService.addObserver(this, "http-on-examine-response", false); + }, + + observe: function(aSubject, aTopic, aData) { + let aChannel = aSubject.QueryInterface(Ci.nsIHttpChannel); + let aStatus = aChannel.responseStatus; + + // If this is a redirect... + // + // Note: Technically `304 Not Modifed` isn't a redirect, but receiving that + // to the proscribed schemes is nonsensical. + if (aStatus >= 300 && aStatus < 400) { + let location = aChannel.getResponseHeader("Location"); + let aUri = this.ioService.newURI(location, null, null); + + // And it's redirecting into the browser or addon's internal URLs... + if (aUri.schemeIs("resource") || aUri.schemeIs("chrome") || aUri.schemeIs("about")) { + // Cancel the request. + aSubject.cancel(Components.results.NS_BINDING_ABORTED); + } + } + }, +}; + // Firefox >= 4.0 (Old versions are extremely irrelevant). var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]); + +// Register the request observer to handle redirects. +requestObserver.start();

1 0

[torbutton/master] Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit ace11cd8020aaf0136ee58aa074666f10c14abb9 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 17 01:27:14 2016 +0000 Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy. Most addons do not set `contentaccessible=yes`, however behavior should be consistent even if such addons are installed. This does not affect any of the standard addons shipped with Tor Browser, but will break user installed addons that depend on actually being able to access `chrome://` URLs in this manner. --- src/components/content-policy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index b4b33a7..c6c8aa9 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -24,12 +24,12 @@ ContentPolicy.prototype = { _xpcom_categories: [{category: "content-policy"}], shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - // Accept if no content URI or scheme is not a resource. - if (!aContentLocation || !aContentLocation.schemeIs('resource')) + // Accept if no content URI or scheme is not a resource/chrome. + if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) return Ci.nsIContentPolicy.ACCEPT; - // Accept if no origin URI, or if the origin URI scheme is chrome/resource. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome')) + // Accept if no origin URI or if origin scheme is chrome/resource/about. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) return Ci.nsIContentPolicy.ACCEPT; // Accept if resource directly loaded into a tab.

1 0

[torbutton/master] Merge remote-tracking branch 'yawning/bug8725_take3'
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit 3b8e1a3508c7cb15d15c93149acab81ea8c51d9a Merge: 7dd7101 fa67687 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 28 15:06:21 2016 -0700 Merge remote-tracking branch 'yawning/bug8725_take3' src/chrome.manifest | 4 ++ src/components/content-policy.js | 83 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Jul '16

28 Jul '16

commit 4794bc69bd48faac03e56ce14241128603c36961 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 28 21:45:37 2016 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 86956eb..9471e44 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL Observatory 首选项"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "拦截所有 HTTP 请求"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "拦截所有未加密请求"> <!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.menu.viewAllRules "查看所有规则">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Jul '16

28 Jul '16

commit e7e47cc8c19219987cedc2b40e867f9344eeb542 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 28 21:45:29 2016 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 02bbf6a..9471e44 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL Observatory 首选项"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "拦截所有未加密请求"> <!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.menu.viewAllRules "查看所有规则">

1 0

[bridgedb/master] Merge branch 'release/0.3.6'
by isis＠torproject.org 28 Jul '16

28 Jul '16

commit 908294fde8cb818de29f73e8355411148dfba8f9 Merge: 7d6defe 936958a Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 28 16:38:07 2016 +0000 Merge branch 'release/0.3.6' .travis.yml | 12 +-- CHANGELOG | 17 +++- bridgedb.conf | 2 + bridgedb/Main.py | 12 +++ bridgedb/runner.py | 29 ++++++ bridgedb/util.py | 21 +++++ requirements.txt | 2 +- test/https_helpers.py | 228 +++++++++++++++++++++++++++++++++++++++++++++- test/test_https_server.py | 2 +- test/test_txrecaptcha.py | 6 ++ test/test_util.py | 33 ++++++- 11 files changed, 352 insertions(+), 12 deletions(-)

1 0

[bridgedb/master] Add a CHANGELOG entry for #18949.
by isis＠torproject.org 28 Jul '16

28 Jul '16

commit 936958ae0bb138bf1a85cd311488da0c01fe2a57 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 28 16:37:22 2016 +0000 Add a CHANGELOG entry for #18949. --- CHANGELOG | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 036c057..2d7ab93 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,17 @@ -Changes in version 0.3.6 - 2016-XXX +Changes in version 0.3.6 - 2016-07-28 + + * FIXES #18237 https://bugs.torproject.org/18237 + During descriptor parsing, BridgeDB saves copies of descriptor files + which couldn't be parsed, for later debugging purposes. To avoid + filing up the runtime directory with these files, we now delete files + older than 24 hours, every 24 hours. + + * FIXES #18949 https://bugs.torproject.org/18949 + Since we've upgraded the host machine which runs The Tor Project's + BridgeDB instance to Debian Jessie, this patch updates the testing + configurations and continuous integration infrastructure to run + tests on versions of Python dependencies in Debian Jessie and Stretch. - * FIXES #18237 https://bugs.torproject.org/18237 - During descriptor parsing, BridgeDB saves copies of descriptor files - which couldn't be parsed, for later debugging purposes. To avoid - filing up the runtime directory with these files, we now delete files - older than 24 hours, every 24 hours. Changes in version 0.3.4 - 0.3.5 - 2015-11-30

1 0

[bridgedb/master] Merge branch 'fix/18237' into develop
by isis＠torproject.org 28 Jul '16

28 Jul '16

commit c5dd5cbeff223295e36f9b8d4e4f349893b821ff Merge: 6164c62 743917a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 30 16:10:23 2016 +0000 Merge branch 'fix/18237' into develop CHANGELOG | 8 ++++++++ bridgedb.conf | 2 ++ bridgedb/Main.py | 12 ++++++++++++ bridgedb/runner.py | 29 +++++++++++++++++++++++++++++ bridgedb/util.py | 21 +++++++++++++++++++++ test/test_util.py | 31 +++++++++++++++++++++++++++++++ 6 files changed, 103 insertions(+) diff --cc test/test_util.py index f7a2245,848ce12..ea5d9ee --- a/test/test_util.py +++ b/test/test_util.py @@@ -71,8 -72,38 +72,38 @@@ class MiscLoggingUtilTests(unittest.Tes util.logging.info("BridgeDB's email address: bridges(a)torproject.org") + class FileUtilityTests(unittest.TestCase): + """Unittests for `bridgedb.util.deleteFilesOlderThan`.""" + + def setUp(self): + self._directory = self.id() + self.newfile = os.sep.join([self._directory, "newfile"]) + self.oldfile = os.sep.join([self._directory, "oldfile"]) + self.testfiles = [self.newfile, self.oldfile] + os.mkdir(self._directory) + + now = time.time() + + for fn in self.testfiles: + with open(fn, "w") as fd: + fd.flush() + + # Change the mtime of the "oldfile" to be two days old: + os.utime(self.oldfile, (now, now - (48 * 60 * 60))) + + def test_deleteFilesOlderThan_deletes_old_files(self): + """The function should delete appropriate files.""" + deleted = util.deleteFilesOlderThan(self.testfiles ,24 * 60 * 60) + self.assertIn(self.oldfile, deleted) + + def test_deleteFilesOlderThan_keeps_new_files(self): + """The function should delete appropriate files.""" + deleted = util.deleteFilesOlderThan(self.testfiles ,24 * 60 * 60) + self.assertNotIn(self.newfile, deleted) + + class LevenshteinDistanceTests(unittest.TestCase): - """Unittests for `bridgedb.util.levenshteinDistance.""" + """Unittests for `bridgedb.util.levenshteinDistance`.""" def test_levenshteinDistance_blank_blank(self): """The Levenshtein Distance between '' and '' should be 0."""

1 0