Merge pull request #3042 from testssl/grhza-3.3dev

Improve PR #3041

testssl.sh

@@ -10268,13 +10268,17 @@ certificate_info() {
 
      out "$indent"; pr_bold " DNS CAA RR"; out " (experimental)    "
      jsonID="DNS_CAArecord"
+     if is_ipv4addr "$NODE" || is_ipv6addr "$NODE"; then
+          out "not checked (IP address scan -- no domain to query)"
+          fileout "${jsonID}${json_postfix}" "INFO" "not checked (IP address scan)"
+     else
           caa_node="$NODE"
           caa=""
           while [[ -z "$caa" ]] &&  [[ -n "$caa_node" ]]; do
+               [[ $caa_node =~ '.'$ ]] || caa_node+="."     # force FQDN to prevent dig search-domain expansion
                caa="$(get_caa_rr_record $caa_node)"
                tmp=${PIPESTATUS[@]}
                [[ $DEBUG -ge 4 ]] && echo "get_caa_rr_record: $tmp"
-          [[ $caa_node =~ '.'$ ]] || caa_node+="."
                caa_node=${caa_node#*.}
           done
           if [[ -n "$caa" ]]; then
@@ -10302,6 +10306,7 @@ certificate_info() {
                pr_svrty_low "not offered"
                fileout "${jsonID}${json_postfix}" "LOW" "--"
           fi
+     fi
      outln
 
      out "$indent"; pr_bold " Certificate Transparency     ";
@@ -24673,6 +24678,7 @@ parse_cmd_line() {
      local outfile_arg=""
      local cipher_mapping
      local -i subret=0
+     local tmp=""
 
      CMDLINE="$(create_cmd_line_string "${CMDLINE_ARRAY[@]}")"
      CMDLINE_PARSED=false
@@ -25352,6 +25358,14 @@ parse_cmd_line() {
           set_rating_state
      fi
 
+     tmp=${URI#*//}      # remove https://
+     if [[ ! $tmp =~ [a-zA-Z] ]]; then
+          # No letters indicate it's not a name
+          outln
+          pr_warning " Warning: Target is not a server name: results may be completely wrong, at minimum trust may show false results."
+          fileout "ip_scan_warning" "WARN" "Target is not a server name: results may be completely wrong, at minimum trust may show false results."
+     fi
+
      CMDLINE_PARSED=true
 }