- tor-commits - lists.torproject.org

[flashproxy/master] Add instructions for making a Mac bundle.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit aa0cb4b62c1ecb3f0e14f5a10a2000560db2ddba Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:34:44 2012 -0800 Add instructions for making a Mac bundle. --- doc/bundle-macosx.txt | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt new file mode 100644 index 0000000..fc47b51 --- /dev/null +++ b/doc/bundle-macosx.txt @@ -0,0 +1,91 @@ +This document describes how to build a Tor Browser bundle for Mac OS X +that is preconfigured to use the flash proxy transport. Because Mac have +Python preinstalled, we include the Python source of the programs. An +exception to this is the M2Crypto library, which has some compiled +components. + +== Dependencies + +=== SWIG + +This is a prerequisite for building M2Crypto. + +http://www.swig.org/download.html +http://downloads.sourceforge.net/project/swig/swig/swig-2.0.8/swig-2.0.8.tar.gz + +The sha256sum (shasum -a 256) of the package I used was + +aeeefa20bbe1c03bacf23f0af9e7d6193e8b807b7585470615b71b1ee0c8ca4f swig-2.0.8.tar.gz + +SWIG requires PCRE, but is capable of building PCRE by itself if you +download the source first. Save the PCRE tarball inside the extracted +SWIG directory. + +http://www.pcre.org +http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2 +http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2.sig + + $ rm pcre-8.32.tar.bz2.sig # The next command won't run with this file present. + $ ./Tools/pcre-build.sh + $ ./configure --prefix=~/bundle/usr + $ make + $ make install + +=== M2Crypto + +http://chandlerproject.org/Projects/MeTooCrypto#Downloads +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc + +$ python setup.py build_ext --swig ~/bundle/usr/bin/swig +$ mkdir -p ~/usr/lib/python2.7/site-packages/ +$ python setup.py install --root ~/bundle --prefix=/usr + +== Browser bundle + +Download the 32-bit obfsproxy bundle from +https://www.torproject.org/projects/obfsproxy. + +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip.asc + +Extract the bundle. + + $ tar xzvf TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip + $ cd TorBrowser_en-US.app + +Copy files into the bundle. + + $ cp ~/flashproxy/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS + $ cp -R ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS + $ cp ~/flashproxy/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS + $ mkdir -p Contents/Resources/Docs/FlashProxy + $ cp ~/flashproxy/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy + +Make the second half of Data/Tor/torrc look like this (i.e., keep +the generic configuration, but change the obfsproxy-specific stuff). +Basically you are concatenating the normal flashproxy-client torrc, but +changing "./flashproxy-client" to "flashproxy-client". + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 + +Re-zip the bundle. The "alpha" number should be independent of the +obfsproxy bundle's alpha. + + $ cd .. + $ rm -f TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip + $ zip -r -9 TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip TorBrowser_en-US.app/ + +Test running the bundle. Extract into a separate directory, double-click +the icon to unzip, and run TorBrowser_en-US.app. + + $ mkdir tmp + $ cp TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip tmp

1 0

[flashproxy/master] Dedent torrc snippet for easier copy-paste.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 551a01a46eaac25d9e314c605c9db9df6a8b8c9c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:30:40 2012 -0800 Dedent torrc snippet for easier copy-paste. --- doc/windows-deployment-howto.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 8edb7bc..f3f8852 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -173,15 +173,15 @@ the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but changing "./flashproxy-client" to "flashproxy-client". - UseBridges 1 - # The address and port are ignored by the client transport plugin. - Bridge websocket 0.0.1.0:1 - LearnCircuitBuildTimeout 0 - CircuitBuildTimeout 60 - # Change the second number here (9000) to the number of a port that can - # receive connections from the Internet (the port for which you - # configured port forwarding). - ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha.

1 0

[flashproxy/master] Have a proxy open two connections to the client.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit b634d197fd7c2076d299850ca4e100116df59e21 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:12:30 2012 -0800 Have a proxy open two connections to the client. I hope this is a stopgap measure until we can figure out https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html. What's going wrong is that each time you register, you have some probability of success (close to 1). Requiring a second connection squares (lowers) this success probability, not to mention it's slower because flashproxy-reg-email can take up to a minute to serve you after you register. --- proxy/flashproxy.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index b18e9b5..a4b8f54 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -532,6 +532,10 @@ function FlashProxy() { }; this.begin_proxy = function(client_addr, relay_addr) { + /* Start two proxy connections because of some versions of Tor making + two pt connections: + https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html */ + this.make_proxy_pair(client_addr, relay_addr); this.make_proxy_pair(client_addr, relay_addr); };

