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

Add cmdline options and more in flat JSON

Browse Source 
Also it changes a few identifiers in both JSON formats:

* Invocation --> cmdLine
* at --> scanHost
* version --> swVersion

In addition in JSON "startTime" was added. We haven't added the openssl version
yet.

Just tested for a single output file. Not testing for mass testing yet.

See #1745, #1803
This commit is contained in:
Dirk Wetter 2020-12-30 18:50:58 +01:00
parent a9f4bb5fb5
commit fa9dbfe1f1
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
testssl.sh
View File

@ -1176,7 +1176,7 @@ fileout_json_print_parameter() {
local parameter="$1" local parameter="$1"
local filler="$2" local filler="$2"
local value="$3" local value="$3"
local not_last="$4" local not_last="$4" # decides whether to use a trailing comma on a single line (not the whole object)
local spaces="" local spaces=""
"$do_json" && \ "$do_json" && \
@ -1239,6 +1239,7 @@ fileout_json_finding() {
fileout_pretty_json_banner() { fileout_pretty_json_banner() {
local target local target
#FIXME: is this \/ a relic?
if ! "$do_mass_testing"; then if ! "$do_mass_testing"; then
[[ -z "$NODE" ]] && parse_hn_port "${URI}" [[ -z "$NODE" ]] && parse_hn_port "${URI}"
# NODE, URL_PATH, PORT, IPADDR and IP46ADDR is set now --> wrong place # NODE, URL_PATH, PORT, IPADDR and IP46ADDR is set now --> wrong place
@ -1246,17 +1247,39 @@ fileout_pretty_json_banner() {
$do_mx_all_ips && target="$URI" $do_mx_all_ips && target="$URI"
fi fi
echo -e " \"Invocation\" : \"$PROG_NAME $CMDLINE\", echo -e " \"cmdLine\" : \"$PROG_NAME $CMDLINE\",
\"at\" : \"$HNAME:$OPENSSL_LOCATION\", \"scanHost\" : \"$HNAME:$OPENSSL_LOCATION\",
\"version\" : \"$VERSION $GIT_REL_SHORT\", \"swVersion\" : \"$VERSION $GIT_REL_SHORT\",
\"openssl\" : \"$OSSL_NAME $OSSL_VER from $OSSL_BUILD_DATE\", \"openssl\" : \"$OSSL_NAME $OSSL_VER from $OSSL_BUILD_DATE\",
\"startTime\" : \"$START_TIME\", \"startTime\" : \"$START_TIME\",
\"scanResult\" : [" \"scanResult\" : ["
} }
fileout_json_banner() {
# We also use a special header here as for JSON pretty. The "usual" $NODE/$NODEIP
# and PORT output which we could have used from fileout_json_finding() is not used.
# NODEIP is not set yet.
#
"$FIRST_FINDING" || echo -n "," >> "$JSONFILE"
echo -e " {" >> "$JSONFILE"
fileout_json_print_parameter "id" " " "$1" true
fileout_json_print_parameter "severity" " " "$2" true
fileout_json_print_parameter "finding" " " "$3" false
echo -e "\n }" >> "$JSONFILE"
fileout_separator
}
fileout_banner() { fileout_banner() {
if "$JSONHEADER"; then if "$JSONHEADER"; then
# "$do_json" && # here we maybe should add a banner, too if "$do_json" ; then
# We could have used a single function as for JSON pretty below
# which would be more consistent.
fileout_json_banner "cmdLine" "INFO" "$PROG_NAME $CMDLINE"
fileout_json_banner "swlVersion" "INFO" "$VERSION $GIT_REL_SHORT"
fileout_json_banner "scanHost" "INFO" "$HNAME:$OPENSSL_LOCATION"
fileout_json_banner "startTime" "INFO" "$START_TIME"
fi
"$do_pretty_json" && FIRST_FINDING=true && (printf "%s\n" "$(fileout_pretty_json_banner)") >> "$JSONFILE" "$do_pretty_json" && FIRST_FINDING=true && (printf "%s\n" "$(fileout_pretty_json_banner)") >> "$JSONFILE"
fi fi
} }