October 2012 - tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 08 Oct '12

08 Oct '12

commit 9a21a471e728b411f0fda7e8522a76204f9cda8d Merge: 6f2a09b ddb8796 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 8 10:03:19 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 10 ++++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 9 files changed, 43 insertions(+), 15 deletions(-)

1 0

[torbrowser/master] bump changelogs for 2.2.39-2
by erinn＠torproject.org 08 Oct '12

08 Oct '12

commit ddb8796f7364286d1ec2626a0b2dec95b8c1f875 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 8 10:03:04 2012 +0100 bump changelogs for 2.2.39-2 --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 10 ++++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 9 files changed, 43 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index cd4e9b6..ff86a60 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index b317861..8cd51e8 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bf3ee84..bfb0d00 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..7e9a20f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..f08b50c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..a871270 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index aee61e2..c71b960 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.39-2); suite=linux + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + * Update libpng to 1.5.13 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:32 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=linux * Update Tor to 0.2.2.39 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index a778ee7..11d2fee 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.39-2); suite=osx + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:30 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=osx * Update Tor to 0.2.2.39 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index b431172..ba22fd9 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.39-2); suite=windows + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:35 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=windows * Update Tor to 0.2.2.39

1 0

[torbrowser/maint-2.2] bump changelogs for 2.2.39-2
by erinn＠torproject.org 08 Oct '12

08 Oct '12

commit ddb8796f7364286d1ec2626a0b2dec95b8c1f875 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 8 10:03:04 2012 +0100 bump changelogs for 2.2.39-2 --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 10 ++++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 9 files changed, 43 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index cd4e9b6..ff86a60 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index b317861..8cd51e8 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bf3ee84..bfb0d00 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.7esr - \_ Torbutton 1.4.6 - |_ NoScript 2.5.4 - |_ HTTPS-Everywhere 2.2.1 +Firefox 10.0.8esr + \_ Torbutton 1.4.6.1 + |_ NoScript 2.5.6 + |_ HTTPS-Everywhere 2.2.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..7e9a20f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..f08b50c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..a871270 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index aee61e2..c71b960 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.39-2); suite=linux + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + * Update libpng to 1.5.13 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:32 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=linux * Update Tor to 0.2.2.39 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index a778ee7..11d2fee 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.39-2); suite=osx + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:30 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=osx * Update Tor to 0.2.2.39 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index b431172..ba22fd9 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.39-2); suite=windows + + * Update Firefox to 10.0.8esr + * Update Torbutton to 1.4.6.1 + * Update NoScript to 2.5.6 + * Update HTTPS Everywhere to 2.2.2 + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 8 09:54:35 BST 2012 + Tor Browser Bundle (2.2.39-1); suite=windows * Update Tor to 0.2.2.39

1 0

[ooni-probe/master] Parametrize lookup timeout in dnstamper.
by art＠torproject.org 08 Oct '12

08 Oct '12

