From a1289d1ec3f6cb2ec3e19c7b774b216d06b099a9 Mon Sep 17 00:00:00 2001
From: David Cooper <david.cooper@nist.gov>
Date: Thu, 25 Apr 2019 14:55:13 -0400
Subject: [PATCH] The -outfile, -oa, -outFile, and -oA options should accept a
 directory

Currently the -outfile, -oa, -outFile, and -oA assume that <fname> being provided is to be used as a filename, unless it is "auto." However, all of the individual options (e.g., --logfile) allow for a directory name to be provided instead of a file name.

This PR changes the handling of the -outfile, -oa, -outFile, and -oA options so that if a directory name is provided, the files are created in that directory.
---
 testssl.sh | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/testssl.sh b/testssl.sh
index 6e5162b..f5e12d0 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -16591,7 +16591,8 @@ file output options (can also be preset via environment variables)
      --csvfile|-oC <csvfile>       additional output as CSV to the specified file or directory, similar to --logfile
      --html                        additional output as HTML to file '\${NODE}-p\${port}\${YYYYMMDD-HHMM}.html'
      --htmlfile|-oH <htmlfile>     additional output as HTML to the specified file or directory, similar to --logfile
-     --out(f,F)ile|-oa/-oA <fname> log to a LOG,JSON,CSV,HTML file (see nmap). -oA/-oa: pretty/flat JSON. "auto" uses '\${NODE}-p\${port}\${YYYYMMDD-HHMM}'
+     --out(f,F)ile|-oa/-oA <fname> log to a LOG,JSON,CSV,HTML file (see nmap). -oA/-oa: pretty/flat JSON. 
+                                   "auto" uses '\${NODE}-p\${port}\${YYYYMMDD-HHMM}'. If fname if a dir uses 'dir/\${NODE}-p\${port}\${YYYYMMDD-HHMM}'
      --hints                       additional hints to findings
      --severity <severity>         severities with lower level will be filtered for CSV+JSON, possible values <LOW|MEDIUM|HIGH|CRITICAL>
      --append                      if (non-empty) <logfile>, <csvfile>, <jsonfile> or <htmlfile> exists, append to file. Omits any header
@@ -18879,10 +18880,17 @@ parse_cmd_line() {
                     ( "$do_html" || "$do_json" || "$do_pretty_json" || "$do_csv" || "$do_logging" ) && fatal "check your arguments four multiple file output options" $ERR_CMDLINE
                     outfile_arg="$(parse_opt_equal_sign "$1" "$2")"
                     if [[ "$outfile_arg" != "auto" ]]; then
-                         HTMLFILE="$outfile_arg.html"
-                         CSVFILE="$outfile_arg.csv"
-                         JSONFILE="$outfile_arg.json"
-                         LOGFILE="$outfile_arg.log"
+                         if [[ -d "$outfile_arg" ]]; then
+                              HTMLFILE="$outfile_arg"
+                              CSVFILE="$outfile_arg"
+                              JSONFILE="$outfile_arg"
+                              LOGFILE="$outfile_arg"
+                         else
+                              HTMLFILE="$outfile_arg.html"
+                              CSVFILE="$outfile_arg.csv"
+                              JSONFILE="$outfile_arg.json"
+                              LOGFILE="$outfile_arg.log"
+                         fi
                     fi
                     [[ $? -eq 0 ]] && shift
                     do_html=true
@@ -18894,10 +18902,17 @@ parse_cmd_line() {
                     ( "$do_html" || "$do_json" || "$do_pretty_json" || "$do_csv" || "$do_logging" ) && fatal "check your arguments four multiple file output options" $ERR_CMDLINE
                     outfile_arg="$(parse_opt_equal_sign "$1" "$2")"
                     if [[ "$outfile_arg" != "auto" ]]; then
-                         HTMLFILE="$outfile_arg.html"
-                         CSVFILE="$outfile_arg.csv"
-                         JSONFILE="$outfile_arg.json"
-                         LOGFILE="$outfile_arg.log"
+                         if [[ -d "$outfile_arg" ]]; then
+                              HTMLFILE="$outfile_arg"
+                              CSVFILE="$outfile_arg"
+                              JSONFILE="$outfile_arg"
+                              LOGFILE="$outfile_arg"
+                         else
+                              HTMLFILE="$outfile_arg.html"
+                              CSVFILE="$outfile_arg.csv"
+                              JSONFILE="$outfile_arg.json"
+                              LOGFILE="$outfile_arg.log"
+                         fi
                     fi
                     [[ $? -eq 0 ]] && shift
                     do_html=true