March 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Update Tor Mail build file with TorBirdy settings
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit f1e3464c75eb3c6456a5fcc755d206efbbfb29c1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:24:43 2015 +0530 Update Tor Mail build file with TorBirdy settings --- projects/tor-mail/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/tor-mail/build b/projects/tor-mail/build index c2b7498..f4de32f 100644 --- a/projects/tor-mail/build +++ b/projects/tor-mail/build @@ -17,17 +17,19 @@ mkdir bundle/Mail/defaults/profile/ mv user.js bundle/Mail/defaults/profile/ cd bundle/Mail/extensions -mkdir torbirdy -7z x -y -otorbirdy $rootdir/[% c('input_files_by_name/torbirdy') %] +mkdir castironthunderbirdclub(a)torproject.org +7z x -y -o castironthunderbirdclub(a)torproject.org $rootdir/[% c('input_files_by_name/torbirdy') %] mkdir tor-launcher(a)torproject.org -7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +7z x -y -o tor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data + [% IF c("var/windows") -%] 7z x ../../../[% c('input_files_by_name/tor-browser') %] mv \$_OUTDIR tor-browser_en-US [% ELSE -%] tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] + sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor

1 0

[tor-messenger-build/master] Add TorBirdy patch for Tor Mail bundle
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit bf82257246e4a8159ba6577ee3d7a602bc19d93b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:27:28 2015 +0530 Add TorBirdy patch for Tor Mail bundle --- projects/torbirdy/build | 1 + projects/torbirdy/config | 2 + projects/torbirdy/tormailbundle.patch | 74 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/projects/torbirdy/build b/projects/torbirdy/build index ea0756a..303de4b 100644 --- a/projects/torbirdy/build +++ b/projects/torbirdy/build @@ -2,6 +2,7 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] +patch -p1 < ../tormailbundle.patch make make-xpi cd .. mv -f torbirdy-[% c("version") %].xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/torbirdy/config b/projects/torbirdy/config index db8a70b..990f215 100644 --- a/projects/torbirdy/config +++ b/projects/torbirdy/config @@ -3,3 +3,5 @@ filename: 'torbirdy-[% c("version") %].xpi' version: 0.1.4 git_hash: 4cdded42ca5c6f900c893a8b3d27c50ce6854eac git_url: https://git.torproject.org/torbirdy.git +input_files: + - filename: tormailbundle.patch diff --git a/projects/torbirdy/tormailbundle.patch b/projects/torbirdy/tormailbundle.patch new file mode 100644 index 0000000..66aa96e --- /dev/null +++ b/projects/torbirdy/tormailbundle.patch @@ -0,0 +1,74 @@ +diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js +index 1359f63..d163e2f 100644 +--- a/chrome/content/preferences.js ++++ b/chrome/content/preferences.js +@@ -25,7 +25,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { + + pub.setDefaultPrefs = function() { + pub.prefs.setCharPref("network.proxy.socks", "127.0.0.1"); +- pub.prefs.setIntPref("network.proxy.socks_port", 9150); ++ pub.prefs.setIntPref("network.proxy.socks_port", 9154); + pub.prefs.clearUserPref("network.proxy.http"); + pub.prefs.clearUserPref("network.proxy.http_port"); + pub.prefs.clearUserPref("network.proxy.ssl"); +@@ -494,7 +494,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { + // Tor. + if (anonService === 0) { + pub.socksHost.value = '127.0.0.1'; +- pub.socksPort.value = '9150'; ++ pub.socksPort.value = '9154'; + } + + // JonDo/Whonix. +diff --git a/components/torbirdy.js b/components/torbirdy.js +index 5867f98..bc3ddf3 100644 +--- a/components/torbirdy.js ++++ b/components/torbirdy.js +@@ -43,7 +43,7 @@ const TorBirdyPrefs = { + + // Configure Thunderbird to use the SOCKS5 proxy. + "network.proxy.socks": "127.0.0.1", +- "network.proxy.socks_port": 9150, ++ "network.proxy.socks_port": 9154, + "network.proxy.socks_version": 5, + + // Set DNS proxying through SOCKS5. +@@ -340,7 +340,6 @@ function TorBirdy() { + this.setAccountPrefs(); + this.setPrefs(); + +- dump("TorBirdy registered!\n"); + } + + TorBirdy.prototype = { +@@ -357,7 +356,6 @@ TorBirdy.prototype = { + + onUninstalling: function(addon, needsRestart) { + if (addon.id == TB_ID) { +- dump("Nooo! TorBirdy uninstall requested\n"); + this._uninstall = true; + this.resetUserPrefs(); + } +@@ -365,7 +363,6 @@ TorBirdy.prototype = { + + onOperationCancelled: function(addon) { + if (addon.id == TB_ID) { +- dump("Uninstall requested cancelled. Yayay!\n"); + this._uninstall = false; + this.setPrefs(); + } +@@ -376,14 +373,12 @@ TorBirdy.prototype = { + }, + + resetUserPrefs: function() { +- dump("Resetting user preferences to default\n"); + // Clear the Thunderbird preferences we changed. + for (var each in TorBirdyPrefs) { + this.prefs.clearUserPref(each); + } + + // Restore the older proxy preferences that were set prior to TorBirdy's install. +- dump("Restoring proxy settings\n"); + for (var i = 0; i < TorBirdyOldPrefs.length; i++) { + var oldPref = TorBirdyOldPrefs[i]; + var setValue = kRestoreBranch + oldPref;

