Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-09 04:02:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adapt variable naming (datetime_started now)

Browse Source
This commit is contained in:
Jan Dvorak
2025-09-26 12:18:44 +02:00
parent 67aba03a41
commit e0009cf0cb
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
testssl.sh
View File

@ -1453,7 +1453,7 @@ fileout() {
json_header() { json_header() {
local datetime_filename_part="$1" local datetime_started="$1"
local fname_prefix local fname_prefix
local filename_provided=false local filename_provided=false
@ -1482,9 +1482,9 @@ json_header() {
fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}" fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}"
fi fi
if [[ -z "$JSONFILE" ]]; then if [[ -z "$JSONFILE" ]]; then
JSONFILE="$fname_prefix-${datetime_filename_part}.json" JSONFILE="$fname_prefix-${datetime_started}.json"
elif [[ -d "$JSONFILE" ]]; then elif [[ -d "$JSONFILE" ]]; then
JSONFILE="$JSONFILE/${fname_prefix}-${datetime_filename_part}.json" JSONFILE="$JSONFILE/${fname_prefix}-${datetime_started}.json"
fi fi
# Silently reset APPEND var if the file doesn't exist as otherwise it won't be created # Silently reset APPEND var if the file doesn't exist as otherwise it won't be created
if "$APPEND" && [[ ! -s "$JSONFILE" ]]; then if "$APPEND" && [[ ! -s "$JSONFILE" ]]; then
@ -1505,7 +1505,7 @@ json_header() {
csv_header() { csv_header() {
local datetime_filename_part="$1" local datetime_started="$1"
local fname_prefix local fname_prefix
local filename_provided=false local filename_provided=false
@ -1531,9 +1531,9 @@ csv_header() {
fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}" fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}"
fi fi
if [[ -z "$CSVFILE" ]]; then if [[ -z "$CSVFILE" ]]; then
CSVFILE="${fname_prefix}-${datetime_filename_part}.csv" CSVFILE="${fname_prefix}-${datetime_started}.csv"
elif [[ -d "$CSVFILE" ]]; then elif [[ -d "$CSVFILE" ]]; then
CSVFILE="$CSVFILE/${fname_prefix}-${datetime_filename_part}.csv" CSVFILE="$CSVFILE/${fname_prefix}-${datetime_started}.csv"
fi fi
# Silently reset APPEND var if the file doesn't exist as otherwise it won't be created # Silently reset APPEND var if the file doesn't exist as otherwise it won't be created
if "$APPEND" && [[ ! -s "$CSVFILE" ]]; then if "$APPEND" && [[ ! -s "$CSVFILE" ]]; then
@ -1560,7 +1560,7 @@ csv_header() {
################# END JSON file functions. START HTML functions #################### ################# END JSON file functions. START HTML functions ####################
html_header() { html_header() {
local datetime_filename_part="$1" local datetime_started="$1"
local fname_prefix local fname_prefix
local filename_provided=false local filename_provided=false
@ -1589,9 +1589,9 @@ html_header() {
fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}" fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}"
fi fi
if [[ -z "$HTMLFILE" ]]; then if [[ -z "$HTMLFILE" ]]; then
HTMLFILE="$fname_prefix-${datetime_filename_part}.html" HTMLFILE="$fname_prefix-${datetime_started}.html"
elif [[ -d "$HTMLFILE" ]]; then elif [[ -d "$HTMLFILE" ]]; then
HTMLFILE="$HTMLFILE/$fname_prefix-${datetime_filename_part}.html" HTMLFILE="$HTMLFILE/$fname_prefix-${datetime_started}.html"
fi fi
# Silently reset APPEND var if the file doesn't exist as otherwise it won't be created # Silently reset APPEND var if the file doesn't exist as otherwise it won't be created
if "$APPEND" && [[ ! -s "$HTMLFILE" ]]; then if "$APPEND" && [[ ! -s "$HTMLFILE" ]]; then
@ -1639,7 +1639,7 @@ html_footer() {
################# END HTML file functions #################### ################# END HTML file functions ####################
prepare_logging() { prepare_logging() {
local datetime_filename_part="$1" local datetime_started="$1"
# arg2: for testing mx records name we put a name of logfile in here, otherwise we get strange file names # arg2: for testing mx records name we put a name of logfile in here, otherwise we get strange file names
local fname_prefix="$2" local fname_prefix="$2"
local filename_provided=false local filename_provided=false
@ -1658,10 +1658,10 @@ prepare_logging() {
[[ -z "$fname_prefix" ]] && fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}" [[ -z "$fname_prefix" ]] && fname_prefix="${FNAME_PREFIX}${NODE}_p${PORT}"
if [[ -z "$LOGFILE" ]]; then if [[ -z "$LOGFILE" ]]; then
LOGFILE="$fname_prefix-${datetime_filename_part}.log" LOGFILE="$fname_prefix-${datetime_started}.log"
elif [[ -d "$LOGFILE" ]]; then elif [[ -d "$LOGFILE" ]]; then
# actually we were instructed to place all files in a DIR instead of the current working dir # actually we were instructed to place all files in a DIR instead of the current working dir
LOGFILE="$LOGFILE/$fname_prefix-${datetime_filename_part}.log" LOGFILE="$LOGFILE/$fname_prefix-${datetime_started}.log"
else else
: # just for clarity: a log file was specified, no need to do anything else : # just for clarity: a log file was specified, no need to do anything else
fi fi
@ -23416,7 +23416,7 @@ draw_line() {
run_mx_all_ips() { run_mx_all_ips() {
local datetime_filename_part="$1" local datetime_started="$1"
local mxs mx local mxs mx
local mxport local mxport
local -i ret=0 local -i ret=0
@ -23433,9 +23433,9 @@ run_mx_all_ips() {
fi fi
mxport=${3:-25} mxport=${3:-25}
if [[ -n "$LOGFILE" ]] || [[ -n "$PARENT_LOGFILE" ]]; then if [[ -n "$LOGFILE" ]] || [[ -n "$PARENT_LOGFILE" ]]; then
prepare_logging "${datetime_filename_part}" prepare_logging "${datetime_started}"
else else
prepare_logging "${datetime_filename_part}" "${FNAME_PREFIX}mx-$1" prepare_logging "${datetime_started}" "${FNAME_PREFIX}mx-$1"
fi fi
if [[ -n "$mxs" ]] && [[ "$mxs" != ' ' ]]; then if [[ -n "$mxs" ]] && [[ "$mxs" != ' ' ]]; then
[[ $(count_words "$mxs") -gt 1 ]] && MULTIPLE_CHECKS=true [[ $(count_words "$mxs") -gt 1 ]] && MULTIPLE_CHECKS=true
@ -25329,7 +25329,7 @@ lets_roll() {
RET=0 # this is a global as we can have a function main(), see #705. Should we toss then all local $ret? RET=0 # this is a global as we can have a function main(), see #705. Should we toss then all local $ret?
ip="" ip=""
stopwatch start stopwatch start
DATETIME_FILENAME_PART="$(date +"%Y%m%d-%H%M")" datetime_started="$(date +"%Y%m%d-%H%M")"
lets_roll init lets_roll init
initialize_globals initialize_globals
@ -25340,9 +25340,9 @@ lets_roll() {
# html_header() needs to be called early! Otherwise if html_out() is called before html_header() and the # html_header() needs to be called early! Otherwise if html_out() is called before html_header() and the
# command line contains --htmlfile <htmlfile> or --html, it'll make problems with html output, see #692. # command line contains --htmlfile <htmlfile> or --html, it'll make problems with html output, see #692.
# json_header and csv_header could be called later but for context reasons we'll leave it here # json_header and csv_header could be called later but for context reasons we'll leave it here
html_header "${DATETIME_FILENAME_PART}" html_header "${datetime_started}"
json_header "${DATETIME_FILENAME_PART}" json_header "${datetime_started}"
csv_header "${DATETIME_FILENAME_PART}" csv_header "${datetime_started}"
get_install_dir get_install_dir
# see #705, we need to source TLS_DATA_FILE here instead of in get_install_dir(), see #705 # see #705, we need to source TLS_DATA_FILE here instead of in get_install_dir(), see #705
[[ -r "$TLS_DATA_FILE" ]] && . "$TLS_DATA_FILE" [[ -r "$TLS_DATA_FILE" ]] && . "$TLS_DATA_FILE"
@ -25367,7 +25367,7 @@ lets_roll() {
fileout_banner fileout_banner
if "$do_mass_testing"; then if "$do_mass_testing"; then
prepare_logging "${DATETIME_FILENAME_PART}" prepare_logging "${datetime_started}"
if [[ "$MASS_TESTING_MODE" == parallel ]]; then if [[ "$MASS_TESTING_MODE" == parallel ]]; then
run_mass_testing_parallel run_mass_testing_parallel
else else
@ -25382,12 +25382,12 @@ lets_roll() {
#FIXME: do we need this really here? #FIXME: do we need this really here?
count_do_variables # if we have just 1x "do_*" --> we do a standard run -- otherwise just the one specified count_do_variables # if we have just 1x "do_*" --> we do a standard run -- otherwise just the one specified
[[ $? -eq 1 ]] && set_scanning_defaults [[ $? -eq 1 ]] && set_scanning_defaults
run_mx_all_ips "${DATETIME_FILENAME_PART}" "${URI}" $PORT # we should reduce run_mx_all_ips to what's necessary as below we have similar code run_mx_all_ips "${datetime_started}" "${URI}" $PORT # we should reduce run_mx_all_ips to what's necessary as below we have similar code
exit $? exit $?
fi fi
[[ -z "$NODE" ]] && parse_hn_port "${URI}" # NODE, URL_PATH, PORT, IPADDRs2CHECK and IPADDRs2SHOW is set now [[ -z "$NODE" ]] && parse_hn_port "${URI}" # NODE, URL_PATH, PORT, IPADDRs2CHECK and IPADDRs2SHOW is set now
prepare_logging "${DATETIME_FILENAME_PART}" prepare_logging "${datetime_started}"
if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
NODEIP="$NODE" NODEIP="$NODE"