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

Merge pull request #925 from seccubus/json_footer_breaks_json

Browse Source 
JSOn output is broken by the JSON footer in combination with mass mode
This commit is contained in:
Dirk Wetter 2017-12-07 09:59:58 +01:00 committed by GitHub
commit 7e62dc3192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testssl.sh
View File

@ -14534,6 +14534,7 @@ run_mass_testing() {
"$first" || fileout_separator # this is needed for appended output, see #687 "$first" || fileout_separator # this is needed for appended output, see #687
first=false first=false
cat "$TEMPDIR/jsonfile_child.json" >> "$JSONFILE" cat "$TEMPDIR/jsonfile_child.json" >> "$JSONFILE"
FIRST_FINDING=false
fi fi
done < "${FNAME}" done < "${FNAME}"
return $? return $?
@ -14555,6 +14556,7 @@ get_next_message_testing_parallel_result() {
# produced some JSON output. # produced some JSON output.
"$FIRST_JSON_OUTPUT" || fileout_separator # this is needed for appended output, see #687 "$FIRST_JSON_OUTPUT" || fileout_separator # this is needed for appended output, see #687
FIRST_JSON_OUTPUT=false FIRST_JSON_OUTPUT=false
FIRST_FINDING=false
cat "$TEMPDIR/jsonfile_$(printf "%08d" $NEXT_PARALLEL_TEST_TO_FINISH).json" >> "$JSONFILE" cat "$TEMPDIR/jsonfile_$(printf "%08d" $NEXT_PARALLEL_TEST_TO_FINISH).json" >> "$JSONFILE"
fi fi
"$CSVHEADER" && cat "$TEMPDIR/csvfile_$(printf "%08d" $NEXT_PARALLEL_TEST_TO_FINISH).csv" >> "$CSVFILE" "$CSVHEADER" && cat "$TEMPDIR/csvfile_$(printf "%08d" $NEXT_PARALLEL_TEST_TO_FINISH).csv" >> "$CSVFILE"