commit 4142c7fc9e43620379e7d4fad19c231560b11e2a Merge: ac95afc 4648dd5 Author: Isis Lovecruft isis@torproject.org Date: Sun Dec 9 23:22:04 2012 +0000
Merge remote-tracking branch 'tpo-common/master'
HACKING | 82 ++- README.md | 120 +++- before_i_commit.sh | 15 +- before_i_commit.testdeck | 33 + bin/oonib | 3 + docs/source/_static/.gitignore | 4 + docs/source/api/ooni.kit.rst | 19 - docs/source/api/ooni.lib.rst | 26 - docs/source/api/ooni.rst | 5 +- docs/source/api/ooni.utils.rst | 23 +- docs/source/conf.py | 11 +- docs/source/index.rst | 116 +++- docs/source/reports.rst | 57 ++ docs/source/tests/dnstamper.rst | 180 +++++ docs/source/tests/http_host.rst | 102 +++ docs/source/tests/http_invalid_request_line.rst | 164 +++++ docs/source/tests/http_requests.rst | 238 ++++++ docs/source/tests/tcpconnect.rst | 69 ++ docs/source/tests/template.rst | 45 ++ docs/source/tests/traceroute.rst | 177 +++++ docs/source/writing_tests.rst | 283 +++++++- example_inputs/README | 2 + example_inputs/daph3_yaml_file.txt | 2 + example_inputs/dns_tamper_file.txt | 3 + example_inputs/dns_tamper_test_resolvers.txt | 2 + example_inputs/http_host_file.txt | 2 + example_inputs/keyword_filtering_file.txt | 2 + example_inputs/url_lists_file.txt | 2 + fabfile.py | 55 ++ inputs/README | 5 +- nettests/blocking/dnstamper.py | 166 +++++ nettests/blocking/http_requests.py | 120 ++++ nettests/blocking/tcpconnect.py | 51 ++ nettests/bridge_reachability/bridget.py | 462 ------------ nettests/bridge_reachability/echo.py | 132 ---- nettests/core/captiveportal.py | 644 ----------------- nettests/core/chinatrigger.py | 108 --- nettests/core/daphn3.py | 119 --- nettests/core/dnstamper.py | 277 ------- nettests/core/http_host.py | 108 --- nettests/core/http_keyword_filtering.py | 42 -- nettests/core/http_requests.py | 118 --- nettests/core/http_uk_mobile_networks.py | 85 --- nettests/core/keyword_filtering.py | 52 -- nettests/core/squid.py | 117 --- nettests/core/tcpconnect.py | 46 -- nettests/core/traceroute.py | 113 --- nettests/core/url_list.py | 71 -- nettests/examples/example_dnst.py | 11 + nettests/examples/example_scapyt.py | 16 +- nettests/examples/example_scapyt_yield.py | 25 + 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/http_keyword_filtering.py | 45 ++ 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 | 643 +++++++++++++++++ nettests/manipulation/daphne.py | 119 +++ nettests/manipulation/dnsspoof.py | 69 ++ .../manipulation/http_header_field_manipulation.py | 182 +++++ nettests/manipulation/http_host.py | 109 +++ nettests/manipulation/http_invalid_request_line.py | 109 +++ nettests/manipulation/traceroute.py | 143 ++++ nettests/scanning/http_url_list.py | 98 +++ nettests/third_party/netalyzr.py | 28 +- ooni/__init__.py | 7 +- ooni/config.py | 128 +++- ooni/inputunit.py | 27 +- ooni/kit/__init__.py | 3 +- ooni/lib/txtraceroute.py | 752 -------------------- ooni/nettest.py | 107 ++- ooni/oonicli.py | 139 +++-- ooni/otime.py | 92 +++ ooni/reporter.py | 221 ++++-- ooni/runner.py | 564 +++++++++++---- ooni/templates/dnst.py | 112 +++ ooni/templates/httpt.py | 299 ++++++--- ooni/templates/scapyt.py | 149 +++-- ooni/templates/tcpt.py | 96 +++ ooni/utils/geodata.py | 1 - ooni/utils/hacks.py | 48 +-- ooni/utils/log.py | 24 +- ooni/utils/net.py | 96 +-- ooni/utils/otime.py | 51 -- ooni/utils/txagentwithsocks.py | 327 +++++++++ ooni/utils/txscapy.py | 226 +++++-- oonib/README.md | 6 + oonib/__init__.py | 2 + oonib/config.py | 11 +- oonib/models.py | 11 +- oonib/oonibackend.py | 30 +- oonib/report/__init__.py | 8 + oonib/report/api.py | 170 +---- oonib/report/file_collector.py | 145 ++++ oonib/requirements.txt | 2 + oonib/runner.py | 55 ++- oonib/testhelpers/http_helpers.py | 108 +++- ooniprobe.conf | 27 - ooniprobe.conf.sample | 38 + requirements.txt | 6 +- test_inputs/README | 2 - test_inputs/daph3_yaml_file.txt | 2 - test_inputs/dns_tamper_file.txt | 3 - test_inputs/dns_tamper_test_resolvers.txt | 2 - test_inputs/http_host_file.txt | 2 - test_inputs/keyword_filtering_file.txt | 2 - test_inputs/url_lists_file.txt | 2 - tests/test_inputunit.py | 15 +- tests/test_otime.py | 15 + tests/test_runner.py | 80 ++ tests/test_trueheaders.py | 41 ++ to-be-ported/old-api/.ropeproject/config.py | 85 --- to-be-ported/old-api/.ropeproject/globalnames | Bin 108 -> 0 bytes to-be-ported/old-api/.ropeproject/history | 1 - to-be-ported/old-api/.ropeproject/objectdb | Bin 741 -> 0 bytes to-be-ported/old-api/TESTS_ARE_MOVING.txt | 8 - to-be-ported/old-api/domclass.py | 216 ------ to-be-ported/old-api/dropin.cache | 243 ------- to-be-ported/old-api/tcpscan.py | 84 --- 123 files changed, 7297 insertions(+), 4975 deletions(-)