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

[ooni-probe/master] Skip empty lines.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit f0dbba35fb09a2f4e9b0aba719db553f6247a7dd Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Mar 9 22:50:32 2014 +0100 Skip empty lines. --- ooni/nettest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 943aeba..e9cc43b 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -704,7 +704,10 @@ class NetTestCase(object): log.debug("Running default input processor") with open(filename) as f: for line in f: - yield line.strip() + l = line.strip() + if not l: + continue + yield l @property def inputFileSpecified(self):

1 0

[ooni-probe/master] Improve the output of the bridge reachability test
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 541d3da949a4152bcb7a600ea9efa943ab720a82 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 5 10:16:52 2014 +0100 Improve the output of the bridge reachability test --- ooni/nettests/blocking/bridge_reachability.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 65e968a..970e477 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -25,7 +25,9 @@ class BridgeReachability(nettest.NetTestCase): usageOptions = UsageOptions inputFile = ['file', 'f', None, - 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + 'File containing bridges to test reachability for. ' + 'They should be one per line IP:ORPort or ' + 'TransportType IP:ORPort (ex. obfs2 127.0.0.1:443)'] requiredOptions = ['file'] @@ -79,12 +81,12 @@ class BridgeReachability(nettest.NetTestCase): progress_updates=updates) @d.addCallback def setup_complete(proto): - log.msg("Success") + log.msg("Successfully connected to %s" % self.bridge) self.report['success'] = True @d.addErrback def setup_failed(failure): - log.msg("Failed") + log.msg("Failed to connect to %s" % self.bridge) log.exception(failure) self.report['success'] = False

1 0

[ooni-probe/master] Skip comment lines.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 106718a950a27ef0d98869e25d57c1e09e0f671b Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Mar 9 22:51:36 2014 +0100 Skip comment lines. --- ooni/nettest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ooni/nettest.py b/ooni/nettest.py index e9cc43b..235ad85 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -705,8 +705,12 @@ class NetTestCase(object): with open(filename) as f: for line in f: l = line.strip() + # Skip empty lines if not l: continue + # Skip comment lines + elif l.startswith('#'): + continue yield l @property

1 0

[ooni-probe/master] Update install script to use system tor.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 64361e316456e576282076e633c3beeb3125d629 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 02:02:38 2014 +0100 Update install script to use system tor. --- scripts/install_on_planetlab.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 1e63201..afa9022 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -1,4 +1,7 @@ #!/bin/sh +## You should also create a file from the directory where you run this script +## called torrc with inside the details of the torrc to use. + sudo yum -y groupinstall "Development tools" sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip cd `mktemp -d` @@ -60,6 +63,11 @@ cd tor-fix-fedora8 ./configure --disable-asciidoc --with-libevent-dir=/usr/local/lib/ make sudo make install +sudo mv /usr/bin/tor /usr/bin/tor.old +sudo ln -s /usr/local/bin/tor /usr/bin/tor +echo "SocksPort 9050" > /usr/local/etc/tor/torrc +cat torrc >> /usr/local/etc/tor/torrc +/etc/init.d/tor restart # Install libGeoIP wget -O master.zip https://github.com/maxmind/geoip-api-c/archive/master.zip @@ -81,3 +89,7 @@ sudo pip install https://github.com/hellais/pyopenssl/archive/fix/openssl0.9.8co # Install ooniprobe and obfsproxy sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip sudo pip install obfsproxy + +# Update the Tor running in ooniprobe +cat ~/.ooni/ooniprobe.conf | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf.new +mv ~/.ooni/ooniprobe.conf.new ~/.ooni/ooniprobe.conf

1 0

[ooni-probe/master] Increase the default timeout to 2 minutes
by art＠torproject.org 24 Mar '14

24 Mar '14

