commit 0b1ffa329ee7db8e11131f59f2113c9e55de3ee4 Merge: eaf15e6 f3d3bb1 Author: Arturo Filastò <arturo@filasto.net> Date: Mon Aug 8 16:43:59 2016 +0200 Merge pull request #581 from TheTorProject/feature/webui2-rb Feature/webui2 rb .gitignore | 1 + MANIFEST.in | 3 + Vagrantfile | 33 +- bin/Makefile | 81 -- bin/oonid | 7 - bin/oonideckgen | 37 - bin/ooniprobe | 24 - bin/ooniprobe-dev | 10 - bin/oonireport | 38 - bin/ooniresources | 35 - bin/test/ooni/__init__.py | 1 - data/component-template/templ.component.js | 10 - data/component-template/templ.controller.js | 5 - data/component-template/templ.css | 0 data/component-template/templ.html | 8 - data/component-template/templ.js | 19 - data/decks/web-full.yaml | 23 + data/decks/web-no-invalid.yaml | 18 + data/ooniprobe.conf.sample | 5 +- ooni/__init__.py | 13 +- ooni/agent/__init__.py | 0 ooni/agent/agent.py | 27 + ooni/agent/scheduler.py | 280 ++++ ooni/backend_client.py | 117 +- ooni/constants.py | 4 +- ooni/contrib/__init__.py | 1 + ooni/contrib/croniter.py | 430 +++++++ ooni/contrib/dateutil/__init__.py | 0 ooni/contrib/dateutil/relativedelta.py | 539 ++++++++ ooni/contrib/dateutil/tz/__init__.py | 4 + ooni/contrib/dateutil/tz/_common.py | 100 ++ ooni/contrib/dateutil/tz/tz.py | 1339 ++++++++++++++++++++ ooni/contrib/dateutil/tz/win.py | 354 ++++++ ooni/deck.py | 413 ------ ooni/deck/__init__.py | 1 + ooni/deck/backend.py | 191 +++ ooni/deck/deck.py | 405 ++++++ ooni/deck/legacy.py | 65 + ooni/deck/store.py | 192 +++ ooni/deckgen/__init__.py | 1 - ooni/deckgen/cli.py | 183 --- ooni/deckgen/processors/__init__.py | 0 ooni/deckgen/processors/citizenlab_test_lists.py | 55 - ooni/deckgen/processors/namebench_dns_servers.py | 51 - ooni/director.py | 227 ++-- ooni/geoip.py | 57 +- ooni/measurements.py | 151 ++- ooni/nettest.py | 118 +- ooni/nettests/blocking/web_connectivity.py | 14 +- .../manipulation/http_invalid_request_line.py | 14 +- ooni/oonicli.py | 520 -------- ooni/otime.py | 7 + ooni/report/__init__.py | 1 - ooni/report/cli.py | 90 -- ooni/report/parser.py | 35 - ooni/report/tool.py | 117 -- ooni/reporter.py | 428 ++++--- ooni/resources.py | 184 +++ ooni/resources/__init__.py | 7 - ooni/resources/cli.py | 44 - ooni/resources/update.py | 57 - ooni/scripts/__init__.py | 0 ooni/scripts/oonideckgen.py | 138 ++ ooni/scripts/ooniprobe.py | 35 + ooni/scripts/ooniprobe_agent.py | 165 +++ ooni/scripts/oonireport.py | 309 +++++ ooni/scripts/ooniresources.py | 34 + ooni/settings.py | 364 ++++-- ooni/templates/httpt.py | 9 +- ooni/templates/process.py | 7 +- ooni/templates/tcpt.py | 1 - ooni/tests/__init__.py | 7 - ooni/tests/bases.py | 4 +- ooni/tests/mocks.py | 2 +- ooni/tests/test_backend_client.py | 16 - ooni/tests/test_deck.py | 271 ++-- ooni/tests/test_director.py | 17 +- ooni/tests/test_geoip.py | 18 +- ooni/tests/test_nettest.py | 24 +- ooni/tests/test_oonicli.py | 40 +- ooni/tests/test_oonideckgen.py | 37 + ooni/tests/test_oonireport.py | 72 +- ooni/tests/test_reporter.py | 89 +- ooni/tests/test_resources.py | 56 + ooni/tests/test_socks.py | 10 + ooni/tests/test_txscapy.py | 3 - ooni/tests/test_utils.py | 8 +- ooni/ui/cli.py | 555 ++++++++ ooni/ui/consent-form.md | 265 ++++ ooni/ui/web/client/index.html | 2 +- ooni/ui/web/server.py | 615 +++++++-- ooni/ui/web/web.py | 64 +- ooni/utils/__init__.py | 46 +- ooni/utils/log.py | 164 ++- ooni/utils/onion.py | 50 +- ooni/utils/txscapy.py | 73 +- requirements.txt | 1 + scripts/__init__.py | 0 scripts/set_caps/Makefile | 81 ++ scripts/set_caps/__init__.py | 0 scripts/set_caps/test/__init__.py | 0 scripts/set_caps/test/ooni/__init__.py | 1 + setup.py | 215 +--- 103 files changed, 7889 insertions(+), 3173 deletions(-)