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

r26531: {website} add 2 new mirrors. (website/trunk/include)
by Andrew Lewman 12 Jan '14

12 Jan '14

Author: phobos Date: 2014-01-12 17:55:38 +0000 (Sun, 12 Jan 2014) New Revision: 26531 Modified: website/trunk/include/tor-mirrors.csv Log: add 2 new mirrors. Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-01-11 18:38:17 UTC (rev 26530) +++ website/trunk/include/tor-mirrors.csv 2014-01-12 17:55:38 UTC (rev 26531) @@ -75,3 +75,5 @@ tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Jan 8 16:41:17 2014 Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Wed Jan 8 16:41:17 2014 tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Wed Jan 8 16:41:17 2014 +maki(a)maki-chan.de,Maki Hoshisawa,DE,Germany,DE,TRUE,FALSE,NO,http://tor.mirrors.maki-chan.de/,,,,http://tor.mirrors.maki-chan.de/dist/,,,, +doemela[AT]cyberguerrilla[DOT]org,cYbergueRrilLa AnonyMous NeXus,DE,Germany,DE,TRUE,FALSE,NO,https://tor-mirror.cyberguerrilla.org,,,,…,

1 0

[ooni-probe/master] Add debian directory based on: http://anonscm.debian.org/gitweb/?p=collab-maint/ooni-probe.git
by art＠torproject.org 12 Jan '14

12 Jan '14

commit 9e3261d1232122aaf1f373c759e31953f9111993 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 11 17:50:39 2014 +0100 Add debian directory based on: http://anonscm.debian.org/gitweb/?p=collab-maint/ooni-probe.git --- debian/README | 5 +++++ debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 40 ++++++++++++++++++++++++++++++++++++++++ debian/copyright | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 4 ++++ debian/source/format | 1 + 7 files changed, 104 insertions(+) diff --git a/debian/README b/debian/README new file mode 100644 index 0000000..a816b35 --- /dev/null +++ b/debian/README @@ -0,0 +1,5 @@ +Debian package for ooni-probe +============================= + +The Debian package is currently missing the graphical user interface as it +needs several JavaScript libraries that are currently not available in Debian. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..416aee4 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +ooniprobe (1.0.0-rc5-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #XXXXXX) + + -- Jérémy Bobbio <lunar(a)debian.org> Fri, 3 Jan 2014 11:14:46 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..60f42cb --- /dev/null +++ b/debian/control @@ -0,0 +1,40 @@ +Source: ooniprobe +Maintainer: Open Observatory of Network Interference <ooni-dev(a)torproject.org> +Section: net +Priority: extra +Build-Depends: debhelper (>= 8), + python-all (>= 2.6.6-3~), + python-dnspython (>= 1.10.0), + python-docutils (>= 0.9.1), + python-geoip (>= 0.2.5), + python-ipaddr (>= 2.1.10), + python-openssl (>= 0.13), + python-pyrex, + python-scapy (>= 2.2), + python-setuptools, + python-twisted (>= 12.2.0), + python-txsocksx, + python-txtorcon (>= 0.7), + python-yaml (>= 3.10), + python-zope.interface (>= 3.6), +Standards-Version: 3.9.4 +X-Python-Version: >= 2.7 +Vcs-Git: git://anonscm.debian.org/git/collab-maint/ooni-probe.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ooni-probe.git +Homepage: https://ooni.torproject.org/ + +Package: ooniprobe +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, + tcpdump, + tor +Suggests: obfsproxy +Description: probe for the Open Observatory of Network Interference (OONI) + OONI, the Open Observatory of Network Interference, is a global observation + network which aims is to collect high quality data using open methodologies + and free software to share observations and data about the various types, + methods, and amounts of network tampering in the world. + . + ooniprobe is a program to probe a network and collect data for the OONI + project. It will test the current network for signs of surveillance and + censorship. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1b60570 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,48 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ooniprobe +Source: https://gitweb.torproject.org/ooni-probe.git + +Files: * +Copyright: 2012-2013 Jacob Appelbaum, Arturo Filastò, Isis Lovecruft, + Aaron Gibson +License: BSD-2-clause + +Files: data/nettests/experimental/tls_handshake.py +Copyright: 2013 Isis Lovecruft, The Tor Project Inc. +License: BSD-2-clause + +Files: ooni/utils/onion.py +Copyright: 2012 The Tor Project, Inc. +License: BSD-2-clause + +Files: debian/* +Copyright: 2013 Jerémy Bobbio <lunar(a)debian.org> +License: permissive + Copying and distribution of this package, with or without + modification, are permitted in any medium without royalty + provided the copyright notice and this notice are + preserved. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +This product includes GeoLite data created by MaxMind, available from +<a href="http://www.maxmind.com">http://www.maxmind.com</a>. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..579a1b1 --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ --buildsystem=python_distutils --with=python2 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)

