Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-06 00:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wrap long lines in display_rdns_etc()

Browse Source 
Some sites have a long list of IP addresses and some IP addresses have a long list of DNS names that map to them.

This PR changes `display_rdns_etc()` to use `out_row_aligned_max_width()` to print the other IP addresses in `$IP46ADDRs` and to print `$rDNS`.
This commit is contained in:
David Cooper 2017-02-21 13:36:23 -05:00 committed by GitHub
parent be079acb5e
commit 62db2ae6bf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testssl.sh
View File

@ -12176,7 +12176,7 @@ determine_service() {
display_rdns_etc() { display_rdns_etc() {
local ip local ip further_ip_addrs=""
local nodeip="$(tr -d '[]' <<< $NODEIP)" # for displaying IPv6 addresses we don't need [] local nodeip="$(tr -d '[]' <<< $NODEIP)" # for displaying IPv6 addresses we don't need []
@ -12185,14 +12185,15 @@ display_rdns_etc() {
outln "$PROXYIP:$PROXYPORT " outln "$PROXYIP:$PROXYPORT "
fi fi
if [[ $(count_words "$IP46ADDRs") -gt 1 ]]; then if [[ $(count_words "$IP46ADDRs") -gt 1 ]]; then
out " further IP addresses: $CORRECT_SPACES" out " further IP addresses: $CORRECT_SPACES"
for ip in $IP46ADDRs; do for ip in $IP46ADDRs; do
if [[ "$ip" == "$NODEIP" ]] || [[ "[$ip]" == "$NODEIP" ]]; then if [[ "$ip" == "$NODEIP" ]] || [[ "[$ip]" == "$NODEIP" ]]; then
continue continue
else else
out " $ip" further_ip_addrs+="$ip "
fi fi
done done
out_row_aligned_max_width "$further_ip_addrs" " " $TERM_WIDTH out
outln outln
fi fi
if "$LOCAL_A"; then if "$LOCAL_A"; then
@ -12201,7 +12202,8 @@ display_rdns_etc() {
outln " A record via $CORRECT_SPACES supplied IP \"$CMDLINE_IP\"" outln " A record via $CORRECT_SPACES supplied IP \"$CMDLINE_IP\""
fi fi
if [[ -n "$rDNS" ]]; then if [[ -n "$rDNS" ]]; then
printf " %-23s %s" "rDNS ($nodeip):" "$rDNS" printf " %-23s %s" "rDNS ($nodeip):"
out_row_aligned_max_width "$rDNS" " " $TERM_WIDTH out
fi fi
} }