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

FIX #749 and #751

Browse Source 
Additionally fix a probable cmd line parsing problem where an argument '--file' was supplied with '='
This commit is contained in:
Dirk 2017-05-19 17:00:30 +02:00
parent 83b3be5636
commit 041abd57ce
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
testssl.sh
View File

@ -12170,10 +12170,11 @@ create_mass_testing_cmdline() {
MASS_TESTING_CMDLINE=() MASS_TESTING_CMDLINE=()
[[ "$testing_type" =~ parallel ]] && read testing_type test_number <<< "$testing_type" [[ "$testing_type" =~ parallel ]] && read testing_type test_number <<< "$testing_type"
# Start by adding the elements from the global command line to the command # Start by adding the elements from the global command line to the command line for the
# line for the test. If run_mass_testing_parallel(), then modify the # test. If run_mass_testing_parallel(), then modify the command line so that, when
# command line so that, when required, each child process sends its test # required, each child process sends its test # results to a separate file. If a cmd
# results to a separate file. # uses '=' for supplying a value we just skip next parameter (we don't use 'parse_opt_equal_sign' here)
debugme echo "${CMDLINE_ARRAY[@]}"
for cmd in "${CMDLINE_ARRAY[@]}"; do for cmd in "${CMDLINE_ARRAY[@]}"; do
"$skip_next" && skip_next=false && continue "$skip_next" && skip_next=false && continue
if [[ "$cmd" == "--file"* ]]; then if [[ "$cmd" == "--file"* ]]; then
@ -12181,7 +12182,8 @@ create_mass_testing_cmdline() {
# line, but do include "--warnings=batch". # line, but do include "--warnings=batch".
MASS_TESTING_CMDLINE[nr_cmds]="--warnings=batch" MASS_TESTING_CMDLINE[nr_cmds]="--warnings=batch"
nr_cmds+=1 nr_cmds+=1
break # next is the file itself, as no '=' was supplied
[[ "$cmd" == '--file' ]] && skip_next=true
elif [[ "$testing_type" == "serial" ]]; then elif [[ "$testing_type" == "serial" ]]; then
MASS_TESTING_CMDLINE[nr_cmds]="$cmd" MASS_TESTING_CMDLINE[nr_cmds]="$cmd"
nr_cmds+=1 nr_cmds+=1
@ -12193,14 +12195,13 @@ create_mass_testing_cmdline() {
# directory, then just pass it on to the child processes. # directory, then just pass it on to the child processes.
if "$JSONHEADER"; then if "$JSONHEADER"; then
MASS_TESTING_CMDLINE[nr_cmds]="--jsonfile=$TEMPDIR/jsonfile_${test_number}.json" MASS_TESTING_CMDLINE[nr_cmds]="--jsonfile=$TEMPDIR/jsonfile_${test_number}.json"
# next is the jsonfile itself, as no '=' was supplied
[[ "$cmd" == --jsonfile ]] && skip_next=true [[ "$cmd" == --jsonfile ]] && skip_next=true
else else
MASS_TESTING_CMDLINE[nr_cmds]="$cmd" MASS_TESTING_CMDLINE[nr_cmds]="$cmd"
fi fi
;; ;;
--jsonfile-pretty|--jsonfile-pretty=*) --jsonfile-pretty|--jsonfile-pretty=*)
# Same as for --jsonfile
if "$JSONHEADER"; then if "$JSONHEADER"; then
MASS_TESTING_CMDLINE[nr_cmds]="--jsonfile-pretty=$TEMPDIR/jsonfile_${test_number}.json" MASS_TESTING_CMDLINE[nr_cmds]="--jsonfile-pretty=$TEMPDIR/jsonfile_${test_number}.json"
[[ "$cmd" == --jsonfile-pretty ]] && skip_next=true [[ "$cmd" == --jsonfile-pretty ]] && skip_next=true
@ -12209,7 +12210,6 @@ create_mass_testing_cmdline() {
fi fi
;; ;;
--csvfile|--csvfile=*) --csvfile|--csvfile=*)
# Same as for --jsonfile
if "$CSVHEADER"; then if "$CSVHEADER"; then
MASS_TESTING_CMDLINE[nr_cmds]="--csvfile=$TEMPDIR/csvfile_${test_number}.csv" MASS_TESTING_CMDLINE[nr_cmds]="--csvfile=$TEMPDIR/csvfile_${test_number}.csv"
[[ "$cmd" == --csvfile ]] && skip_next=true [[ "$cmd" == --csvfile ]] && skip_next=true
@ -12218,7 +12218,6 @@ create_mass_testing_cmdline() {
fi fi
;; ;;
--htmlfile|--htmlfile=*) --htmlfile|--htmlfile=*)
# Same as for --jsonfile
if "$HTMLHEADER"; then if "$HTMLHEADER"; then
MASS_TESTING_CMDLINE[nr_cmds]="--htmlfile=$TEMPDIR/htmlfile_${test_number}.html" MASS_TESTING_CMDLINE[nr_cmds]="--htmlfile=$TEMPDIR/htmlfile_${test_number}.html"
[[ "$cmd" == --htmlfile ]] && skip_next=true [[ "$cmd" == --htmlfile ]] && skip_next=true
@ -12234,15 +12233,16 @@ create_mass_testing_cmdline() {
fi fi
done done
# Now add the command line arguments for the specific test to the command # Now add the command line arguments for the specific test to the command line.
# line. Skip the first argument sent to this function, since it specifies # Skip the first argument sent to this function, since it specifies the type of testing being performed.
# the type of testing being performed.
shift shift
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
MASS_TESTING_CMDLINE[nr_cmds]="$1" MASS_TESTING_CMDLINE[nr_cmds]="$1"
nr_cmds+=1 nr_cmds+=1
shift shift
done done
return 0
} }
run_mass_testing() { run_mass_testing() {
@ -13126,7 +13126,7 @@ lets_roll() {
if "$EXPERIMENTAL"; then if "$EXPERIMENTAL"; then
run_mass_testing_parallel run_mass_testing_parallel
else else
run_mass_testing run_mass_testing
fi fi
exit $? exit $?
fi fi