mirrors/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-09-14 18:21:18 +02:00
Code Issues Projects Releases Wiki Activity

UI improvements IPv6

Browse Source 
* IPv6 addresses which won't be scanned will be put in round brackets to feedback th UI
* logic bug fixed which always said "Testing all IPv4 addresses (port $PORT):". Simplyfied the MULTIPLE_CHECKS output
This commit is contained in:
Dirk Wetter 2025-07-20 14:46:48 +02:00
parent d0505e5006
commit a05e697fd1
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
testssl.sh
View File

@ -22305,7 +22305,6 @@ shouldwedo_ipv6() {
local i=0 local i=0
"$do_ipv4_only" && return 0 "$do_ipv4_only" && return 0
while true; do while true; do
bash -c "exec 5<>/dev/tcp/$1/$PORT" &>/dev/null bash -c "exec 5<>/dev/tcp/$1/$PORT" &>/dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
@ -22316,7 +22315,6 @@ shouldwedo_ipv6() {
((i++)) ((i++))
[[ $i -ge $MAX_SOCKET_FAIL ]] && break [[ $i -ge $MAX_SOCKET_FAIL ]] && break
done done
if ! "$IPv6_OK"; then if ! "$IPv6_OK"; then
if "$do_ipv6_only"; then if "$do_ipv6_only"; then
connectivity_problem $i $MAX_SOCKET_FAIL "IPv6 connect problem" "repeated IPv6 connect problems when IPv6-only scan requested" connectivity_problem $i $MAX_SOCKET_FAIL "IPv6 connect problem" "repeated IPv6 connect problems when IPv6-only scan requested"
@ -22404,7 +22402,13 @@ determine_ip_addresses() {
[[ -z $IPADDRs2CHECK ]] && IPADDRs2CHECK="${addr}" || IPADDRs2CHECK="${IPADDRs2CHECK} ${addr}" [[ -z $IPADDRs2CHECK ]] && IPADDRs2CHECK="${addr}" || IPADDRs2CHECK="${IPADDRs2CHECK} ${addr}"
done done
fi fi
# If scanning IPV6 doesn't work, put the address to show in round brackets to
# signal the user / UI that those won't be scanned. We don't do that for IPv4, yet
for addr in $IPADDRs2SHOW; do
if is_ipv6addr $addr && ! "$IPv6_OK" ; then
IPADDRs2SHOW=${IPADDRs2SHOW/$addr/($addr)}
fi
done
return 0 return 0
} }
@ -23324,22 +23328,19 @@ run_mx_all_ips() {
determine_ip_addresses || continue determine_ip_addresses || continue
if [[ $(count_words "$IPADDRs2CHECK") -gt 1 ]]; then # we have more than one ipv4 address to check if [[ $(count_words "$IPADDRs2CHECK") -gt 1 ]]; then # we have more than one ipv4 address to check
MULTIPLE_CHECKS=true MULTIPLE_CHECKS=true
if [[ "$do_ipv4_only" ]]; then fi
pr_bold "Testing all IPv4 addresses (port $PORT): " if "$do_ipv4_only"; then
elif [[ "$do_ipv6_only" ]]; then pr_bold "Testing all IPv4 addresses (port $PORT): "
pr_bold "Testing all IPv6 addresses (port $PORT): " elif "$do_ipv6_only"; then
else pr_bold "Testing all IPv6 addresses (port $PORT): "
pr_bold "Testing all IP addresses (port $PORT): "
fi
outln "$IPADDRs2CHECK"
for ip in $IPADDRs2CHECK; do
NODEIP="$ip"
lets_roll "${STARTTLS_PROTOCOL}"
done
else else
pr_bold "Testing all IP addresses (port $PORT): "
fi
outln "$IPADDRs2CHECK"
for ip in $IPADDRs2CHECK; do
NODEIP="$ip" NODEIP="$ip"
lets_roll "${STARTTLS_PROTOCOL}" lets_roll "${STARTTLS_PROTOCOL}"
fi done
ret=$(($? + ret)) ret=$(($? + ret))
done done
draw_line "-" $((TERM_WIDTH * 2 / 3)) draw_line "-" $((TERM_WIDTH * 2 / 3))
@ -25270,31 +25271,27 @@ lets_roll() {
RET=$? RET=$?
else else
determine_ip_addresses determine_ip_addresses
if [[ $(count_words "$IPADDRs2CHECK") -gt 1 ]]; then # we have more than one ipv4 address to check if [[ $(count_words "$IPADDRs2CHECK") -gt 1 ]]; then
MULTIPLE_CHECKS=true MULTIPLE_CHECKS=true
if [[ "$do_ipv4_only" ]]; then fi
pr_bold "Testing all IPv4 addresses (port $PORT): " if "$do_ipv4_only"; then
elif [[ "$do_ipv6_only" ]]; then pr_bold "Testing all IPv4 addresses (port $PORT): "
pr_bold "Testing all IPv6 addresses (port $PORT): " elif "$do_ipv6_only"; then
else pr_bold "Testing all IPv6 addresses (port $PORT): "
pr_bold "Testing all IP addresses (port $PORT): " else
fi pr_bold "Testing all IP addresses (port $PORT): "
outln "$IPADDRs2CHECK" fi
for ip in $IPADDRs2CHECK; do outln "$IPADDRs2CHECK"
draw_line "-" $((TERM_WIDTH * 2 / 3)) for ip in $IPADDRs2CHECK; do
outln
NODEIP="$ip"
lets_roll "${STARTTLS_PROTOCOL}"
RET=$((RET + $?)) # RET value per IP address
done
draw_line "-" $((TERM_WIDTH * 2 / 3)) draw_line "-" $((TERM_WIDTH * 2 / 3))
outln outln
pr_bold "Done testing now all IP addresses (on port $PORT): "; outln "$IPADDRs2CHECK" NODEIP="$ip"
else # Just 1x ip4v to check, applies also if CMDLINE_IP was supplied
NODEIP="$IPADDRs2CHECK"
lets_roll "${STARTTLS_PROTOCOL}" lets_roll "${STARTTLS_PROTOCOL}"
RET=$? RET=$((RET + $?)) # RET value per IP address
fi done
draw_line "-" $((TERM_WIDTH * 2 / 3))
outln
pr_bold "Done testing now all IP addresses (on port $PORT): "; outln "$IPADDRs2CHECK"
fi fi
exit $RET exit $RET