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

Merge pull request #293 from SietsevanderMolen/fix-json

Browse Source 
fix json output
This commit is contained in:
Dirk Wetter 2016-02-12 15:11:45 +01:00
commit 79445ebe5b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testssl.sh
View File

@ -453,23 +453,22 @@ fileout_footer() {
} }
fileout() { # ID, SEVERITY, FINDING fileout() { # ID, SEVERITY, FINDING
local finding="$5" local finding=$(strip_lf "$(newline_to_spaces "$(strip_quote "$3")")")
if "$do_json"; then if "$do_json"; then
"$FIRST_FINDING" || echo "," >> $JSONFILE "$FIRST_FINDING" || echo "," >> $JSONFILE
finding=$(strip_quote "$3")
echo -e " echo -e "
{ {
'id' : '$1', \"id\" : \"$1\",
'ip' : '$NODE/$NODEIP', \"ip\" : \"$NODE/$NODEIP\",
'port' : '$PORT', \"port\" : \"$PORT\",
'severity' : '$2', \"severity\" : \"$2\",
'finding' : '$finding' \"finding\" : \"$finding\"
}" >> $JSONFILE }" >> $JSONFILE
fi fi
# does the following do any sanitization? # does the following do any sanitization?
if "$do_csv"; then if "$do_csv"; then
echo -e \""$1\"",\"$NODE/$NODEIP\",\"$PORT"\",\""$2"\",\"$(strip_quote "$3")\"" >>$CSVFILE echo -e \""$1\"",\"$NODE/$NODEIP\",\"$PORT"\",\""$2"\",\""$finding"\"" >>$CSVFILE
fi fi
"$FIRST_FINDING" && FIRST_FINDING=false "$FIRST_FINDING" && FIRST_FINDING=false
} }