1 0

[ooni-probe/master] Add line about the MaxMind GeoIP database to LICENSE
by art＠torproject.org 12 Jan '14

12 Jan '14

commit 5272883262d9e13b479ecbef5bb1c134823805c1 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 11 17:41:09 2014 +0100 Add line about the MaxMind GeoIP database to LICENSE --- LICENSE | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LICENSE b/LICENSE index 86cf173..43eb027 100644 --- a/LICENSE +++ b/LICENSE @@ -24,3 +24,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. + +This product includes GeoLite data created by MaxMind, available from +<a href="http://www.maxmind.com">http://www.maxmind.com</a>.

1 0

[ooni-probe/master] Add logo to README.
by art＠torproject.org 12 Jan '14

12 Jan '14

commit 98d969b77c18505472b9d1273b30c8c7a35936e6 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Sat Jan 11 17:27:55 2014 +0100 Add logo to README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f09ca1..deb1b6f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.org/TheTorProject/ooni-probe.png?branch=master)](… [![Coverage Status](https://coveralls.io/repos/TheTorProject/ooni-probe/badge.png)](https://coveralls.io/r/TheTorProject/ooni-probe) -# ooniprobe - Open Observatory of Network Interference +![OONI](https://ooni.torproject.org/theme/img/ooni-logo.png) "The Net interprets censorship as damage and routes around it." - John Gilmore; TIME magazine (6 December 1993)

1 0

[ooni-probe/master] Do not include the city data by default.
by art＠torproject.org 12 Jan '14

12 Jan '14

commit d5ad65bbc4b4ca1adfa296d435179a754aa220fe Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 10 17:17:58 2014 +0100 Do not include the city data by default. Closes #228 --- data/ooniprobe.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 412923a..6fa7caf 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -13,7 +13,7 @@ privacy: # Should we include the country as reported by GeoIP in the report? includecountry: true # Should we include the city as reported by GeoIP in the report? - includecity: true + includecity: false # Should we collect a full packet capture on the client? includepcap: false reports:

1 0

[ooni-probe/master] Add empty setup.cfg to make debuild happy.
by art＠torproject.org 12 Jan '14

12 Jan '14

commit 0ba21296c5c2a570ec3e0028bf2c58bc187593aa Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 11 18:02:36 2014 +0100 Add empty setup.cfg to make debuild happy. --- 0 files changed diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..e69de29

1 0

[ooni-probe/master] Add script for harvesting collector and test helper addresses
by art＠torproject.org 12 Jan '14

12 Jan '14

commit dd591db19187fe2684e13ccb92fd6bd0435c08b0 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 10 18:58:56 2014 +0100 Add script for harvesting collector and test helper addresses --- fabfile.py | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/fabfile.py b/fabfile.py index 119d669..f97f6df 100644 --- a/fabfile.py +++ b/fabfile.py @@ -4,9 +4,12 @@ # :license: see included LICENSE file import os import sys +import yaml import xmlrpclib +from StringIO import StringIO -from fabric.api import run, cd, sudo +from fabric.operations import get +from fabric.api import run, cd, sudo, env api_auth = {} # Set these values @@ -17,6 +20,12 @@ slice_name = "your_slice_name" ### Do not change this api_auth['AuthMethod'] = "password" +env.user = 'root' +def set_hosts(host_file): + with open(host_file) as f: + for host in f: + env.hosts.append(host) + def search_node(nfilter="*.cert.org.cn"): api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') if api_server.AuthCheck(api_auth): @@ -53,3 +62,39 @@ def deployooniprobe(distro="debian"): run("pip install https://hg.secdev.org/scapy/archive/tip.zip") run("pip install -r requirements.txt") +def generate_bouncer_file(install_directory='/data/oonib/', bouncer_file="bouncer.yaml"): + output = StringIO() + get(os.path.join(install_directory, 'oonib.conf'), output) + output.seek(0) + oonib_configuration = yaml.safe_load(output) + + output.truncate(0) + get(os.path.join(oonib_configuration['main']['tor_datadir'], 'collector', 'hostname'), + output) + output.seek(0) + collector_hidden_service = output.readlines()[0].strip() + + address = env.host + test_helpers = { + 'dns': address + ':' + str(oonib_configuration['helpers']['dns']['tcp_port']), + 'ssl': 'https://' + address, + 'traceroute': address, + } + if oonib_configuration['helpers']['tcp-echo']['port'] == 80: + test_helpers['tcp-echo'] = address + else: + test_helpers['http-return-json-headers'] = 'http://' + address + + bouncer_data = { + 'collector': + { + 'httpo://'+collector_hidden_service: {'test-helper': test_helpers} + } + } + with open(bouncer_file) as f: + old_bouncer_data = yaml.safe_load(f) + + with open(bouncer_file, 'w+') as f: + old_bouncer_data['collector']['httpo://'+collector_hidden_service] = {} + old_bouncer_data['collector']['httpo://'+collector_hidden_service]['test-helper'] = test_helpers + yaml.dump(old_bouncer_data, f)

1 0

[ooni-probe/master] Add logo to README.
by art＠torproject.org 12 Jan '14

12 Jan '14

commit adc4113bfb4b131f8dbbb48a8101499a7f184d36 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Sat Jan 11 17:27:55 2014 +0100 Add logo to README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f09ca1..deb1b6f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.org/TheTorProject/ooni-probe.png?branch=master)](… [![Coverage Status](https://coveralls.io/repos/TheTorProject/ooni-probe/badge.png)](https://coveralls.io/r/TheTorProject/ooni-probe) -# ooniprobe - Open Observatory of Network Interference +![OONI](https://ooni.torproject.org/theme/img/ooni-logo.png) "The Net interprets censorship as damage and routes around it." - John Gilmore; TIME magazine (6 December 1993)

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 12 Jan '14

12 Jan '14

commit ad58966a76131e6fcb0a0c9e97c82249bb45bf5c Merge: 9e3261d 98d969b Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 11 17:51:32 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Add logo to README. README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Properly format the copyright file.
by art＠torproject.org 12 Jan '14

12 Jan '14

commit 0c4f767826528b49e2ee090061d4031f1c500b3d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 11 18:11:40 2014 +0100 Properly format the copyright file. --- debian/copyright | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index 1b60570..cbe2380 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,6 +23,12 @@ License: permissive provided the copyright notice and this notice are preserved. +Files: data/Geo*.dat +Copyright: 2013 MaxMind +License: CC BY-SA + This product includes GeoLite data created by MaxMind, available from + <a href="http://www.maxmind.com">http://www.maxmind.com</a>. + License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -43,6 +49,3 @@ License: BSD-2-clause THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -This product includes GeoLite data created by MaxMind, available from -<a href="http://www.maxmind.com">http://www.maxmind.com</a>.

1 0