1 0

[tor-messenger-build/master] Update start-tor-mail script
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit 6f5fc867388cd714ada9b021c1c653a72551529a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:28:35 2015 +0530 Update start-tor-mail script - Add support for starting script in offline mode by setting TOR_SKIP_LAUNCH variable to skip Tor Launcher (and Tor) --- projects/tor-mail/start-tor-mail | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/projects/tor-mail/start-tor-mail b/projects/tor-mail/start-tor-mail index c563601..ff436e2 100644 --- a/projects/tor-mail/start-tor-mail +++ b/projects/tor-mail/start-tor-mail @@ -5,6 +5,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # +# To run in offline (skip Tor Launcher) mode, simply pass --offline # To run in debug mode simply pass --debug # # Copyright 2014 The Tor Project. See LICENSE for licensing information. @@ -119,15 +120,23 @@ if [ "`id -u`" -eq 0 ]; then fi debug=0 -usage_message="usage: $0 [--debug]" +usage_message="usage: $0 [--offline | --debug]" # !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below -if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then - debug=1 - shift # pop the debug argument - printf "\nDebug enabled.\n\n" -elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then - echo "$usage_message" - exit 0 +if [ "$#" -ge 1 ]; then + if [ "x$1" = "x--offline" -o "x$1" = "x-offline" ]; then + TOR_SKIP_LAUNCH=1 + export TOR_SKIP_LAUNCH + printf "\nOffline mode enabled. Tor will not be started.\n\n" + fi + if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then + debug=1 + shift # pop the debug argument + printf "\nDebug enabled.\n\n" + fi + if [ "x$1" = "x--help" -o "x$1" = "x-help" ]; then + echo "$usage_message" + exit 0 + fi fi # If the user hasn't requested 'debug mode', close whichever of stdout

1 0

[chutney/master] Create empty /net directory
by nickm＠torproject.org 23 Mar '15

23 Mar '15

commit ad272e692f8cc4003b0b72f5b6bc5cb994217f24 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 21 16:05:08 2015 +0100 Create empty /net directory This means setting CHUTNEY_PATH to the git checkout just works from inside Tor. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cd00869..271193a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *pyd *~ -/net +/net/[^.]* diff --git a/net/.empty b/net/.empty new file mode 100644 index 0000000..e69de29

1 0

[bridgedb/develop] Revert back to using Bridge.getID() in filterAssignBridgesToRing().
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 332ca3fb678bf47ec3fdb100ac6dea6081a37b6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:41:02 2015 +0000 Revert back to using Bridge.getID() in filterAssignBridgesToRing(). Bridge.getID() returns the Bridge's identity key digest in binary, and Bridge.fingerprint return the digest in hexadecimal. While this is not a bug, we should avoid randomly changing the encoding used to assign Bridges to hashrings, as it might result in e.g. a Bridge which was previously assigned to hashing 0 based on the binary digest getting a duplicate assignment in hashring 1 based on the hexadecimal-encoded digest. * REVERT change made in 6015cc35 to the encoding of Bridge identity key digest used for assigning a Bridge to a hashring. --- lib/bridgedb/Filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b7bac87..d96d3ec 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -18,7 +18,7 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): return funcs[ruleset] except KeyError: def _assignBridgesToRing(bridge): - digest = hmac(bridge.fingerprint) + digest = hmac(bridge.getID()) pos = long( digest[:8], 16 ) which = pos % numRings

