commit c3602305e65e48f014817687b58dd1efc55ad5f0 Author: Arturo Filastò art@fuffa.org Date: Wed Nov 13 10:07:21 2013 +0100
Move decks and inouts to data directory. --- data/decks/basic.deck | 24 ++++++++++++++ data/decks/before_i_commit.testdeck | 36 +++++++++++++++++++++ data/decks/short_no_root.deck | 60 +++++++++++++++++++++++++++++++++++ data/inputs/Makefile | 13 ++++++++ data/inputs/README | 47 +++++++++++++++++++++++++++ decks/basic.deck | 24 -------------- decks/before_i_commit.testdeck | 36 --------------------- decks/short_no_root.deck | 60 ----------------------------------- inputs/Makefile | 13 -------- inputs/README | 47 --------------------------- 10 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/data/decks/basic.deck b/data/decks/basic.deck new file mode 100644 index 0000000..b2ede99 --- /dev/null +++ b/data/decks/basic.deck @@ -0,0 +1,24 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://amcq5ldf3vwg22ze.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/before_i_commit.testdeck b/data/decks/before_i_commit.testdeck new file mode 100644 index 0000000..9a3bca7 --- /dev/null +++ b/data/decks/before_i_commit.testdeck @@ -0,0 +1,36 @@ +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/captive_portal_test.yamloo + subargs: [] + test_file: manipulation/captiveportal +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/dns_tamper_test.yamloo + subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] + test_file: blocking/dnsconsistency +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/http_host.yamloo + subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] + test_file: manipulation/http_host +- options: + no-collector: true + collector: null + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/header_field_manipulation.yamloo + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation diff --git a/data/decks/short_no_root.deck b/data/decks/short_no_root.deck new file mode 100644 index 0000000..ddd157a --- /dev/null +++ b/data/decks/short_no_root.deck @@ -0,0 +1,60 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/captiveportal + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/url_lists_file.txt] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/tcpconnect_host_file.txt] + test_file: blocking/tcpconnect + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/inputs/Makefile b/data/inputs/Makefile new file mode 100644 index 0000000..ff74cf6 --- /dev/null +++ b/data/inputs/Makefile @@ -0,0 +1,13 @@ +# This file will fetch a set of inputs that are of use to ooni-probe +all: whatheaders lists + +lists: + curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz + tar xzf input-pack.tar.gz + rm input-pack.tar.gz + +whatheaders: + wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip + unzip whatheaders-latest.xml.zip + mv whatheaders*.xml whatheaders.xml + rm whatheaders-latest.xml.zip diff --git a/data/inputs/README b/data/inputs/README new file mode 100644 index 0000000..fb3599d --- /dev/null +++ b/data/inputs/README @@ -0,0 +1,47 @@ +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 data/nettests/blocking/dnsconsistency.py -t +example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt + +less dns_tamper_test.yamloo + +# Captive Portal + +./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py + +less captive_portal_test.yamloo + +# HTTP Host + +./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt + +less http_host.yamloo + +# Keyword filtering + +./bin/ooniprobe -o keyword_filtering.yamloo data/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 data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt + +less url_lists.yamloo + +# Squid transparent proxy + +./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py + +less squid.yamloo + +# HTTP Requests + +Not Implemented + +# Traceroute + +Not Implemented diff --git a/decks/basic.deck b/decks/basic.deck deleted file mode 100644 index b2ede99..0000000 --- a/decks/basic.deck +++ /dev/null @@ -1,24 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, 'httpo://amcq5ldf3vwg22ze.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck deleted file mode 100644 index 9a3bca7..0000000 --- a/decks/before_i_commit.testdeck +++ /dev/null @@ -1,36 +0,0 @@ -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/captive_portal_test.yamloo - subargs: [] - test_file: manipulation/captiveportal -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/dns_tamper_test.yamloo - subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test_file: blocking/dnsconsistency -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] - test_file: manipulation/http_host -- options: - no-collector: true - collector: null - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/header_field_manipulation.yamloo - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation diff --git a/decks/short_no_root.deck b/decks/short_no_root.deck deleted file mode 100644 index ddd157a..0000000 --- a/decks/short_no_root.deck +++ /dev/null @@ -1,60 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [] - test_file: manipulation/captiveportal - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/url_lists_file.txt] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/tcpconnect_host_file.txt] - test_file: blocking/tcpconnect - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] - test_file: blocking/dnsconsistency - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null diff --git a/inputs/Makefile b/inputs/Makefile deleted file mode 100644 index ff74cf6..0000000 --- a/inputs/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# This file will fetch a set of inputs that are of use to ooni-probe -all: whatheaders lists - -lists: - curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz - tar xzf input-pack.tar.gz - rm input-pack.tar.gz - -whatheaders: - wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip - unzip whatheaders-latest.xml.zip - mv whatheaders*.xml whatheaders.xml - rm whatheaders-latest.xml.zip diff --git a/inputs/README b/inputs/README deleted file mode 100644 index fb3599d..0000000 --- a/inputs/README +++ /dev/null @@ -1,47 +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 data/nettests/blocking/dnsconsistency.py -t -example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt - -less dns_tamper_test.yamloo - -# Captive Portal - -./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py - -less captive_portal_test.yamloo - -# HTTP Host - -./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt - -less http_host.yamloo - -# Keyword filtering - -./bin/ooniprobe -o keyword_filtering.yamloo data/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 data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt - -less url_lists.yamloo - -# Squid transparent proxy - -./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py - -less squid.yamloo - -# HTTP Requests - -Not Implemented - -# Traceroute - -Not Implemented