commit e3011887ec87dfe5bca3667bc6cde0f7096a6172 Merge: bcf5e79 9313c75 Author: Arturo Filastò art@torproject.org Date: Mon Jul 9 16:29:36 2012 +0200

Merge branch 'captiveportal' of https://github.com/isislovecruft/ooni-probe into captiveportal

Conflicts: ooniprobe.py plugoo/tests.py

TODO | 2 + assets/captive_portal_tests.txt | 4 + ooni/ooni-probe.conf | 23 ++ tests/captiveportal.py | 651 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 680 insertions(+), 0 deletions(-)

diff --cc ooni/ooni-probe.conf index d95e410,0000000..0c68fe0 mode 100644,000000..100644 --- a/ooni/ooni-probe.conf +++ b/ooni/ooni-probe.conf @@@ -1,77 -1,0 +1,100 @@@ +# ooni-probe +# +# These are the global configuration parameters necessary to +# make ooni-probe work +[main] +reportdir = reports/ +logfile = ooniprobe.log +assetdir = assets/ +testdir = oonitests/ + +loglevel = DEBUG +consoleloglevel = DEBUG +proxyaddress = 127.0.0.1:9050 + +# The following configurations are for searching for PlanetLab +# nodes, adding them to a slice, and PlanetLab general API +# authentication: +pl_username = yourusername +pl_password = yourpassword + +# These are configurations specific to the tests that should be +# run by ooni-probe +[tests] +run = dnstamper +### DNS testing related config parameters + +# This is the list of hostnames that must be looked up +dns_experiment = top-1m.txt + +# This is the dns servers to be tested +dns_experiment_dns = dns_servers.txt + +# This is the control known good DNS server +dns_control_server = 91.191.136.152 + +# Specify whether the dnstamper test should attempt to remove +# GeoIP-based false positives by doing a reverse DNS resolve +# on positive results. +dns_reverse_lookup = true + ++### captiveportal testing configuration parameters ++ ++# This is an optional list of user defined captive portal tests, ++# one per line, with each line in the format: ++# experiment_url, control_result, control_code ++# where experiment_url is the test page to retrieve, ++# control_result is some unique text found on the test page, ++# and control_code is the expected HTTP status code. ++captive_portal = captive_portal_tests.txt ++ ++# The default User Agent that ooni-probe should send for ++# HTTP requests (pretend we're a Windows box running FF10): ++default_ua = Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20100101 Firefox/10.0.2 ++ ++# Enable vendor tests for captive portals: ++do_captive_portal_vendor_tests = true ++ ++# Enable DNS-based vendor tests for captive portals: ++do_captive_portal_vendor_dns_tests = true ++ ++# Enable checking of DNS requests for tampering: ++check_dns_requests = true ++ +### traceroute testing related config parameters + +# This is the list of ips to traceroute to +traceroute = example_exp_list.txt + +# This is the list of ports that should be used +# src_x,src_y,src_z|dst_x,dst_y,dst_z +traceroute_ports = 0,53,80,123,443|0,53,80,123,443 + +# The protocol to be used in the scan +traceroute_proto = UDP, TCP, ICMP + +### keyword injection related tests + +# List of keywords +keywords = keywordlist.txt + +# hosts +keywords_hosts = hostslist.txt + +# Methods to be used for testing +keyword_method = http,telnet + +### Tor bridge testing + +tor_bridges = bridgetests.txt +tor_bridges_timeout = 40 + +[report] +file = report.log +timestamp = true +#ssh = 127.0.0.1:22 +#ssh_user = theusername +#ssh_password = thepassword +#ssh_keyfile = ~/.ssh/mykey_rsa +#ssh_rpath = ~/ooni-probe/ +#tcp = "127.0.0.1:9088"