1 0

[flashproxy/master] Factor out a begin_proxy function to wrap make_proxy_pair.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 2ccd84f9f079cd00aa523d7f5b4cb0e5211a5b26 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:06:27 2012 -0800 Factor out a begin_proxy function to wrap make_proxy_pair. --- proxy/flashproxy.js | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 13a77f5..b18e9b5 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -450,7 +450,7 @@ function FlashProxy() { return; } if (client_addr !== undefined && relay_addr !== undefined) { - this.make_proxy_pair(client_addr, relay_addr); + this.begin_proxy(client_addr, relay_addr); } else if (client_addr !== undefined) { puts("Error: the \"client\" parameter requires \"relay\" also.") this.die(); @@ -528,6 +528,10 @@ function FlashProxy() { puts("Facilitator: got client:" + repr(client_addr) + " " + "relay:" + repr(relay_addr) + "."); + this.begin_proxy(client_addr, relay_addr); + }; + + this.begin_proxy = function(client_addr, relay_addr) { this.make_proxy_pair(client_addr, relay_addr); };

1 0

[flashproxy/master] Hand out each client registration 5 times.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit fa79cd494d55221055cd795f76fe0cfc164b8f7a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:46:10 2012 -0800 Hand out each client registration 5 times. This is not an implementation of #5426, in at least two ways: 1. The same proxy may get the same client twice (unlikely with current proxy volume). 2. The registration's count doesn't go down when one of its proxies disappears. Doing this is however a step towards #5426. --- facilitator/facilitator | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 26e449d..af2c04c 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -21,6 +21,8 @@ CLIENT_TIMEOUT = 1.0 # Buffer no more than this many bytes when trying to read a line. READLINE_MAX_LENGTH = 10240 +MAX_PROXIES_PER_CLIENT = 5 + LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): @@ -97,34 +99,41 @@ class Reg(object): class RegSet(object): def __init__(self): - self.set = [] + self.tiers = [[] for i in range(MAX_PROXIES_PER_CLIENT)] self.cv = threading.Condition() def add(self, reg): self.cv.acquire() try: - if reg not in list(self.set): - self.set.append(reg) + for tier in self.tiers: + if reg in tier: + break + else: + self.tiers[0].append(reg) self.cv.notify() return True - else: - return False + return False finally: self.cv.release() def fetch(self): self.cv.acquire() try: - if not self.set: - return None - return self.set.pop(0) + for i in range(len(self.tiers)): + tier = self.tiers[i] + if tier: + reg = tier.pop(0) + if i + 1 < len(self.tiers): + self.tiers[i+1].append(reg) + return reg + return None finally: self.cv.release() def __len__(self): self.cv.acquire() try: - return len(self.set) + return sum(len(tier) for tier in self.tiers) finally: self.cv.release()

1 0

[flashproxy/master] Don't re-register if we already have unlinked remotes.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit ad673b7d864054d9d483d5905daab41e3f0687dc Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:55:13 2012 -0800 Don't re-register if we already have unlinked remotes. --- flashproxy-client | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 0aa51d4..3ce327e 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -720,7 +720,8 @@ def registration_thread_func(): register_condvar.acquire() register_condvar.wait() register_condvar.release() - register_one() + if not unlinked_remotes: + register_one() def proxy_chunk_local_to_remote(local, remote, data = None): if data is None:

1 0

[metrics-web/master] Correct order of addresses in same /24 or /48.
by karsten＠torproject.org 12 Dec '12

12 Dec '12

commit 7089f048fafc55a37b0fca3bac4e4016d9fbdbc5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 12 08:15:03 2012 +0100 Correct order of addresses in same /24 or /48. --- db/exonerator.sql | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/db/exonerator.sql b/db/exonerator.sql index 6851e91..fd58531 100755 --- a/db/exonerator.sql +++ b/db/exonerator.sql @@ -325,19 +325,22 @@ $$ LANGUAGE SQL; CREATE OR REPLACE FUNCTION search_addresses_in_same_24 ( select_address24 CHARACTER(6), select_date DATE) - RETURNS TABLE(address TEXT) AS $$ - SELECT HOST(oraddress) + RETURNS TABLE(addresstext TEXT, + addressinet INET) AS $$ + SELECT HOST(oraddress), + oraddress FROM statusentry WHERE oraddress24 = $1 AND DATE(validafter) >= $2 - 1 AND DATE(validafter) <= $2 + 1 UNION - SELECT HOST(exitaddress) + SELECT HOST(exitaddress), + exitaddress FROM exitlistentry WHERE exitaddress24 = $1 AND DATE(scanned) >= $2 - 2 AND DATE(scanned) <= $2 + 1 - ORDER BY 1; + ORDER BY 2; $$ LANGUAGE SQL; -- Look up all IPv6 OR addresses in the /48 network of a given address to @@ -345,12 +348,14 @@ $$ LANGUAGE SQL; CREATE OR REPLACE FUNCTION search_addresses_in_same_48 ( select_address48 CHARACTER(12), select_date DATE) - RETURNS TABLE(address TEXT) AS $$ - SELECT HOST(oraddress) + RETURNS TABLE(addresstext TEXT, + addressinet INET) AS $$ + SELECT HOST(oraddress), + oraddress FROM statusentry WHERE oraddress48 = $1 AND DATE(validafter) >= $2 - 1 AND DATE(validafter) <= $2 + 1 - ORDER BY 1; + ORDER BY 2; $$ LANGUAGE SQL;

1 0

[metrics-web/master] Stop recommending unmaintained Java and Python ExoneraTor.
by karsten＠torproject.org 12 Dec '12

12 Dec '12

commit 61fdc161bfc507338e02d63d4a85d56f580c1ecf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 12 08:20:43 2012 +0100 Stop recommending unmaintained Java and Python ExoneraTor. --- .../torproject/ernie/web/ExoneraTorServlet.java | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index 687cf37..3f9746e 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -133,12 +133,8 @@ public class ExoneraTorServlet extends HttpServlet { + " Notice: Note that the " + "information you are providing below may be visible to " + "anyone who can read the network traffic between you and " - + "this web server or who has access to this web server. For " - + "greater confidentiality of the IP addresses and incident " - + "times, you should download the " - + "<a href=\"tools.html#exonerator\">Java or Python version of " - + "ExoneraTor</a> and run it on your local " - + "machine.\n" + + "this web server or who has access to this web " + + "server.\n" + " \n"); }

