commit da535b9bfbc7b89e5b196d8a88a374206684715f Merge: af03b56 eae2c1e Author: Arturo Filastò art@fuffa.org Date: Mon Jun 17 12:34:42 2013 +0200

Merge branch 'feature/ui' into staging

* feature/ui: (39 commits) Fix bug that resulted in inconsistencies in test_id Add example on data_dir Actually we are already root, no need for sudo Run setup.py script as root Install the stable pip, before upgrading Fix bug in importing of geodata Place data files into proper sub-directory structure Fix import lost in merge Fix bug in HTTP api Add oonid script to run ooni daemon Include jquery as dep Bump to version 0.1.0 Add cyclone as a dependency Implement XSRF protection in the HTTP API Point to data directory in short-not-root deck Implement in-browser input file selection views Improve setup.py, fixup paths for reporting. Remove oonib related data from ooniprobe Add support for viewing test results and uploading inputs Initial commit of ooni-probe user interface Implement starting and stopping of tests via the HTTP API ...

Conflicts: ooni/__init__.py ooni/tasks.py setup.py

Vagrantfile | 16 +- bin/oonid | 7 + data/nettests/blocking/__init__.py | 1 + data/nettests/blocking/dnsconsistency.py | 173 + data/nettests/blocking/http_requests.py | 130 + data/nettests/blocking/tcpconnect.py | 69 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + data/nettests/experimental/chinatrigger.py | 108 + data/nettests/experimental/dns_injection.py | 63 + data/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + data/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + data/nettests/experimental/keyword_filtering.py | 52 + data/nettests/experimental/parasitictraceroute.py | 129 + data/nettests/experimental/squid.py | 117 + data/nettests/manipulation/captiveportal.py | 650 + data/nettests/manipulation/daphne.py | 119 + data/nettests/manipulation/dnsspoof.py | 69 + .../manipulation/http_header_field_manipulation.py | 189 + data/nettests/manipulation/http_host.py | 151 + .../manipulation/http_invalid_request_line.py | 106 + data/nettests/manipulation/traceroute.py | 143 + data/nettests/scanning/http_url_list.py | 98 + data/nettests/third_party/Makefile | 3 + data/nettests/third_party/README | 14 + data/nettests/third_party/netalyzr.py | 58 + data/ooniprobe.conf.sample | 57 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + decks/before_i_commit.testdeck | 12 +- decks/short_no_root.deck | 10 +- nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 69 - nettests/examples/example_dns_http.py | 11 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_filtering_bypassing.py | 84 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_trix.py | 47 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 151 - nettests/manipulation/http_invalid_request_line.py | 106 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/api/spec.py | 253 + ooni/config.py | 128 - ooni/director.py | 50 +- ooni/errors.py | 3 + ooni/geoip.py | 3 +- ooni/managers.py | 18 +- ooni/nettest.py | 178 +- ooni/oonicli.py | 16 +- ooni/oonid.py | 20 + ooni/reporter.py | 8 +- ooni/settings.py | 98 + ooni/tasks.py | 12 +- ooni/templates/httpt.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/mocks.py | 8 +- ooni/tests/test_managers.py | 8 + ooni/tests/test_nettest.py | 7 +- ooni/utils/log.py | 10 +- ooni/utils/txscapy.py | 2 +- ooniprobe.conf.sample | 56 - setup.py | 16 +- 126 files changed, 38968 insertions(+), 3809 deletions(-)

diff --cc setup.py index c5329d8,c0487b1..7912924 --- a/setup.py +++ b/setup.py @@@ -1,8 -1,10 +1,11 @@@ #!/usr/bin/env python #-*- coding: utf-8 -*-

+from ooni import __version__ - from setuptools import setup + import os + from os.path import join as pj + import sys + from distutils.core import setup

install_requires = [ 'txsocksx>=0.0.2',