commit c12bc4d89ef16d78e2cf2ef22363802ec90022ae Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Oct 8 07:46:53 2012 +0000 Parametrize lookup timeout in dnstamper. --- nettests/core/dnstamper.py | 23 +++++++++++++++-------- ooni/runner.py | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/nettests/core/dnstamper.py b/nettests/core/dnstamper.py index a736948..0f40c1c 100644 --- a/nettests/core/dnstamper.py +++ b/nettests/core/dnstamper.py @@ -28,6 +28,9 @@ class DNSTamperTest(nettest.TestCase): description = "DNS censorship detection test" version = '0.2' + + lookupTimeout = [1] + requirements = None inputFile = ['file', 'f', None, 'Input file of list of hostnames to attempt to resolve'] @@ -126,10 +129,6 @@ class DNSTamperTest(nettest.TestCase): self.report['test_lookups'][resolver] = None self.test_a_lookups[resolver] = None - def createResolver(self, servers): - print "Creating resolver %s" % servers - return client.createResolver(servers=servers, resolvconf='') - def test_lookup(self): print "Doing the test lookups on %s" % self.input list_of_ds = [] @@ -138,7 +137,7 @@ class DNSTamperTest(nettest.TestCase): resolver = [(self.localOptions['controlresolver'], 53)] res = client.createResolver(servers=resolver, resolvconf='') - control_r = res.lookupAddress(hostname, timeout=[1]) + control_r = res.lookupAddress(hostname, timeout=self.lookupTimeout) control_r.addCallback(self.process_a_answers, 'control') control_r.addErrback(self.a_lookup_error, 'control') @@ -148,7 +147,7 @@ class DNSTamperTest(nettest.TestCase): res = client.createResolver(servers=resolver, resolvconf='') #res = self.createResolver(servers=resolver) - d = res.lookupAddress(hostname, timeout=[1]) + d = res.lookupAddress(hostname, timeout=self.lookupTimeout) d.addCallback(self.process_a_answers, test_resolver) d.addErrback(self.a_lookup_error, test_resolver) list_of_ds.append(d) @@ -161,7 +160,7 @@ class DNSTamperTest(nettest.TestCase): def reverse_lookup(self, address, resolver): ptr = '.'.join(address.split('.')[::-1]) + '.in-addr.arpa' - r = resolver.lookupPointer(ptr) + r = resolver.lookupPointer(ptr, self.lookupTimeout) return r def do_reverse_lookups(self, result): @@ -171,7 +170,8 @@ class DNSTamperTest(nettest.TestCase): resolver = [(self.localOptions['controlresolver'], 53)] res = self.createResolver(servers=resolver) - test_reverse = self.reverse_lookup(self.control_a_lookups[0], res) + test_reverse = self.reverse_lookup(self.control_a_lookups[0], res, + timeout=self.lookupTimeout) test_reverse.addCallback(self.process_ptr_answers, 'control') test_reverse.addErrback(self.ptr_lookup_error, 'control') @@ -198,6 +198,7 @@ class DNSTamperTest(nettest.TestCase): for test, test_a_lookups in self.test_a_lookups.items(): print "Now doing %s | %s" % (test, test_a_lookups) if not test_a_lookups: + self.report['tampering'][test] = 'unknown' continue if set(test_a_lookups) & set(self.control_a_lookups): @@ -213,3 +214,9 @@ class DNSTamperTest(nettest.TestCase): # which does not match the expected domainname self.report['tampering'][test] = True + if len(self.test_a_lookups) == len(self.test_resolvers): + self.end() + else: + print "Still missing %s - %s" % (len(self.test_a_lookups), + len(self.test_resolvers)) + diff --git a/ooni/runner.py b/ooni/runner.py index bb63428..7f1c13e 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -220,7 +220,7 @@ class ORunner(object): result.done() def run(self): - log.start() + #log.start() self.reporterFactory.options = self.options

1 0

[ooni-probe/master] Update install.rst instructions
by art＠torproject.org 08 Oct '12

08 Oct '12

commit 0b13fabfa4c6279a21fc489df2da37273a9cff5c Author: aagbsn <aagbsn(a)torproject.org> Date: Sun Oct 7 12:29:44 2012 -0700 Update install.rst instructions Adds instructions for building Twisted Adds instructions for installing txtorcon and its dependencies Adds instructions for using python-virtualenv and virtualenvwrapper Adds additional debian package dependencies BeautifulSoup is now considered a required dependency, and must be built from source. --- docs/source/install.rst | 79 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 76 insertions(+), 3 deletions(-) diff --git a/docs/source/install.rst b/docs/source/install.rst index a2352d0..4651064 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -10,15 +10,89 @@ Dependencies OONI depends on the following pieces of software. -* Twisted: http://twistedmatrix.com/trac/ +* Twisted (>12.0.0): http://twistedmatrix.com/trac/ * PyYAML: http://pyyaml.org/ * Scapy: http://www.secdev.org/projects/scapy/ * pypcap: http://code.google.com/p/pypcap/ * libdnet: http://code.google.com/p/libdnet/ +* BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ *Optional* -* BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ +* Dnspython[1]: http://www.dnspython.org/ +* Paramiko[2]: http://www.lag.net/paramiko/ +* Txtorcon: https://github.com/meejah/txtorcon + +[1][2] These dependencies will soon be removed completely. + +Debian packages +--------------- + +On debian you can install most of the dependecies with apt-get with this command:: + + apt-get install python-yaml python-scapy python-beautifulsoup python-pypcap python-dumbnet python-dnspython + +Note that debian (squeeze) distributes version 10.1.0 of python-twisted, +and ubuntu (precise) distributes version 11.1.0. +You need the following packages for twisted to compile:: + + apt-get install python-dev build-essential + +Txtorcon has the following addtitional dependencies:: + + apt-get install python-geoip python-ipaddr python-psutil + +Python virtual environmentsa (virtualenv) +----------------------------------------- + +You may prefer to install these dependencies within a python virtualenv[3]:: + + sudo apt-get install python-virtualenv virtualenvwrapper + +From the docs (/usr/share/doc/virtualenvwrapper/README.Debian): + + Virtualenvwrapper is enabled if you install the package bash-completion and + enable bash completion support in /etc/bash.bashrc or your ~/.bashrc. + + If you only want to use virtualenvwrapper you may just add + source /etc/bash_completion.d/virtualenvwrapper to your ~/.bashrc. + +Source the script or login again and set up a virtualenv:: + + mkdir $HOME/.virtualenvs + mkvirtualenv ooni-probe + +You will automatically enter the environment. easy_install and pip will install +packages inside this environment, and will not require root privileges. +[3] http://www.virtualenv.org + +Manual installation of python dependencies +------------------------------------------- + +This involves installing the dependencies installable via easy_install/pip and +the ones that are not by building them from source. + +"simple" dependencies via easy_install:: + + sudo easy_install pyyaml + sudo easy_install twisted + sudo easy_install beautifulsoup + sudo easy_install pygeoip + sudo easy_install six + sudo easy_install ipaddr + sudo easy_install psutil + sudo easy_install txtorcon + +"simple" dependencies via pip:: + + sudo pip install pyyaml + sudo pip install twisted + sudo pip install beautifulsoup + sudo pip install pygeoip + sudo pip install six + sudo pip install ipaddr + sudo pip install psutil + sudo pip install txtorcon Manual installation of scapy ---------------------------- @@ -52,4 +126,3 @@ scapy:: cd scapy-2.2.0/ sudo python setup.py install cd ../ && rm -rf scapy-* -

