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

- sanity check whether URL/URI is last arg

Browse Source 
- typo fix while logging (fall back CVS tags weren't written
This commit is contained in:
Dirk
2015-12-08 13:31:52 +01:00
parent 2e0e7b83d5
commit 041b77c5ed
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
testssl.sh
View File

@@ -4361,7 +4361,7 @@ parse_hn_port() {
fi fi
>$LOGFILE >$LOGFILE
outln "## Scan started as: \"$PROG_NAME $CMDLINE\"" >>${LOGFILE} outln "## Scan started as: \"$PROG_NAME $CMDLINE\"" >>${LOGFILE}
outln "## ($VERSION ${GIT_REL_SHORT:-CVS_REL_SHORT} from $REL_DATE, at $HNAME:$OPENSSL_LOCATION)\n" >>${LOGFILE} outln "## ($VERSION ${GIT_REL_SHORT:-$CVS_REL_SHORT} from $REL_DATE, at $HNAME:$OPENSSL_LOCATION)\n" >>${LOGFILE}
exec > >(tee -a ${LOGFILE}) exec > >(tee -a ${LOGFILE})
# not decided yet. Maybe good to have a separate file or none at all # not decided yet. Maybe good to have a separate file or none at all
#exec 2> >(tee -a ${LOGFILE} >&2) #exec 2> >(tee -a ${LOGFILE} >&2)
@@ -4787,6 +4787,8 @@ display_rdns_etc() {
fi fi
if "$LOCAL_A"; then if "$LOCAL_A"; then
outln " A record via /etc/hosts " outln " A record via /etc/hosts "
elif [[ -n "$CMDLINE_IP" ]]; then
outln " A record via --ip=$CMDLINE_IP parameter"
fi fi
if [[ -n "$rDNS" ]]; then if [[ -n "$rDNS" ]]; then
if $HAS_IPv6; then if $HAS_IPv6; then
@@ -4849,6 +4851,28 @@ mx_all_ips() {
return $ret return $ret
} }
run_mass_testing_parallel() {
local cmdline=""
if [[ ! -r "$FNAME" ]] && $IKNOW_FNAME; then
fatal "Can't read file \"$FNAME\"" "-1"
fi
pr_reverse "====== Running in parallel file batch mode with file=\"$FNAME\" ======"; outln
outln "(output is in ....\n)"
while read cmdline; do
cmdline=$(filter_input "$cmdline")
[[ -z "$cmdline" ]] && continue
[[ "$cmdline" == "EOF" ]] && break
echo "$0 -q $cmdline"
draw_line "=" $((TERM_DWITH / 2)); outln;
determine_logfile
$0 -q $cmdline >$LOGFILE &
sleep $PARALLEL_SLEEP
done < "$FNAME"
exit $?
}
run_mass_testing() { run_mass_testing() {
local cmdline="" local cmdline=""
@@ -5225,6 +5249,8 @@ parse_cmd_line() {
else else
# left off here is the URI # left off here is the URI
URI="$1" URI="$1"
# parameter after URI supplied:
[[ -n "$2" ]] && echo && fatal "URI comes last" "1"
fi fi
[[ "$DEBUG" -ge 5 ]] && debug_globals [[ "$DEBUG" -ge 5 ]] && debug_globals
@@ -5377,4 +5403,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.423 2015/11/28 16:33:09 dirkw Exp $ # $Id: testssl.sh,v 1.424 2015/12/08 12:31:50 dirkw Exp $