Rebase PR

Author: w4ntun

testssl.sh

@@ -197,7 +197,11 @@ 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
 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
+<<<<<<< HEAD
 DNS_VIA_PROXY=${DNS_VIA_PROXY:-false}   # do DNS lookups via proxy. --ip=proxy reverses this
+=======
+DNS_VIA_PROXY=${DNS_VIA_PROXY:-true}    # do DNS lookups via proxy. --ip=* reverses this
+>>>>>>> 283c66f (fixed DNS via Proxy)
 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
 MAX_SOCKET_FAIL=${MAX_SOCKET_FAIL:-2}   # If this many failures for TCP socket connects are reached we terminate
@@ -22085,11 +22089,16 @@ determine_ip_addresses() {
      local ip4=""
      local ip6=""
 
+     if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
+          IPADDRs="$NODE"
+          return 0
+     fi
+
      ip4="$(get_a_record "$NODE")"
      ip6="$(get_aaaa_record "$NODE")"
      IP46ADDRs=$(newline_to_spaces "$ip4 $ip6")
 
-     if [[ -n "$CMDLINE_IP" ]]; then
+     if [[ -n "$CMDLINE_IP" ]] && [[ "$CMDLINE_IP" != "all" ]]; then
           # command line has supplied an IP address or "one"
           if [[ "$CMDLINE_IP" == one ]]; then
                # use first IPv6 or IPv4 address
@@ -22981,11 +22990,19 @@ display_rdns_etc() {
 datebanner() {
      local scan_time_f=""
      local node_banner=""
+<<<<<<< HEAD
 
      if [[ -n "$PROXY" ]] && "$DNS_VIA_PROXY"; then
             node_banner="$NODE:$PORT"
      else
             node_banner="$NODEIP:$PORT ($NODE)"
+=======
+     
+     if [[ -n "PROXY" ]] && $DNS_VIA_PROXY;then
+          node_banner="$NODE:$PORT"
+     else
+          node_banner="$NODEIP:$PORT ($NODE)"
+>>>>>>> 283c66f (fixed DNS via Proxy)
      fi
 
      if [[ "$1" =~ Done ]] ; then
@@ -24061,10 +24078,8 @@ parse_cmd_line() {
                --ip|--ip=*)
                     CMDLINE_IP="$(parse_opt_equal_sign "$1" "$2")"
                     [[ $? -eq 0 ]] && shift
-                    if [[ "$CMDLINE_IP" == proxy ]]; then
-                         DNS_VIA_PROXY=true
-                         unset CMDLINE_IP
-                    fi
+                    DNS_VIA_PROXY=false
+
                     # normalize any IPv6 address
                     CMDLINE_IP="${CMDLINE_IP//[/}"      # fix vim syntax highlighting "]
                     CMDLINE_IP="${CMDLINE_IP//]/}"
@@ -24950,6 +24965,7 @@ lets_roll() {
      [[ -z "$NODE" ]] && parse_hn_port "${URI}"        # NODE, URL_PATH, PORT, IPADDRs and IP46ADDR is set now
      prepare_logging
 
+<<<<<<< HEAD
      if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
           NODEIP="$NODE"
           lets_roll "${STARTTLS_PROTOCOL}"
@@ -24974,6 +24990,26 @@ lets_roll() {
                lets_roll "${STARTTLS_PROTOCOL}"
                RET=$?
           fi
+=======
+     determine_ip_addresses
+     if [[ $(count_words "$IPADDRs") -gt 1 ]]; then    # we have more than one ipv4 address to check
+          MULTIPLE_CHECKS=true
+          pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
+          for ip in $IPADDRs; do
+               draw_line "-" $((TERM_WIDTH * 2 / 3))
+               outln
+               NODEIP="$ip"
+               lets_roll "${STARTTLS_PROTOCOL}"
+               RET=$((RET + $?))                       # RET value per IP address
+          done
+          draw_line "-" $((TERM_WIDTH * 2 / 3))
+          outln
+          pr_bold "Done testing now all IP addresses (on port $PORT): "; outln "$IPADDRs"
+     else                                              # Just 1x ip4v to check, applies also if CMDLINE_IP was supplied
+          NODEIP="$IPADDRs"
+          lets_roll "${STARTTLS_PROTOCOL}"
+          RET=$?
+>>>>>>> 283c66f (fixed DNS via Proxy)
      fi
 
 exit $RET