Merge branch '3.1dev' of https://github.com/w4ntun/testssl.sh into w4ntun-3.1dev
This commit is contained in:
commit
581788ff39
24
testssl.sh
24
testssl.sh
|
@ -196,7 +196,7 @@ TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}" # If you run testssl.sh and it
|
||||||
CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # You can have your CA stores some place else
|
CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # You can have your CA stores some place else
|
||||||
EXPERIMENTAL=${EXPERIMENTAL:-false} # a development hook which allows us to disable code
|
EXPERIMENTAL=${EXPERIMENTAL:-false} # a development hook which allows us to disable code
|
||||||
PROXY_WAIT=${PROXY_WAIT:-20} # waiting at max 20 seconds for socket reply through proxy
|
PROXY_WAIT=${PROXY_WAIT:-20} # waiting at max 20 seconds for socket reply through proxy
|
||||||
DNS_VIA_PROXY=${DNS_VIA_PROXY:-true} # do DNS lookups via proxy. --ip=proxy reverses this
|
DNS_VIA_PROXY=${DNS_VIA_PROXY:-false} # do DNS lookups via proxy. --ip=proxy reverses this
|
||||||
IGN_OCSP_PROXY=${IGN_OCSP_PROXY:-false} # Also when --proxy is supplied it is ignored when testing for revocation via OCSP via --phone-out
|
IGN_OCSP_PROXY=${IGN_OCSP_PROXY:-false} # Also when --proxy is supplied it is ignored when testing for revocation via OCSP via --phone-out
|
||||||
HEADER_MAXSLEEP=${HEADER_MAXSLEEP:-5} # we wait this long before killing the process to retrieve a service banner / http header
|
HEADER_MAXSLEEP=${HEADER_MAXSLEEP:-5} # we wait this long before killing the process to retrieve a service banner / http header
|
||||||
MAX_SOCKET_FAIL=${MAX_SOCKET_FAIL:-2} # If this many failures for TCP socket connects are reached we terminate
|
MAX_SOCKET_FAIL=${MAX_SOCKET_FAIL:-2} # If this many failures for TCP socket connects are reached we terminate
|
||||||
|
@ -22040,12 +22040,19 @@ display_rdns_etc() {
|
||||||
|
|
||||||
datebanner() {
|
datebanner() {
|
||||||
local scan_time_f=""
|
local scan_time_f=""
|
||||||
|
local node_banner=""
|
||||||
|
|
||||||
|
if [[ -n "PROXY" ]] && $DNS_VIA_PROXY;then
|
||||||
|
node_banner="$NODE:$PORT"
|
||||||
|
else
|
||||||
|
node_banner="$NODEIP:$PORT ($NODE)"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "$1" =~ Done ]] ; then
|
if [[ "$1" =~ Done ]] ; then
|
||||||
scan_time_f="$(printf "%04ss" "$SCAN_TIME")" # 4 digits because of windows
|
scan_time_f="$(printf "%04ss" "$SCAN_TIME")" # 4 digits because of windows
|
||||||
pr_reverse "$1 $(date +%F) $(date +%T) [$scan_time_f] -->> $NODEIP:$PORT ($NODE) <<--"
|
pr_reverse "$1 $(date +%F) $(date +%T) [$scan_time_f] -->> $node_banner <<--"
|
||||||
else
|
else
|
||||||
pr_reverse "$1 $(date +%F) $(date +%T) -->> $NODEIP:$PORT ($NODE) <<--"
|
pr_reverse "$1 $(date +%F) $(date +%T) -->> $node_banner <<--"
|
||||||
fi
|
fi
|
||||||
outln "\n"
|
outln "\n"
|
||||||
[[ "$1" =~ Start ]] && display_rdns_etc
|
[[ "$1" =~ Start ]] && display_rdns_etc
|
||||||
|
@ -23761,7 +23768,6 @@ lets_roll() {
|
||||||
fi
|
fi
|
||||||
stopwatch initialized
|
stopwatch initialized
|
||||||
|
|
||||||
[[ -z "$NODEIP" ]] && fatal "$NODE doesn't resolve to an IP address" $ERR_DNSLOOKUP
|
|
||||||
nodeip_to_proper_ip6
|
nodeip_to_proper_ip6
|
||||||
reset_hostdepended_vars
|
reset_hostdepended_vars
|
||||||
determine_rdns # Returns always zero or has already exited if fatal error occurred
|
determine_rdns # Returns always zero or has already exited if fatal error occurred
|
||||||
|
@ -23964,9 +23970,12 @@ lets_roll() {
|
||||||
[[ -z "$NODE" ]] && parse_hn_port "${URI}" # NODE, URL_PATH, PORT, IPADDRs and IP46ADDR is set now
|
[[ -z "$NODE" ]] && parse_hn_port "${URI}" # NODE, URL_PATH, PORT, IPADDRs and IP46ADDR is set now
|
||||||
prepare_logging
|
prepare_logging
|
||||||
|
|
||||||
if ! determine_ip_addresses; then
|
if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
|
||||||
fatal "No IP address could be determined" $ERR_DNSLOOKUP
|
NODEIP="$NODE"
|
||||||
fi
|
lets_roll "${STARTTLS_PROTOCOL}"
|
||||||
|
RET=$?
|
||||||
|
else
|
||||||
|
determine_ip_addresses
|
||||||
if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
|
if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
|
||||||
MULTIPLE_CHECKS=true
|
MULTIPLE_CHECKS=true
|
||||||
pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
|
pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
|
||||||
|
@ -23985,5 +23994,6 @@ lets_roll() {
|
||||||
lets_roll "${STARTTLS_PROTOCOL}"
|
lets_roll "${STARTTLS_PROTOCOL}"
|
||||||
RET=$?
|
RET=$?
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
exit $RET
|
exit $RET
|
||||||
|
|
Loading…
Reference in New Issue