commit d475d641f2d6e6ca8e2609d54163a556bc048ad0 Author: Arturo Filastò art@fuffa.org Date: Mon Jan 13 15:12:00 2014 +0100
Design a set of default test decks. --- data/decks/basic.deck | 24 ------------ data/decks/before_i_commit.testdeck | 36 ------------------ data/decks/complete.deck | 72 +++++++++++++++++++++++++++++++++++ data/decks/complete_no_root.deck | 60 +++++++++++++++++++++++++++++ data/decks/fast.deck | 36 ++++++++++++++++++ data/decks/fast_no_root.deck | 24 ++++++++++++ data/decks/mlab.deck | 10 ++--- data/decks/mlab_no_root.deck | 48 +++++++++++++++++++++++ data/decks/short_no_root.deck | 60 ----------------------------- 9 files changed, 245 insertions(+), 125 deletions(-)
diff --git a/data/decks/basic.deck b/data/decks/basic.deck deleted file mode 100644 index 1643f5a..0000000 --- a/data/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://ihiderha53f36lsd.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 deleted file mode 100644 index 9a3bca7..0000000 --- a/data/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/data/decks/complete.deck b/data/decks/complete.deck new file mode 100644 index 0000000..770b401 --- /dev/null +++ b/data/decks/complete.deck @@ -0,0 +1,72 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/traceroute + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null diff --git a/data/decks/complete_no_root.deck b/data/decks/complete_no_root.deck new file mode 100644 index 0000000..8dbc147 --- /dev/null +++ b/data/decks/complete_no_root.deck @@ -0,0 +1,60 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null diff --git a/data/decks/fast.deck b/data/decks/fast.deck new file mode 100644 index 0000000..ddf3c71 --- /dev/null +++ b/data/decks/fast.deck @@ -0,0 +1,36 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/traceroute + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/fast_no_root.deck b/data/decks/fast_no_root.deck new file mode 100644 index 0000000..69bdf2f --- /dev/null +++ b/data/decks/fast_no_root.deck @@ -0,0 +1,24 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/mlab.deck b/data/decks/mlab.deck index 5d5a299..9564d1b 100644 --- a/data/decks/mlab.deck +++ b/data/decks/mlab.deck @@ -3,7 +3,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -15,7 +15,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -27,7 +27,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -39,7 +39,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -51,7 +51,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 diff --git a/data/decks/mlab_no_root.deck b/data/decks/mlab_no_root.deck new file mode 100644 index 0000000..0ab459e --- /dev/null +++ b/data/decks/mlab_no_root.deck @@ -0,0 +1,48 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null diff --git a/data/decks/short_no_root.deck b/data/decks/short_no_root.deck deleted file mode 100644 index ddd157a..0000000 --- a/data/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