Merge pull request #293 from SietsevanderMolen/fix-json

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

View File

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