1 0

[flashproxy/master] Add instructions for making a Windows browser bundle.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit d6128244beee2bed836b9f7f81c9abc9cb1ffe3d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 11 20:35:03 2012 -0800 Add instructions for making a Windows browser bundle. --- doc/windows-deployment-howto.txt | 62 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 2514a1a..8edb7bc 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -132,3 +132,65 @@ Build the package. $ python setup.py bdist_wininst This will leave an MSI installer in the dist directory. Double-click it to install M2Crypto amid the other Python files. + +=== 7-Zip + +This is used to build a self-extracting bundle executable. The p7zip +package from Cywin doesn't work because the self-extracting executables +it produces requrie cygwin1.dll. + +http://7-zip.org/download.html +http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi + +The sha256sum of the package I used was + +fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi + +== Browser bundle + +Download the obfsproxy bundle from +https://www.torproject.org/projects/obfsproxy. + +https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe +https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc + +Extract the bundle. + + $ gpg --verify tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe + $ cd "Tor Browser" + +Copy files into the bundle. We could remove obfsproxy here but don't. +The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll +from being overwritten. + + $ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ mkdir -p Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy + +Make the second half of Data/Tor/torrc look like this (i.e., keep +the generic configuration, but change the obfsproxy-specific stuff). +Basically you are concatenating the normal flashproxy-client torrc, but +changing "./flashproxy-client" to "flashproxy-client". + + UseBridges 1 + # The address and port are ignored by the client transport plugin. + Bridge websocket 0.0.1.0:1 + LearnCircuitBuildTimeout 0 + CircuitBuildTimeout 60 + # Change the second number here (9000) to the number of a port that can + # receive connections from the Internet (the port for which you + # configured port forwarding). + ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 + +Re-zip the bundle. The "alpha" number should be independent of the +obfsproxy bundle's alpha. + + $ cd .. + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" a -sfx tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe "Tor Browser" + +Test running the bundle. Extract into a separate directory, double-click +the icon and "Start Tor Browser.exe". + + $ mkdir tmp + $ cp tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe tmp

1 0

[flashproxy/master] Add explicit local and remote addr specs to torrc.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 66fa0e03594b7e587523c3b9dc7f110af4af5f26 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 11 19:10:41 2012 -0800 Add explicit local and remote addr specs to torrc. This makes it more obvious what you have to change in order to use your specific listening port. --- torrc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/torrc b/torrc index c5e40d2..e047cd0 100644 --- a/torrc +++ b/torrc @@ -2,9 +2,12 @@ ## Usage: ## tor -f torrc -ClientTransportPlugin websocket exec ./flashproxy-client --register UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec ./flashproxy-client --register :0 :9000

1 0