1 0

[ooni-probe/master] Point INSTALL at docs/source/install.rst
by art＠torproject.org 08 Oct '12

08 Oct '12

commit 9b0dc650f23c8fbb3c9c66ae0d2a05557a859063 Author: aagbsn <aagbsn(a)torproject.org> Date: Sun Oct 7 12:50:15 2012 -0700 Point INSTALL at docs/source/install.rst --- INSTALL | 67 +-------------------------------------------------------------- 1 files changed, 1 insertions(+), 66 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index d972d26..0000000 --- a/INSTALL +++ /dev/null @@ -1,66 +0,0 @@ -# Dependencies -* Twisted (>12.0.0): http://twistedmatrix.com/trac/ -* PyYAML: http://pyyaml.org/ -* Scapy: http://www.secdev.org/projects/scapy/ - * pypcap: http://code.google.com/p/pypcap/ - * libdnet: http://code.google.com/p/libdnet/ - -Optional: -* BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ -* Dnspython[1]: http://www.dnspython.org/ -* Paramiko[2]: http://www.lag.net/paramiko/ - -[1][2] These dependencies will soon be removed completely. - -# Installation - -On debian you can install all the dependecies with apt-get with this command: - - apt-get install python-twisted python-twisted-names python-yaml python-scapy python-beautifulsoup - -## The "hard" way - -This involves installing the dependencies installable via easy_install/pip and -the ones that are not by building them from source. - -"simple" dependencies via easy_install: - - sudo easy_install pyyaml - sudo easy_install twisted - sudo easy_install beautifulsoup - -"simple" dependencies via pip: - - sudo pip install pyyaml - sudo pip install twisted - sudo pip install beautifulsoup - - - -libdnet: - - wget http://libdnet.googlecode.com/files/libdnet-1.12.tgz - tar xzf libdnet-1.12.tgz - cd libdnet-1.12 - ./configure && make - cd python/ - sudo python setup.py install - cd ../../ && rm -rf libdnet-1.12* - -pypcap: - - svn checkout http://pypcap.googlecode.com/svn/trunk/ pypcap-read-only - cd pypcap-read-only/ - sudo pip install pyrex - make - sudo python setup.py install - cd ../ && rm -rf pypcap-read-only - -scapy: - - wget http://www.secdev.org/projects/scapy/files/scapy-latest.zip - unzip scapy-latest.zip - cd scapy-2.2.0/ - sudo python setup.py install - cd ../ && rm -rf scapy-* - diff --git a/INSTALL b/INSTALL new file mode 120000 index 0000000..5c72744 --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +docs/source/install.rst \ No newline at end of file

1 0

[ooni-probe/master] Merge branch 'master' of github.com:hellais/ooni-probe
by art＠torproject.org 08 Oct '12

08 Oct '12

commit a516d0caafbcd7e043ce92d34c4618ad6e0ea531 Merge: 223ad4d 03af673 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Oct 8 07:07:25 2012 +0000 Merge branch 'master' of github.com:hellais/ooni-probe INSTALL | 67 +--------------------------------------- docs/source/install.rst | 79 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 69 deletions(-)

1 0

[ooni-probe/master] Merge pull request #4 from aagbsn/update_install_docs
by art＠torproject.org 08 Oct '12

08 Oct '12

commit 03af673be70054d6d79ec0f573537bae1f57f355 Merge: b76c294 9b0dc65 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun Oct 7 23:53:26 2012 -0700 Merge pull request #4 from aagbsn/update_install_docs Update install docs INSTALL | 67 +--------------------------------------- docs/source/install.rst | 79 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 69 deletions(-)

1 0

[ooni-probe/master] Forgot some printf debugging lines.. oops.
by art＠torproject.org 08 Oct '12

08 Oct '12