commit cb75aef207d08b2eea5668ab9485d001f9b9d2f7 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 01:06:50 2014 +0100 Increase the default timeout to 2 minutes --- ooni/nettests/blocking/bridge_reachability.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 8e15f44..7742629 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -13,7 +13,7 @@ from ooni.utils import log from ooni import nettest class UsageOptions(usage.Options): - optParameters = [['timeout', 't', 60, + optParameters = [['timeout', 't', 120, 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], ] @@ -89,7 +89,6 @@ class BridgeReachability(nettest.NetTestCase): @d.addErrback def setup_failed(failure): log.msg("Failed to connect to %s" % self.bridge) - log.exception(failure) self.report['success'] = False return d

1 0

[ooni-probe/master] Add script for automatically deploying ooniprobe on planetlab
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 2699b6b1631bc049f62d457503d25c2364021938 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 01:17:38 2014 +0100 Add script for automatically deploying ooniprobe on planetlab --- ooni/nettests/blocking/bridge_reachability.py | 2 +- scripts/install_on_planetlab.sh | 83 +++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 7742629..7c519ec 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -39,7 +39,7 @@ class BridgeReachability(nettest.NetTestCase): if self.input.startswith('Bridge'): self.bridge = self.input.replace('Bridge ', '') self.pyobfsproxy_bin = find_executable('obfsproxy') - + def test_full_tor_connection(self): def getTransport(address): """ diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh new file mode 100644 index 0000000..1e63201 --- /dev/null +++ b/scripts/install_on_planetlab.sh @@ -0,0 +1,83 @@ +#!/bin/sh +sudo yum -y groupinstall "Development tools" +sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip +cd `mktemp -d` + +# Install Python 2.7.6 +wget http://legacy.python.org/ftp//python/2.7.6/Python-2.7.6.tgz +tar xzf Python-2.7.6.tgz +cd Python-2.7.6 +./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" +make +sudo make altinstall +sudo ln -sf /usr/local/bin/python2.7 /usr/bin/python + +# Install the latest version of libtool +wget http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz +tar xzf libtool-2.4.2.tar.gz +cd libtool-2.4.2 +./configure +make +sudo make install +sudo mv /usr/bin/libtool /usr/bin/libtool.old +sudo ln -s /usr/local/bin/libtool /usr/bin/libtool + +# Install the latest version of autoconf +wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz +tar xzf autoconf-2.69.tar.gz +cd autoconf-2.69 +./configure +make +sudo make install +sudo mv /usr/bin/autoconf /usr/bin/autoconf.old +sudo ln -s /usr/local/bin/autoconf /usr/bin/autoconf + +# Install the latest version of automake +wget http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz +tar xzf automake-1.14.1.tar.gz +cd automake-1.14.1 +./configure +make +sudo make install +sudo mv /usr/bin/automake /usr/bin/automake.old +sudo ln -s /usr/local/bin/automake /usr/bin/automake + +# Install latest version of libevent +wget https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz +tar xvzf libevent-2.0.21-stable.tar.gz +cd libevent-2.0.21-stable +./autogen.sh +./configure +cp /usr/bin/libtool libtool +make +sudo make install + +# Install the latest version of Tor +wget -O tor.zip https://github.com/hellais/tor/archive/fix/fedora8.zip +unzip tor.zip +cd tor-fix-fedora8 +./autogen.sh +./configure --disable-asciidoc --with-libevent-dir=/usr/local/lib/ +make +sudo make install + +# Install libGeoIP +wget -O master.zip https://github.com/maxmind/geoip-api-c/archive/master.zip +unzip master.zip +cd geoip-api-c-master/ +./bootstrap +./configure +make +sudo make install + +# Install the latest version of pip +wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py +sudo python get-pip.py + +# Install the patched versions of cryptography and pyopenssl +sudo pip install https://github.com/hellais/cryptography/archive/fix/openssl0.9compat.zip +sudo pip install https://github.com/hellais/pyopenssl/archive/fix/openssl0.9.8compat.zip + +# Install ooniprobe and obfsproxy +sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip +sudo pip install obfsproxy

1 0

[ooni-probe/master] Also read files that contain "Bridge " as a prefix
by art＠torproject.org 24 Mar '14

24 Mar '14

commit c9301b8eda40401a2bb73350d20053b2bb87931a Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Mar 9 22:51:47 2014 +0100 Also read files that contain "Bridge " as a prefix --- ooni/nettests/blocking/bridge_reachability.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 970e477..8e15f44 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -18,7 +18,7 @@ class UsageOptions(usage.Options): ] class BridgeReachability(nettest.NetTestCase): - name = "BridgeReachability" + name = "Bridge Reachability" author = "Arturo Filastò" version = "0.1" @@ -36,6 +36,8 @@ class BridgeReachability(nettest.NetTestCase): self.timeout = int(self.localOptions['timeout']) self.report['timeout'] = self.timeout self.bridge = self.input + if self.input.startswith('Bridge'): + self.bridge = self.input.replace('Bridge ', '') self.pyobfsproxy_bin = find_executable('obfsproxy') def test_full_tor_connection(self):

1 0

[ooni-probe/master] Simplify dependencies
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 805549d31f10345ce51e16e7dcbf58c5a810ac7d Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 13:40:21 2014 +0100 Simplify dependencies --- requirements.txt | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index c84eb00..8cda752 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,11 @@ PyYAML>=3.10 Twisted>=12.2.0 -ipaddr-real>=2.1.10 +ipaddr>=2.1.10 pyOpenSSL>=0.13 geoip txtorcon>=0.7 txsocksx>=0.0.2 -Pyrex-real>=0.9.8.6 parsley>=1.1 dnspython>=1.10.0 - -# Taken from the versions required by twisted 13.0.0 (latest) -transaction>=1.1.1 -zope.component>=3.5 -zope.event>=3.5 -zope.interface>=3.6 - -# Get scapy 2.2 from pypi -# https://pypi.python.org/pypi/scapy-real/2.2.0-dev -scapy-real==2.2.0-dev +scapy>=2.2.0-dev +pypcap>=1.1

1 0

[ooni-probe/master] Fix installation script.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 52c27954ef09eb9d2290ef82cb254d6d6985cd8f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 12:30:23 2014 +0100 Fix installation script. --- scripts/install_on_planetlab.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index f4ac6df..88f0ae2 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -79,7 +79,7 @@ make sudo make install # Install the latest version of pip -wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py +wget -O get-pip.py --no-check-certificate https://raw.github.com/pypa/pip/master/contrib/get-pip.py sudo python get-pip.py # Install the patched versions of cryptography and pyopenssl @@ -89,6 +89,7 @@ sudo pip install https://github.com/hellais/pyopenssl/archive/fix/openssl0.9.8co # Install ooniprobe and obfsproxy sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip sudo pip install obfsproxy +ooniprobe # Update the Tor running in ooniprobe cat ~/.ooni/ooniprobe.conf | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf.new

1 0

[ooni-probe/master] argparse is not a dependency.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 2bc01239a351ad4b2e6e02a4e98bf56eb072f44f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 13:26:04 2014 +0100 argparse is not a dependency. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 85ec703..c84eb00 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ PyYAML>=3.10 Twisted>=12.2.0 -argparse>=1.2.1 ipaddr-real>=2.1.10 pyOpenSSL>=0.13 geoip

1 0