Add CSV, polish

save work, ot done yet
This commit is contained in:
Dirk Wetter 2020-01-30 19:27:20 +01:00
parent b0b084dcda
commit b4634de8dd

View File

@ -1,8 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# This is more a PoC. Improvements welcome!
#
use strict; use strict;
use Test::More; use Test::More;
use JSON; use JSON;
@ -10,34 +7,47 @@ use JSON;
my $tests = 0; my $tests = 0;
my $prg="./testssl.sh"; my $prg="./testssl.sh";
my $check2run ="--ip=one -q --color 0"; my $check2run ="--ip=one -q --color 0";
my $uri=""; my $filechecks = "--jsonfile-pretty tmp.json --csvfile tmp.csv";
my $uri="cloudflare.com";
my $json=""; my $json="";
my $out=""; my $csv="";
my $out=""; # not in use currently
# Blacklists we use to trigger an error: # Blacklists we use to trigger an error:
my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal'; my $socket_regex_bl='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal';
my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem'; my $openssl_regex_bl='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem';
die "Unable to open $prg" unless -f $prg; die "Unable to open $prg" unless -f $prg;
my $uri="cloudflare.com"; # Provide proper start conditions
printf "\n%s\n", "Unit testing JSON output ...";
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
printf "\n%s\n", "Unit testing JSON and CSV output ...";
#1 #1
printf "%s\n", ".. plain JSON --> $uri "; printf "%s\n", ".. CSV and plain JSON --> $uri ";
$out = `./testssl.sh $check2run --jsonfile tmp.json $uri`; $out = `$prg $check2run $filechecks $uri`;
$json = json('tmp.json'); $json = json('tmp.json');
$csv = csv('tmp.csv');
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
my @errors=eval { decode_json($json) }; my @errors=eval { decode_json($json) };
is(@errors,0,"no errors"); is(@errors,0,"no errors");
$tests++; $tests++;
#2
# check header ~ "id","fqdn/ip","port","severity","finding","cve","cwe"
# macth or count: "cipherorder", ~ cert_ ~cert\ , HTTP, HSTS , cipher_, clientsimulation
# later: not FATAL
#2 #2
printf "%s\n", ".. pretty JSON --> $uri "; printf "%s\n", ".. pretty JSON --> $uri ";
$out = `./testssl.sh $check2run --jsonfile-pretty tmp.json $uri`; $out = `$prg $check2run $filechecks $uri`;
$json = json('tmp.json'); $json = json('tmp.json');
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
@errors=eval { decode_json($json) }; @errors=eval { decode_json($json) };
is(@errors,0,"no errors"); is(@errors,0,"no errors");
$tests++; $tests++;
@ -46,36 +56,46 @@ $tests++;
#3 #3
# This testss.sh run deliberately does NOT work as travis-ci.org blocks port 25 egress. # This testss.sh run deliberately does NOT work as travis-ci.org blocks port 25 egress.
# but the output should be fine. The idea is to have a unit test for a failed connection. # but the output should be fine. The idea is to have a unit test for a failed connection.
printf "%s\n", ".. plain JSON for a failed run: '--mx $uri' ..."; printf "%s\n", ".. plain JSON for a failed run: '--mx $uri' (deliberate messy output follows)";
$out = `./testssl.sh --ssl-native --openssl-timeout=10 $check2run --jsonfile tmp.json --mx $uri`; $out = `$prg --ssl-native --openssl-timeout=10 $check2run $filechecks --mx $uri`;
$json = json('tmp.json'); $json = json('tmp.json');
$csv = csv('tmp.csv');
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
printf "$csv\n";
@errors=eval { decode_json($json) }; @errors=eval { decode_json($json) };
is(@errors,0,"no errors"); is(@errors,0,"no errors");
$tests++; $tests++;
# check both for FATAL / Can't connect / scanProblem
#4 #4
# Same as above but with pretty JSON # Same as #3 with pretty JSON
printf "%s\n", ".. pretty JSON for a failed run '--mx $uri' ..."; printf "%s\n", ".. pretty JSON for a failed run '--mx $uri' (deliberate messy output follows)";
$out = `./testssl.sh --ssl-native --openssl-timeout=10 $check2run --jsonfile-pretty tmp.json --mx $uri`; $out = `$prg --ssl-native --openssl-timeout=10 $check2run --jsonfile-pretty tmp.json --csvfile tmp.csv --mx $uri`;
$json = json('tmp.json'); $json = json('tmp.json');
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
@errors=eval { decode_json($json) }; @errors=eval { decode_json($json) };
is(@errors,0,"no errors"); is(@errors,0,"no errors");
$tests++; $tests++;
# check both for FATAL / Can't connect / scanProblem
#5 #5
my $uri = "smtp-relay.gmail.com:587"; my $uri = "smtp-relay.gmail.com:587";
printf "%s\n", " .. plain JSON and STARTTLS --> $uri ..."; printf "%s\n", " .. plain JSON and STARTTLS --> $uri ...";
$out = `./testssl.sh --jsonfile tmp.json $check2run -t smtp $uri`; $out = `$prg $filechecks $check2run -t smtp $uri`;
$json = json('tmp.json'); $json = json('tmp.json');
$csv = csv('tmp.csv');
unlink 'tmp.json'; unlink 'tmp.json';
unlink 'tmp.csv';
@errors=eval { decode_json($json) }; @errors=eval { decode_json($json) };
is(@errors,0,"no errors"); is(@errors,0,"no errors");
$tests++; $tests++;
printf "\n";
done_testing($tests); done_testing($tests);
printf "\n";
sub json($) { sub json($) {
my $file = shift; my $file = shift;
@ -83,4 +103,8 @@ sub json($) {
return from_json($file); return from_json($file);
} }
sub csv($) {
my $file = shift;
$file = `cat $file`;
return ($file);
}