dns ping：修复 bug

1. 修复没有正确设置 tls ServerName 的问题
2. 允许跳过 tls 证书验证
3. 手动指定域名时，不必带有末尾的 "."

Author: wzv5

cmd/pping/cmd/dns.go

@@ -12,12 +12,13 @@ import (
 )
 
 type dnsFlags struct {
-	port    uint16
-	timeout time.Duration
-	tcp     bool
-	tls     bool
-	qtype   string
-	domain  string
+	port     uint16
+	timeout  time.Duration
+	tcp      bool
+	tls      bool
+	qtype    string
+	domain   string
+	insecure bool
 }
 
 var dnsflag dnsFlags
@@ -37,6 +38,7 @@ func addDnsCommand() {
 	cmd.Flags().BoolVar(&dnsflag.tls, "tls", false, "use DNS-over-TLS")
 	cmd.Flags().StringVar(&dnsflag.qtype, "type", "NS", "A, AAAA, NS, ...")
 	cmd.Flags().StringVar(&dnsflag.domain, "domain", ".", "domain")
+	cmd.Flags().BoolVarP(&dnsflag.insecure, "insecure", "k", false, "allow insecure server connections")
 
 	rootCmd.AddCommand(cmd)
 }
@@ -63,5 +65,6 @@ func rundns(cmd *cobra.Command, args []string) error {
 	p.Net = Net
 	p.Type = dnsflag.qtype
 	p.Domain = dnsflag.domain
+	p.Insecure = dnsflag.insecure
 	return RunPing(p)
 }

pkg/ping/dns.go

@@ -2,10 +2,12 @@ package ping
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/miekg/dns"
@@ -47,6 +49,9 @@ type DnsPing struct {
 	// 查询域名，默认 .
 	Domain string
 
+	// Net 为 tcp-tls 时，是否跳过证书验证
+	Insecure bool
+
 	ip net.IP
 }
 
@@ -78,12 +83,19 @@ func (this *DnsPing) PingContext(ctx context.Context) IPingResult {
 	if !ok {
 		return &DnsPingResult{0, errors.New("unknown type"), nil}
 	}
+	if !strings.HasSuffix(this.Domain, ".") {
+		this.Domain += "."
+	}
 	msg.SetQuestion(this.Domain, qtype)
 	msg.MsgHdr.RecursionDesired = true
 
 	client := &dns.Client{}
 	client.Net = this.Net
 	client.Timeout = this.Timeout
+	client.TLSConfig = &tls.Config{
+		ServerName:         this.host,
+		InsecureSkipVerify: this.Insecure,
+	}
 
 	t0 := time.Now()
 	r, _, err := client.ExchangeContext(ctx, msg, net.JoinHostPort(ip.String(), strconv.Itoa(int(this.Port))))
@@ -98,13 +110,14 @@ func (this *DnsPing) PingContext(ctx context.Context) IPingResult {
 
 func NewDnsPing(host string, timeout time.Duration) *DnsPing {
 	return &DnsPing{
-		host:    host,
-		Port:    53,
-		Timeout: timeout,
-		Net:     "udp",
-		Type:    "NS",
-		Domain:  ".",
-		ip:      net.ParseIP(host),
+		host:     host,
+		Port:     53,
+		Timeout:  timeout,
+		Net:      "udp",
+		Type:     "NS",
+		Domain:   ".",
+		Insecure: false,
+		ip:       net.ParseIP(host),
 	}
 }