1 0

[bridgedb/develop] Merge branch 'fix/14065-vanilla-ipv6' into develop
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 481d36868e8c1e5a430b82ccd1d17ecfb0ed0837 Merge: 332ca3f 0449560 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:52:38 2015 +0000 Merge branch 'fix/14065-vanilla-ipv6' into develop lib/bridgedb/bridgerequest.py | 4 ++-- lib/bridgedb/bridges.py | 4 +++- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-)

1 0

[bridgedb/develop] Revert change in addressClass check in filterBridgesByTransport().
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 3ef37df6ca94679ff3b76df6a713231d5e7b4f21 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 02:02:49 2015 +0000 Revert change in addressClass check in filterBridgesByTransport(). The `addressClass` passed to `filterBridgesByTransport()` is either `ipaddr.IPv4Address` or `ipaddr.IPv6Address`, not an instance of either. * REVERT a change to filterBridgesByTransport made in adb67e64. --- lib/bridgedb/Filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index d96d3ec..b857967 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -74,7 +74,7 @@ def filterBridgesByIP6(bridge): setattr(filterBridgesByIP6, "description", "ip=6") def filterBridgesByTransport(methodname, addressClass=None): - if not isinstance(addressClass, (IPv6Address, IPv4Address)): + if not ((addressClass is IPv4Address) or (addressClass is IPv6Address)): addressClass = IPv4Address ruleset = frozenset([methodname, addressClass])

1 0

[bridgedb/develop] Add test for vanilla IPv6 addresses in test_https.py.
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit c1a3d4692270b592a3a2efb7d5a14af357f6f91c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:14:57 2015 +0000 Add test for vanilla IPv6 addresses in test_https.py. --- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 6a40a67..92b07bf 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -216,6 +216,29 @@ class HTTPTests(unittest.TestCase): addr = bridge[0].rsplit(':', 1)[0] self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) + def test_get_vanilla_ipv6(self): + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) + + self.openBrowser() + self.goToOptionsPage() + + PT = '0' + soup = self.submitOptions(transport=PT, ipv6=True, + captchaResponse=CAPTCHA_RESPONSE) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge in bridges: + self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0].strip('[]') + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) + def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"): if not self.pid or not processExists(self.pid):

1 0

[bridgedb/develop] Log whether a Bridge is attempting to answer a request for IPv6 or IPv4.
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 0449560f737fb71fb2fafe8691f018dc9cc6d362 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:40:21 2015 +0000 Log whether a Bridge is attempting to answer a request for IPv6 or IPv4. --- lib/bridgedb/bridges.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index b791730..96f995e 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1038,7 +1038,9 @@ class Bridge(BridgeBackwardsCompatibility): return a :term:`Bridge Line` for the requested pluggable transport type. """ - logging.info("Bridge %s answering request for vanilla address..." % self) + logging.info( + "Bridge %s answering request for IPv%s vanilla address..." % + (self, "6" if bridgeRequest.addressClass is ipaddr.IPv6Address else "4")) if not bridgeRequest.filters: logging.debug(("Request %s didn't have any filters; "

1 0

[bridgedb/develop] Fix BridgeRequestBase.addressClass check.
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 8507fa30378e85e90b71b54de2bcb2f9537936f4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:32:04 2015 +0000 Fix BridgeRequestBase.addressClass check. * CHANGE `bridgedb.bridgerequest.BridgeRequestBase.__init__()` to check that the `addressClass` *is* either an `ipaddr.IPv4Address` or an `ipaddr.IPv6Address`, rather than checking if `addressClass` is an instance of one of those classes. * FIXES #14065: https://bugs.torproject.org/14065. --- lib/bridgedb/bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index d7b4d18..320074a 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -88,8 +88,8 @@ class BridgeRequestBase(object): def __init__(self, addressClass=None): self.addressClass = addressClass - if not isinstance(self.addressClass, - (ipaddr.IPv4Address, ipaddr.IPv6Address)): + if not ((self.addressClass is ipaddr.IPv4Address) or + (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address self.filters = list() self.transports = list()

1 0