commit 3d0040477af00e329095531335d0f7eebe78f46a Author: Isis Lovecruft isis@torproject.org Date: Thu Nov 8 07:09:24 2012 +0000

* Moved /test_inputs/* to /inputs. --- inputs/README | 46 +++++++++++++++++++++++++++ inputs/dns_tamper_file.txt | 3 ++ inputs/dns_tamper_test_resolvers.txt | 2 + inputs/http_host_file.txt | 2 + inputs/keyword_filtering_file.txt | 2 + inputs/url_lists_file.txt | 2 + test_inputs/README | 48 ----------------------------- 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 - 12 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/inputs/README b/inputs/README new file mode 100644 index 0000000..14c2c81 --- /dev/null +++ b/inputs/README @@ -0,0 +1,46 @@ +In here you will find some very simple input lists that are useful for testing +the correct functionality of the various OONIProbe tests. + +# DNS Tamper + +./bin/ooniprobe -o dns_tamper_test.yamloo nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/dns_tamper_file.txt + +less dns_tamper_test.yamloo + +# Captive Portal + +./bin/ooniprobe -o captive_portal_test.yamloo nettests/core/captiveportal.py + +less captive_portal_test.yamloo + +# HTTP Host + +./bin/ooniprobe -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt + +less http_host.yamloo + +# Keyword filtering + +./bin/ooniprobe -o keyword_filtering.yamloo nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt + +less keyword_filtering.yamloo + +# URL List + +./bin/ooniprobe -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt + +less url_lists.yamloo + +# Squid transparent proxy + +./bin/ooniprobe -o squid.yamloo nettests/core/squid.py + +less squid.yamloo + +# HTTP Requests + +Not Implemented + +# Traceroute + +Not Implemented diff --git a/inputs/dns_tamper_file.txt b/inputs/dns_tamper_file.txt new file mode 100644 index 0000000..25f365c --- /dev/null +++ b/inputs/dns_tamper_file.txt @@ -0,0 +1,3 @@ +torproject.org +google.com +measurementlab.net diff --git a/inputs/dns_tamper_test_resolvers.txt b/inputs/dns_tamper_test_resolvers.txt new file mode 100644 index 0000000..14c77e0 --- /dev/null +++ b/inputs/dns_tamper_test_resolvers.txt @@ -0,0 +1,2 @@ +8.8.8.8 +8.8.4.4 diff --git a/inputs/http_host_file.txt b/inputs/http_host_file.txt new file mode 100644 index 0000000..12afb18 --- /dev/null +++ b/inputs/http_host_file.txt @@ -0,0 +1,2 @@ +torproject.org +ooni.nu diff --git a/inputs/keyword_filtering_file.txt b/inputs/keyword_filtering_file.txt new file mode 100644 index 0000000..4583bae --- /dev/null +++ b/inputs/keyword_filtering_file.txt @@ -0,0 +1,2 @@ +antani +sblinda diff --git a/inputs/url_lists_file.txt b/inputs/url_lists_file.txt new file mode 100644 index 0000000..16a4f58 --- /dev/null +++ b/inputs/url_lists_file.txt @@ -0,0 +1,2 @@ +http://ooni.nu/test +http://torproject.org/ diff --git a/test_inputs/README b/test_inputs/README deleted file mode 100644 index 1eff781..0000000 --- a/test_inputs/README +++ /dev/null @@ -1,48 +0,0 @@ -In here you will find some very simple input lists that are useful for testing -the correct functionality of the various OONIProbe tests. - -# DNS Tamper - -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/dns_tamper_file.txt - -less dns_tamper_test.yamloo - -# Captive Portal - -./bin/ooniprobe -o captive_portal_test.yamloo nettests/core/captiveportal.py - -less captive_portal_test.yamloo - -# HTTP Host - -./bin/ooniprobe -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt - -less http_host.yamloo - -# Keyword filtering - -./bin/ooniprobe -o keyword_filtering.yamloo nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt - -less keyword_filtering.yamloo - -# URL List - -./bin/ooniprobe -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt - -less url_lists.yamloo - -# Squid transparent proxy - -./bin/ooniprobe -o squid.yamloo nettests/core/squid.py - -less squid.yamloo - -# HTTP Requests - -Not Implemented - -# Traceroute - -Not Implemented - - diff --git a/test_inputs/dns_tamper_file.txt b/test_inputs/dns_tamper_file.txt deleted file mode 100644 index 25f365c..0000000 --- a/test_inputs/dns_tamper_file.txt +++ /dev/null @@ -1,3 +0,0 @@ -torproject.org -google.com -measurementlab.net diff --git a/test_inputs/dns_tamper_test_resolvers.txt b/test_inputs/dns_tamper_test_resolvers.txt deleted file mode 100644 index 14c77e0..0000000 --- a/test_inputs/dns_tamper_test_resolvers.txt +++ /dev/null @@ -1,2 +0,0 @@ -8.8.8.8 -8.8.4.4 diff --git a/test_inputs/http_host_file.txt b/test_inputs/http_host_file.txt deleted file mode 100644 index 12afb18..0000000 --- a/test_inputs/http_host_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -torproject.org -ooni.nu diff --git a/test_inputs/keyword_filtering_file.txt b/test_inputs/keyword_filtering_file.txt deleted file mode 100644 index 4583bae..0000000 --- a/test_inputs/keyword_filtering_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -antani -sblinda diff --git a/test_inputs/url_lists_file.txt b/test_inputs/url_lists_file.txt deleted file mode 100644 index 16a4f58..0000000 --- a/test_inputs/url_lists_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -http://ooni.nu/test -http://torproject.org/