commit 223ad4ded4dc5bb6c35507b4e6af944412e0e16f Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Oct 8 07:05:59 2012 +0000 Forgot some printf debugging lines.. oops. --- nettests/core/dnstamper.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/nettests/core/dnstamper.py b/nettests/core/dnstamper.py index d84c408..a736948 100644 --- a/nettests/core/dnstamper.py +++ b/nettests/core/dnstamper.py @@ -201,17 +201,14 @@ class DNSTamperTest(nettest.TestCase): continue if set(test_a_lookups) & set(self.control_a_lookups): - print "IN here t0" # Address has not tampered with on DNS server self.report['tampering'][test] = False elif self.control_reverse and set([self.control_reverse]) & set([self.report['test_reverse'][test]]): - print "Noboar" # Further testing has eliminated false positives self.report['tampering'][test] = 'reverse-match' else: - print "FOOBAR!" # Reverse DNS on the results returned by returned # which does not match the expected domainname self.report['tampering'][test] = True

1 0

[ooni-probe/master] Final touches to DNSTamper.
by art＠torproject.org 08 Oct '12

08 Oct '12

commit b76c294b7b10e17d74a888584285b84ef6b0cd07 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Oct 8 06:49:09 2012 +0000 Final touches to DNSTamper. * Should now be ready for use --- nettests/core/dnstamper.py | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/nettests/core/dnstamper.py b/nettests/core/dnstamper.py index 58299da..d84c408 100644 --- a/nettests/core/dnstamper.py +++ b/nettests/core/dnstamper.py @@ -20,6 +20,7 @@ from ooni import nettest from ooni.utils import log from twisted.internet import defer from twisted.names import client +from twisted.names.error import DNSQueryRefusedError class DNSTamperTest(nettest.TestCase): @@ -50,6 +51,7 @@ class DNSTamperTest(nettest.TestCase): self.test_a_lookups = {} self.control_a_lookups = [] + self.control_reverse = None self.test_reverse = {} if not self.localOptions['testresolvers']: @@ -104,6 +106,7 @@ class DNSTamperTest(nettest.TestCase): def ptr_lookup_error(self, failure, resolver): #def ptr_lookup_error(self, *arg, **kw): print "There was an error in PTR lookup %s" % resolver + print failure if resolver == 'control': self.report['control_reverse'] = None else: @@ -111,10 +114,17 @@ class DNSTamperTest(nettest.TestCase): def a_lookup_error(self, failure, resolver): print "There was an error in A lookup %s" % resolver + + if failure.type is DNSQueryRefusedError: + self.report['tampering'][resolver] = 'connection-refused' + elif failure.type is defer.TimeoutError: + self.report['tampering'][resolver] = 'timeout' + if resolver == 'control': self.report['control_lookup'] = None else: self.report['test_lookups'][resolver] = None + self.test_a_lookups[resolver] = None def createResolver(self, servers): print "Creating resolver %s" % servers @@ -128,7 +138,7 @@ class DNSTamperTest(nettest.TestCase): resolver = [(self.localOptions['controlresolver'], 53)] res = client.createResolver(servers=resolver, resolvconf='') - control_r = res.lookupAddress(hostname) + control_r = res.lookupAddress(hostname, timeout=[1]) control_r.addCallback(self.process_a_answers, 'control') control_r.addErrback(self.a_lookup_error, 'control') @@ -138,7 +148,7 @@ class DNSTamperTest(nettest.TestCase): res = client.createResolver(servers=resolver, resolvconf='') #res = self.createResolver(servers=resolver) - d = res.lookupAddress(hostname) + d = res.lookupAddress(hostname, timeout=[1]) d.addCallback(self.process_a_answers, test_resolver) d.addErrback(self.a_lookup_error, test_resolver) list_of_ds.append(d) @@ -184,20 +194,24 @@ class DNSTamperTest(nettest.TestCase): def compare_results(self, *arg, **kw): print "Comparing results for %s" % self.input print self.test_a_lookups + for test, test_a_lookups in self.test_a_lookups.items(): - self.report['tampering'][test] = 'unknown' + print "Now doing %s | %s" % (test, test_a_lookups) if not test_a_lookups: - self.report['tampering'][test] = 'no-result' continue + if set(test_a_lookups) & set(self.control_a_lookups): + print "IN here t0" # Address has not tampered with on DNS server self.report['tampering'][test] = False - elif set([self.control_reverse]) & set([self.report['test_reverse'][test]]): + elif self.control_reverse and set([self.control_reverse]) & set([self.report['test_reverse'][test]]): + print "Noboar" # Further testing has eliminated false positives self.report['tampering'][test] = 'reverse-match' else: + print "FOOBAR!" # Reverse DNS on the results returned by returned # which does not match the expected domainname self.report['tampering'][test] = True

1 0