diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index daddf8f4..00000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "ooni/lib/txscapy"] - path = ooni/lib/txscapy - url = https://github.com/isislovecruft/txscapy.git -[submodule "ooni/lib/txtraceroute"] - path = ooni/lib/txtraceroute - url = https://github.com/isislovecruft/txtraceroute.git -[submodule "ooni/lib/txtorcon"] - path = ooni/lib/txtorcon - url = https://github.com/isislovecruft/txtorcon.git diff --git a/README.rst b/README.rst index f4ce39f3..92cc532d 100644 --- a/README.rst +++ b/README.rst @@ -126,7 +126,7 @@ without installing it is supported with the following commands:: git clone https://git.torproject.org/ooni-probe.git cd ooni-probe - ./setup-dependencies.sh + ./scripts/setup-dependencies.sh python setup.py install OSX diff --git a/apt.key b/apt.key deleted file mode 100644 index 2ce21104..00000000 Binary files a/apt.key and /dev/null differ diff --git a/ooniprobe-dev b/bin/ooniprobe-dev similarity index 100% rename from ooniprobe-dev rename to bin/ooniprobe-dev diff --git a/debian/README b/debian/README deleted file mode 100644 index a816b35b..00000000 --- a/debian/README +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 45128cc0..00000000 --- a/debian/changelog +++ /dev/null @@ -1,41 +0,0 @@ -ooniprobe (1.2.2-1) stable; urgency=low - - * ooniprobe 1.2.2 - - -- OONI Developers (signing key) Fri, 17 Oct 2014 16:07:00 +0200 - -ooniprobe (1.2.0-1) stable; urgency=low - - * ooniprobe 1.2.0 - - -- OONI Developers (signing key) Wed, 1 Oct 2014 16:07:00 +0200 - -ooniprobe (1.1.1-1) stable; urgency=low - - * ooniprobe 1.1.1 - - -- OONI Developers (signing key) Sun, 24 Aug 2014 20:01:46 +0200 - -ooniprobe (1.1.0-1) stable; urgency=low - - * ooniprobe 1.1.0 - - -- OONI Developers (signing key) Tue, 19 Aug 2014 15:14:46 +0200 - -ooniprobe (1.0.2-1) stable; urgency=low - - * ooniprobe 1.0.2 - - -- OONI Developers (signing key) Fri, 9 May 2014 10:14:46 +0200 - -ooniprobe (1.0.1-1) stable; urgency=low - - * ooniprobe 1.0.1 - - -- OONI Developers (signing key) Fri, 14 Mar 2014 17:14:46 +0200 - -ooniprobe (1.0.0-rc6-1) stable; urgency=low - - * ooniprobe 1.0.0-rc6 - - -- OONI Developers (signing key) Mon, 13 Jan 2014 14:14:46 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 9bdf6414..00000000 --- a/debian/control +++ /dev/null @@ -1,53 +0,0 @@ -Source: ooniprobe -Maintainer: Open Observatory of Network Interference -Section: net -Priority: extra -Build-Depends: debhelper (>= 8), - python-all (>= 2.6.6-3~), - python-dnspython, - python-dumbnet, - python-docutils (>= 0.9.1), - python-ipaddr (>= 2.1.10), - python-openssl, - python-pypcap, - 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, - python-all (>= 2.6.6-3~), - python-dumbnet, - python-geoip (>= 0.2.5), - python-ipaddr (>= 2.1.10), - python-openssl, - python-pypcap, - 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), -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 deleted file mode 100644 index cbe2380c..00000000 --- a/debian/copyright +++ /dev/null @@ -1,51 +0,0 @@ -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 -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. - -Files: data/Geo*.dat -Copyright: 2013 MaxMind -License: CC BY-SA - This product includes GeoLite data created by MaxMind, available from - http://www.maxmind.com. - -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. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 9f48e791..00000000 --- a/debian/rules +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ --buildsystem=python_distutils --with=python2 -override_dh_python2: - dh_python2 --no-guessing-deps diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/fabfile.py b/scripts/fabfile.py similarity index 100% rename from fabfile.py rename to scripts/fabfile.py diff --git a/setup-dependencies.sh b/scripts/setup-dependencies.sh similarity index 100% rename from setup-dependencies.sh rename to scripts/setup-dependencies.sh diff --git a/example_inputs/README b/var/example_inputs/README similarity index 100% rename from example_inputs/README rename to var/example_inputs/README diff --git a/var/example_inputs/alexa-head.txt b/var/example_inputs/alexa-head.txt new file mode 100644 index 00000000..1ddf9822 --- /dev/null +++ b/var/example_inputs/alexa-head.txt @@ -0,0 +1,10 @@ +http://google.com/ +http://facebook.com/ +http://youtube.com/ +http://yahoo.com/ +http://baidu.com/ +http://wikipedia.org/ +http://live.com/ +http://twitter.com/ +http://qq.com/ +http://amazon.com/ diff --git a/example_inputs/alexa-top-1k.txt b/var/example_inputs/alexa-top-1k.txt similarity index 100% rename from example_inputs/alexa-top-1k.txt rename to var/example_inputs/alexa-top-1k.txt diff --git a/var/example_inputs/bad_input.txt b/var/example_inputs/bad_input.txt new file mode 100644 index 00000000..45a981ad --- /dev/null +++ b/var/example_inputs/bad_input.txt @@ -0,0 +1 @@ +http://zimbio.com/ diff --git a/var/example_inputs/bridges.txt b/var/example_inputs/bridges.txt new file mode 100644 index 00000000..4a7fa887 --- /dev/null +++ b/var/example_inputs/bridges.txt @@ -0,0 +1,4 @@ +obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0 +obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 +obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239 +obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED diff --git a/example_inputs/daph3_yaml_file.txt b/var/example_inputs/daph3_yaml_file.txt similarity index 100% rename from example_inputs/daph3_yaml_file.txt rename to var/example_inputs/daph3_yaml_file.txt diff --git a/example_inputs/dns_tamper_file.txt b/var/example_inputs/dns_tamper_file.txt similarity index 100% rename from example_inputs/dns_tamper_file.txt rename to var/example_inputs/dns_tamper_file.txt diff --git a/example_inputs/dns_tamper_test_resolvers.txt b/var/example_inputs/dns_tamper_test_resolvers.txt similarity index 100% rename from example_inputs/dns_tamper_test_resolvers.txt rename to var/example_inputs/dns_tamper_test_resolvers.txt diff --git a/var/example_inputs/domains.txt b/var/example_inputs/domains.txt new file mode 100644 index 00000000..cdeaad10 --- /dev/null +++ b/var/example_inputs/domains.txt @@ -0,0 +1,3 @@ +www.twitter.com +facebook.com +youtube.com diff --git a/example_inputs/http_host_file.txt b/var/example_inputs/http_host_file.txt similarity index 100% rename from example_inputs/http_host_file.txt rename to var/example_inputs/http_host_file.txt diff --git a/example_inputs/keyword_filtering_file.txt b/var/example_inputs/keyword_filtering_file.txt similarity index 100% rename from example_inputs/keyword_filtering_file.txt rename to var/example_inputs/keyword_filtering_file.txt diff --git a/example_inputs/tcpconnect_host_file.txt b/var/example_inputs/tcpconnect_host_file.txt similarity index 100% rename from example_inputs/tcpconnect_host_file.txt rename to var/example_inputs/tcpconnect_host_file.txt diff --git a/example_inputs/url_lists_file.txt b/var/example_inputs/url_lists_file.txt similarity index 100% rename from example_inputs/url_lists_file.txt rename to var/example_inputs/url_lists_file.txt