Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-06 00:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from AlGreed/2.9dev

Browse Source 
Better output for --MX in JSON-PRETTY
This commit is contained in:
Dirk Wetter 2017-01-29 10:40:23 +01:00 committed by GitHub
commit 1e16ac8ad6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testssl.sh
View File

@ -271,6 +271,7 @@ HEXDUMP=(hexdump -ve '16/1 "%02x " " \n"') # This is used to analyze the reply
HEXDUMPPLAIN=(hexdump -ve '1/1 "%.2x"') # Replaces both xxd -p and tr -cd '[:print:]' HEXDUMPPLAIN=(hexdump -ve '1/1 "%.2x"') # Replaces both xxd -p and tr -cd '[:print:]'
SERVER_COUNTER=0 # Counter for multiple servers SERVER_COUNTER=0 # Counter for multiple servers
MX_HOSTNAME="" # MX hostname
#################### SEVERITY #################### #################### SEVERITY ####################
INFO=0 INFO=0
@ -706,12 +707,14 @@ strip_quote() {
#################### JSON FILE FORMATING #################### #################### JSON FILE FORMATING ####################
fileout_pretty_json_header() { fileout_pretty_json_header() {
START_TIME=$(date +%s) START_TIME=$(date +%s)
target="$NODE"
$do_mx_all_ips && target="$URI"
echo -e " \"Invocation\" : \"$PROG_NAME $CMDLINE\", echo -e " \"Invocation\" : \"$PROG_NAME $CMDLINE\",
\"at\" : \"$HNAME:$OPENSSL_LOCATION\", \"at\" : \"$HNAME:$OPENSSL_LOCATION\",
\"version\" : \"$VERSION ${GIT_REL_SHORT:-$CVS_REL_SHORT} from $REL_DATE\", \"version\" : \"$VERSION ${GIT_REL_SHORT:-$CVS_REL_SHORT} from $REL_DATE\",
\"openssl\" : \"$OSSL_VER from $OSSL_BUILD_DATE\", \"openssl\" : \"$OSSL_VER from $OSSL_BUILD_DATE\",
\"target host\" : \"$NODE\", \"target host\" : \"$target\",
\"port\" : \"$PORT\", \"port\" : \"$PORT\",
\"startTime\" : \"$START_TIME\", \"startTime\" : \"$START_TIME\",
\"scanResult\" : [" \"scanResult\" : ["
@ -736,7 +739,7 @@ fileout_json_footer() {
fileout_json_section() { fileout_json_section() {
case $1 in case $1 in
1) 1)
echo -e " \"protocols\" : [" echo -e " \"protocols\" : ["
;; ;;
2) 2)
echo -e ",\n \"ciphers\" : [" echo -e ",\n \"ciphers\" : ["
@ -821,6 +824,7 @@ fileout_json_finding() {
echo -e " { echo -e " {
\"service\" : \"$finding\", \"service\" : \"$finding\",
\"ip\" : \"$NODEIP\"," >> "$JSONFILE" \"ip\" : \"$NODEIP\"," >> "$JSONFILE"
$do_mx_all_ips && echo -e " \"hostname\" : \"$MX_HOSTNAME\"," >> "$JSONFILE"
else else
("$FIRST_FINDING" && echo -n " {" >> "$JSONFILE") || echo -n ",{" >> "$JSONFILE" ("$FIRST_FINDING" && echo -n " {" >> "$JSONFILE") || echo -n ",{" >> "$JSONFILE"
echo -e -n "\n" >> "$JSONFILE" echo -e -n "\n" >> "$JSONFILE"
@ -11739,6 +11743,7 @@ run_mx_all_ips() {
STARTTLS_PROTOCOL="" # no starttls for Port 465, on all other ports we speak starttls STARTTLS_PROTOCOL="" # no starttls for Port 465, on all other ports we speak starttls
pr_bold "Testing now all MX records (on port $mxport): "; outln "$mxs" pr_bold "Testing now all MX records (on port $mxport): "; outln "$mxs"
for mx in $mxs; do for mx in $mxs; do
MX_HOSTNAME=$mx
draw_line "-" $((TERM_WIDTH * 2 / 3)) draw_line "-" $((TERM_WIDTH * 2 / 3))
outln outln
parse_hn_port "$mx:$mxport" parse_hn_port "$mx:$mxport"