From 71da6d0556ee9f83a07300646891d2c8f5e07f6d Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Wed, 27 Jul 2022 15:00:43 +0800
Subject: [PATCH 1/7] feat: support ping command

---
 go.mod                    |   1 +
 go.sum                    |   6 ++
 hrp/cmd/dial.go           |  31 ++++++++++
 hrp/internal/dial/ping.go | 115 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+)
 create mode 100644 hrp/cmd/dial.go
 create mode 100644 hrp/internal/dial/ping.go

diff --git a/go.mod b/go.mod
index c175a55c..d82800ae 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-errors/errors v1.0.1
 	github.com/go-openapi/spec v0.20.6
+	github.com/go-ping/ping v1.1.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.4.1
diff --git a/go.sum b/go.sum
index 600942d3..09453f97 100644
--- a/go.sum
+++ b/go.sum
@@ -145,6 +145,8 @@ github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
+github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
@@ -222,6 +224,7 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -343,6 +346,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
+github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -510,6 +514,7 @@ golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU=
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -615,6 +620,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
new file mode 100644
index 00000000..d460d76f
--- /dev/null
+++ b/hrp/cmd/dial.go
@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/dial"
+)
+
+var pingOptions dial.PingOptions
+
+var pingCmd = &cobra.Command{
+	Use:   "ping $url",
+	Short: "run integrated ping command",
+	Args:  cobra.ExactArgs(1),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		setLogLevel(logLevel)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return dial.DoPing(&pingOptions, args)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(pingCmd)
+	pingCmd.Flags().IntVarP(&pingOptions.Count, "count", "c", 10, "Stop after sending (and receiving) N packets")
+	pingCmd.Flags().DurationVarP(&pingOptions.Timeout, "timeout", "t", 20*time.Second, "Ping exits after N seconds")
+	pingCmd.Flags().DurationVarP(&pingOptions.Interval, "interval", "i", 1*time.Second, "Wait N seconds between sending each packet")
+	pingCmd.Flags().BoolVar(&pingOptions.SaveTests, "save-tests", false, "Save ping results json")
+}
diff --git a/hrp/internal/dial/ping.go b/hrp/internal/dial/ping.go
new file mode 100644
index 00000000..8b920a3a
--- /dev/null
+++ b/hrp/internal/dial/ping.go
@@ -0,0 +1,115 @@
+package dial
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/go-ping/ping"
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+)
+
+type PingOptions struct {
+	Count     int
+	Timeout   time.Duration
+	Interval  time.Duration
+	SaveTests bool
+}
+
+type PingResult struct {
+	Suc                bool   `json:"suc"`
+	ErrMsg             string `json:"errMsg"`
+	Ip                 string `json:"ip"`
+	AvgCost            int    `json:"avgCost"`
+	MaxCost            int    `json:"maxCost"`
+	MinCost            int    `json:"minCost"`
+	Lost               int    `json:"lost"`
+	PingCount          int    `json:"pingCount"`
+	PacketSize         int    `json:"packetSize"`
+	ReceivePacketCount int    `json:"receivePacketCount"`
+	SendPacketCount    int    `json:"sendPacketCount"`
+	SuccessCount       int    `json:"successCount"`
+	DebugLog           string `json:"debugLog"`
+}
+
+func DoPing(pingOptions *PingOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
+
+	var pingResult PingResult
+	defer func() {
+		if pingOptions.SaveTests {
+			dir, _ := os.Getwd()
+			pingResultName := fmt.Sprintf("ping_result_%v.json", time.Now().Format("20060102150405"))
+			pingResultPath := filepath.Join(dir, pingResultName)
+			err = builtin.Dump2JSON(pingResult, pingResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save ping result failed")
+			}
+		}
+	}()
+
+	pingTarget := args[0]
+
+	parsedURL, err := url.Parse(pingTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", pingTarget, parsedURL.Host)
+		pingTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+
+	log.Info().Msgf("ping host %v", pingTarget)
+	pinger, err := ping.NewPinger(pingTarget)
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to get pinger for %s", pingTarget)
+		pingResult.Suc = false
+		pingResult.ErrMsg = err.Error()
+		pingResult.DebugLog = err.Error()
+		return
+	}
+	pinger.Count = pingOptions.Count
+	pinger.Timeout = pingOptions.Timeout
+	pinger.Interval = pingOptions.Interval
+
+	pinger.OnRecv = func(pkt *ping.Packet) {
+		pingResult.DebugLog += fmt.Sprintf("%d bytes from %s: icmp_seq=%d time=%v\n",
+			pkt.Nbytes, pkt.IPAddr, pkt.Seq, pkt.Rtt)
+	}
+	pinger.OnFinish = func(stats *ping.Statistics) {
+		pingResult.DebugLog += fmt.Sprintf("\n--- %s ping statistics ---\n", stats.Addr)
+		pingResult.DebugLog += fmt.Sprintf("%d packets transmitted, %d packets received, %v%% packet loss\n",
+			stats.PacketsSent, stats.PacketsRecv, stats.PacketLoss)
+		pingResult.DebugLog += fmt.Sprintf("round-trip min/avg/max/stddev = %v/%v/%v/%v\n",
+			stats.MinRtt, stats.AvgRtt, stats.MaxRtt, stats.StdDevRtt)
+	}
+	pingResult.DebugLog += fmt.Sprintf("PING %s (%s):\n", pinger.Addr(), pinger.IPAddr())
+
+	err = pinger.Run() // blocks until finished
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to run ping for %s", parsedURL)
+		pingResult.Suc = false
+		pingResult.ErrMsg = err.Error()
+		pingResult.DebugLog = err.Error()
+		return
+	}
+	stats := pinger.Statistics() // get send/receive/rtt stats
+	pingResult.Ip = pinger.IPAddr().String()
+	pingResult.AvgCost = int(stats.AvgRtt / time.Millisecond)
+	pingResult.MaxCost = int(stats.MaxRtt / time.Millisecond)
+	pingResult.MinCost = int(stats.MinRtt / time.Millisecond)
+	pingResult.Lost = int(stats.PacketLoss)
+	pingResult.PingCount = pingOptions.Count
+	pingResult.PacketSize = pinger.Size
+	pingResult.ReceivePacketCount = stats.PacketsRecv
+	pingResult.SendPacketCount = stats.PacketsSent
+	pingResult.SuccessCount = stats.PacketsRecv
+	pingResult.Suc = true
+	pingResult.ErrMsg = ""
+	return
+}

From 2bd5c6f3da1800065638f0ef9e9dbccfcfd2ab75 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Thu, 28 Jul 2022 21:15:03 +0800
Subject: [PATCH 2/7] feat: support DNS resolution

---
 go.mod                    |   1 +
 hrp/cmd/dial.go           |  30 ++++-
 hrp/internal/dial/dns.go  | 250 ++++++++++++++++++++++++++++++++++++++
 hrp/internal/dial/ping.go |   1 +
 4 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 hrp/internal/dial/dns.go

diff --git a/go.mod b/go.mod
index d82800ae..51da4a79 100644
--- a/go.mod
+++ b/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/maja42/goval v1.2.1
+	github.com/miekg/dns v1.0.14
 	github.com/mitchellh/mapstructure v1.4.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
index d460d76f..5f394db9 100644
--- a/hrp/cmd/dial.go
+++ b/hrp/cmd/dial.go
@@ -3,12 +3,16 @@ package cmd
 import (
 	"time"
 
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
 	"github.com/httprunner/httprunner/v4/hrp/internal/dial"
 )
 
-var pingOptions dial.PingOptions
+var (
+	pingOptions dial.PingOptions
+	dnsOptions  dial.DnsOptions
+)
 
 var pingCmd = &cobra.Command{
 	Use:   "ping $url",
@@ -22,10 +26,34 @@ var pingCmd = &cobra.Command{
 	},
 }
 
+var dnsCmd = &cobra.Command{
+	Use:   "dns $url",
+	Short: "DNS resolution for different source and record types",
+	Args:  cobra.ExactArgs(1),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		setLogLevel(logLevel)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if dnsOptions.DnsSourceType != dial.DnsSourceTypeLocal && dnsOptions.DnsServer != "" {
+			log.Warn().Msg("DNS server not supported for non-local DNS source, ignored")
+		}
+		if dnsOptions.DnsSourceType == dial.DnsSourceTypeHttp && dnsOptions.DnsRecordType == dial.DnsRecordTypeCNAME {
+			log.Warn().Msg("CNAME record not supported for http DNS source, using default record type(A)")
+		}
+		return dial.DoDns(&dnsOptions, args)
+	},
+}
+
 func init() {
 	rootCmd.AddCommand(pingCmd)
 	pingCmd.Flags().IntVarP(&pingOptions.Count, "count", "c", 10, "Stop after sending (and receiving) N packets")
 	pingCmd.Flags().DurationVarP(&pingOptions.Timeout, "timeout", "t", 20*time.Second, "Ping exits after N seconds")
 	pingCmd.Flags().DurationVarP(&pingOptions.Interval, "interval", "i", 1*time.Second, "Wait N seconds between sending each packet")
 	pingCmd.Flags().BoolVar(&pingOptions.SaveTests, "save-tests", false, "Save ping results json")
+
+	rootCmd.AddCommand(dnsCmd)
+	dnsCmd.Flags().IntVar(&dnsOptions.DnsSourceType, "dns-source", 0, "DNS source type\n0: local DNS\n1: http DNS\n2: google DNS")
+	dnsCmd.Flags().IntVar(&dnsOptions.DnsRecordType, "dns-record", 1, "DNS record type\n1: A\n28: AAAA\n5: CNAME")
+	dnsCmd.Flags().StringVar(&dnsOptions.DnsServer, "dns-server", "", "DNS server, only available for local DNS source")
+	dnsCmd.Flags().BoolVar(&dnsOptions.SaveTests, "save-tests", false, "Save DNS resolution results json")
 }
diff --git a/hrp/internal/dial/dns.go b/hrp/internal/dial/dns.go
new file mode 100644
index 00000000..7c169742
--- /dev/null
+++ b/hrp/internal/dial/dns.go
@@ -0,0 +1,250 @@
+package dial
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/miekg/dns"
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+)
+
+const (
+	httpDnsUrl   = "https://dig.bdurl.net/q"
+	googleDnsUrl = "https://dns.google/resolve"
+)
+
+const (
+	DnsSourceTypeLocal = iota
+	DnsSourceTypeHttp
+	DnsSourceTypeGoogle
+)
+
+const (
+	DnsRecordTypeA     = 1
+	DnsRecordTypeAAAA  = 28
+	DnsRecordTypeCNAME = 5
+)
+
+type DnsOptions struct {
+	DnsSourceType int
+	DnsRecordType int
+	DnsServer     string
+	SaveTests     bool
+}
+
+type DnsResult struct {
+	DnsList       []string `json:"dnsList"`
+	DnsSource     int      `json:"dnsType"`
+	DnsRecordType int      `json:"dnsRecordType"`
+	DnsServer     string   `json:"dnsServer,omitempty"`
+	Ttl           int      `json:"ttl"`
+	Suc           bool     `json:"suc"`
+	ErrMsg        string   `json:"errMsg"`
+}
+
+type googleDnsResp struct {
+	Answer []googleDnsAnswer `json:"Answer"`
+}
+
+type httpDnsResp struct {
+	Ips []string `json:"ips"`
+	Ttl int      `json:"ttl"`
+}
+
+type googleDnsAnswer struct {
+	Name string `json:"name"`
+	Type int    `json:"type"`
+	TTL  int    `json:"TTL"`
+	Data string `json:"data"`
+}
+
+func ParseIP(s string) (net.IP, int) {
+	ip := net.ParseIP(s)
+	if ip == nil {
+		return nil, 0
+	}
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '.':
+			return ip, 4
+		case ':':
+			return ip, 6
+		}
+	}
+	return nil, 0
+}
+
+func localDns(src string, dnsRecordType int, dnsServer string) (dnsResult DnsResult, err error) {
+	dnsResult.DnsSource = DnsSourceTypeLocal
+	dnsResult.DnsRecordType = dnsRecordType
+
+	if dnsServer == "" {
+		config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
+		dnsServer = config.Servers[0]
+	} else {
+		dnsResult.DnsServer = dnsServer
+	}
+
+	_, ipType := ParseIP(dnsServer)
+	if ipType == 4 {
+		dnsServer += ":53"
+	}
+
+	c := dns.Client{
+		Timeout: 5 * time.Second,
+	}
+	m := dns.Msg{}
+
+	m.SetQuestion(src+".", uint16(dnsRecordType))
+	r, _, err := c.Exchange(&m, dnsServer)
+	if err != nil {
+		return
+	}
+	for _, ans := range r.Answer {
+		switch dnsRecordType {
+		case DnsRecordTypeA:
+			record, isType := ans.(*dns.A)
+			if isType {
+				dnsResult.Ttl = int(record.Hdr.Ttl)
+				dnsResult.DnsList = append(dnsResult.DnsList, record.A.String())
+			}
+		case DnsRecordTypeAAAA:
+			record, isType := ans.(*dns.AAAA)
+			if isType {
+				dnsResult.Ttl = int(record.Hdr.Ttl)
+				dnsResult.DnsList = append(dnsResult.DnsList, record.AAAA.String())
+			}
+		case DnsRecordTypeCNAME:
+			record, isType := ans.(*dns.CNAME)
+			if isType {
+				dnsResult.Ttl = int(record.Hdr.Ttl)
+				dnsResult.DnsList = append(dnsResult.DnsList, record.Target)
+			}
+		}
+	}
+	return
+}
+
+func httpDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
+	target := httpDnsUrl + "?host=" + url
+	if dnsRecordType == DnsRecordTypeAAAA {
+		target += "&aid=13&f=2"
+	}
+	resp, err := http.Get(target)
+
+	dnsResult.DnsSource = DnsSourceTypeHttp
+	dnsResult.DnsRecordType = dnsRecordType
+
+	if err != nil {
+		return
+	} else {
+		defer resp.Body.Close()
+		var buf []byte
+		buf, err = ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return
+		}
+		var result httpDnsResp
+		err = json.Unmarshal(buf, &result)
+		if err != nil {
+			return
+		}
+		dnsResult.DnsList = result.Ips
+		dnsResult.Ttl = result.Ttl
+	}
+	return
+}
+
+func googleDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
+	resp, err := http.Get(googleDnsUrl + "?name=" + url + "&type=" + strconv.Itoa(dnsRecordType))
+
+	dnsResult.DnsSource = DnsSourceTypeGoogle
+	dnsResult.DnsRecordType = dnsRecordType
+
+	if err != nil {
+		return
+	} else {
+		defer resp.Body.Close()
+		var buf []byte
+		buf, err = ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return
+		}
+		var result googleDnsResp
+		err = json.Unmarshal(buf, &result)
+		if err != nil {
+			return
+		}
+		if len(result.Answer) == 0 {
+			return
+		}
+		for _, answer := range result.Answer {
+			if answer.Type == dnsRecordType {
+				dnsResult.Ttl = answer.TTL
+				dnsResult.DnsList = append(dnsResult.DnsList, answer.Data)
+			}
+		}
+
+	}
+	return
+}
+
+func DoDns(dnsOptions *DnsOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
+
+	var dnsResult DnsResult
+	defer func() {
+		if dnsOptions.SaveTests {
+			dir, _ := os.Getwd()
+			dnsResultName := fmt.Sprintf("dns_result_%v.json", time.Now().Format("20060102150405"))
+			dnsResultPath := filepath.Join(dir, dnsResultName)
+			err = builtin.Dump2JSON(dnsResult, dnsResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save ping result failed")
+			}
+		}
+	}()
+
+	dnsTarget := args[0]
+
+	parsedURL, err := url.Parse(dnsTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", dnsTarget, parsedURL.Host)
+		dnsTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+	log.Info().Msgf("resolve DNS for %v", dnsTarget)
+	dnsRecordType := dnsOptions.DnsRecordType
+	dnsServer := dnsOptions.DnsServer
+	switch dnsOptions.DnsSourceType {
+	case DnsSourceTypeLocal:
+		dnsResult, err = localDns(dnsTarget, dnsRecordType, dnsServer)
+	case DnsSourceTypeHttp:
+		dnsResult, err = httpDns(dnsTarget, dnsRecordType)
+	case DnsSourceTypeGoogle:
+		dnsResult, err = googleDns(dnsTarget, dnsRecordType)
+	}
+	if err != nil {
+		dnsResult.Suc = false
+		dnsResult.ErrMsg = err.Error()
+		log.Error().Err(err).Msgf("fail to do DNS for %s", dnsTarget, err)
+	} else {
+		dnsResult.Suc = true
+		dnsResult.ErrMsg = ""
+		fmt.Printf("\nDNS resolution done, result IP list: %v\n", dnsResult.DnsList)
+	}
+	return
+}
diff --git a/hrp/internal/dial/ping.go b/hrp/internal/dial/ping.go
index 8b920a3a..29c24295 100644
--- a/hrp/internal/dial/ping.go
+++ b/hrp/internal/dial/ping.go
@@ -98,6 +98,7 @@ func DoPing(pingOptions *PingOptions, args []string) (err error) {
 		pingResult.DebugLog = err.Error()
 		return
 	}
+	fmt.Print(pingResult.DebugLog)
 	stats := pinger.Statistics() // get send/receive/rtt stats
 	pingResult.Ip = pinger.IPAddr().String()
 	pingResult.AvgCost = int(stats.AvgRtt / time.Millisecond)

From 064a41c490e3461f42b6694d2fc4d19ef3698559 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Fri, 29 Jul 2022 12:03:58 +0800
Subject: [PATCH 3/7] feat: support traceroute command

---
 go.mod                          |   6 ++
 go.sum                          |  19 +++++
 hrp/cmd/dial.go                 |  24 +++++-
 hrp/internal/dial/dns.go        |   2 +-
 hrp/internal/dial/traceroute.go | 138 ++++++++++++++++++++++++++++++++
 5 files changed, 184 insertions(+), 5 deletions(-)
 create mode 100644 hrp/internal/dial/traceroute.go

diff --git a/go.mod b/go.mod
index 51da4a79..73df7b9d 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/fatih/color v1.13.0
 	github.com/getsentry/sentry-go v0.13.0
+	github.com/gizak/termui v2.3.0+incompatible // indirect
 	github.com/go-errors/errors v1.0.1
 	github.com/go-openapi/spec v0.20.6
 	github.com/go-ping/ping v1.1.0
@@ -18,8 +19,12 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/maja42/goval v1.2.1
+	github.com/maruel/panicparse v1.6.2 // indirect
+	github.com/mehrdadrad/mylg v0.2.6
 	github.com/miekg/dns v1.0.14
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1
+	github.com/nsf/termbox-go v1.1.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
@@ -33,6 +38,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.28.0
+	gopkg.in/h2non/gock.v0 v0.1.6 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
diff --git a/go.sum b/go.sum
index 09453f97..7140eef6 100644
--- a/go.sum
+++ b/go.sum
@@ -68,8 +68,11 @@ github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqO
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -120,6 +123,8 @@ github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
+github.com/gizak/termui v2.3.0+incompatible h1:S8wJoNumYfc/rR5UezUM4HsPEo3RJh0LKdiuDWQpjqw=
+github.com/gizak/termui v2.3.0+incompatible/go.mod h1:PkJoWUt/zacQKysNfQtcw1RW+eK2SxkieVBtl+4ovLA=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -325,9 +330,13 @@ github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/maja42/goval v1.2.1 h1:fyEgzddqPgCZsKcFLk4C6SdCHyEaAHYvtZG4mGzQOHU=
 github.com/maja42/goval v1.2.1/go.mod h1:42LU+BQXL/veE9jnTTUOSj38GRmOTSThYSXRVodI5J4=
+github.com/maruel/panicparse v1.6.2 h1:tZuGQTlbOY5jCprrWMJTikREqKPn+UAKdR4CHSpj834=
+github.com/maruel/panicparse v1.6.2/go.mod h1:uoxI4w9gJL6XahaYPMq/z9uadrdr1SyHuQwV2q80Mm0=
+github.com/maruel/panicparse/v2 v2.1.1/go.mod h1:AeTWdCE4lcq8OKsLb6cHSj1RWHVSnV9HBCk7sKLF4Jg=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
@@ -345,6 +354,9 @@ github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpe
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/mehrdadrad/mylg v0.2.6 h1:MsIreb998Yn/T9h2u92fqPMDZrAO+4720swtfjEqbKM=
+github.com/mehrdadrad/mylg v0.2.6/go.mod h1:mh70kG4nkk0dgfP+jRnkCX3E9wOi/bvJTmtiBlFmai4=
+github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -354,6 +366,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -376,6 +390,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -662,6 +678,7 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -882,6 +899,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/h2non/gock.v0 v0.1.6 h1:vKwe08YIEZEZtspT36nTlo9S+edPFwU6k1tWC7mTw3A=
+gopkg.in/h2non/gock.v0 v0.1.6/go.mod h1:KjTyaFK6xOUSpvIeLQDkMc/AyfyRKVKXhFxT4QxkM3Q=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
index 5f394db9..68ffc3d5 100644
--- a/hrp/cmd/dial.go
+++ b/hrp/cmd/dial.go
@@ -10,8 +10,9 @@ import (
 )
 
 var (
-	pingOptions dial.PingOptions
-	dnsOptions  dial.DnsOptions
+	pingOptions       dial.PingOptions
+	dnsOptions        dial.DnsOptions
+	traceRouteOptions dial.TraceRouteOptions
 )
 
 var pingCmd = &cobra.Command{
@@ -44,16 +45,31 @@ var dnsCmd = &cobra.Command{
 	},
 }
 
+var traceRouteCmd = &cobra.Command{
+	Use:   "traceroute $url",
+	Short: "run integrated traceroute command",
+	Args:  cobra.ExactArgs(1),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		setLogLevel(logLevel)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return dial.DoTraceRoute(&traceRouteOptions, args)
+	},
+}
+
 func init() {
 	rootCmd.AddCommand(pingCmd)
 	pingCmd.Flags().IntVarP(&pingOptions.Count, "count", "c", 10, "Stop after sending (and receiving) N packets")
 	pingCmd.Flags().DurationVarP(&pingOptions.Timeout, "timeout", "t", 20*time.Second, "Ping exits after N seconds")
 	pingCmd.Flags().DurationVarP(&pingOptions.Interval, "interval", "i", 1*time.Second, "Wait N seconds between sending each packet")
-	pingCmd.Flags().BoolVar(&pingOptions.SaveTests, "save-tests", false, "Save ping results json")
+	pingCmd.Flags().BoolVar(&pingOptions.SaveTests, "save-tests", false, "Save ping result as json")
 
 	rootCmd.AddCommand(dnsCmd)
 	dnsCmd.Flags().IntVar(&dnsOptions.DnsSourceType, "dns-source", 0, "DNS source type\n0: local DNS\n1: http DNS\n2: google DNS")
 	dnsCmd.Flags().IntVar(&dnsOptions.DnsRecordType, "dns-record", 1, "DNS record type\n1: A\n28: AAAA\n5: CNAME")
 	dnsCmd.Flags().StringVar(&dnsOptions.DnsServer, "dns-server", "", "DNS server, only available for local DNS source")
-	dnsCmd.Flags().BoolVar(&dnsOptions.SaveTests, "save-tests", false, "Save DNS resolution results json")
+	dnsCmd.Flags().BoolVar(&dnsOptions.SaveTests, "save-tests", false, "Save DNS resolution result as json")
+
+	rootCmd.AddCommand(traceRouteCmd)
+	traceRouteCmd.Flags().BoolVar(&traceRouteOptions.SaveTests, "save-tests", false, "Save traceroute result as json")
 }
diff --git a/hrp/internal/dial/dns.go b/hrp/internal/dial/dns.go
index 7c169742..d91141d0 100644
--- a/hrp/internal/dial/dns.go
+++ b/hrp/internal/dial/dns.go
@@ -214,7 +214,7 @@ func DoDns(dnsOptions *DnsOptions, args []string) (err error) {
 			dnsResultPath := filepath.Join(dir, dnsResultName)
 			err = builtin.Dump2JSON(dnsResult, dnsResultPath)
 			if err != nil {
-				log.Error().Err(err).Msg("save ping result failed")
+				log.Error().Err(err).Msg("save dns resolution result failed")
 			}
 		}
 	}()
diff --git a/hrp/internal/dial/traceroute.go b/hrp/internal/dial/traceroute.go
new file mode 100644
index 00000000..5f19c4a1
--- /dev/null
+++ b/hrp/internal/dial/traceroute.go
@@ -0,0 +1,138 @@
+package dial
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/mehrdadrad/mylg/cli"
+	"github.com/mehrdadrad/mylg/icmp"
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+	"github.com/httprunner/httprunner/v4/hrp/internal/json"
+)
+
+type TraceRouteOptions struct {
+	SaveTests bool
+}
+
+type TraceRouteResult struct {
+	IP      string                 `json:"ip"`
+	Details []TraceRouteResultNode `json:"details"`
+	Suc     bool                   `json:"suc"`
+	ErrMsg  string                 `json:"errMsg"`
+}
+
+type TraceRouteResultNode struct {
+	Id   int    `json:"id"`
+	Ip   string `json:"ip"`
+	Time string `json:"time"`
+}
+
+type HopResp struct {
+	Num     int     `json:"Id"`
+	Hop     string  `json:"Hop"`
+	Ip      string  `json:"Ip"`
+	Elapsed float64 `json:"Elapsed"`
+	Holder  string  `json:"Holder"`
+	ASN     float64 `json:"ASN"`
+	Last    bool    `json:"Last"`
+}
+
+func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
+
+	var traceRouteResult TraceRouteResult
+	defer func() {
+		if traceRouteOptions.SaveTests {
+			dir, _ := os.Getwd()
+			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
+			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
+			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save traceroute result failed")
+			}
+		}
+	}()
+
+	traceRouteTarget := args[0]
+	parsedURL, err := url.Parse(traceRouteTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
+		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+
+	cfg, err := cli.ReadDefaultConfig()
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to read default config")
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = err.Error()
+		return
+	}
+
+	traceRouter, err := icmp.NewTrace(traceRouteTarget, cfg)
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to new traceRouter for %s", traceRouteTarget)
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = err.Error()
+		return
+	}
+
+	startT := time.Now()
+	defer func() {
+		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
+	}()
+
+	log.Info().Msgf("start to trace route of %v", traceRouteTarget)
+	hopRespChan, err := traceRouter.MRun()
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to trace route of %v", traceRouteTarget)
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = err.Error()
+	}
+	count := 0
+	t := time.NewTicker(2 * time.Minute)
+	for {
+		select {
+		case <-t.C:
+			log.Error().Err(err).Msgf("fail to do traceroute for %s because timeout", traceRouteTarget)
+			traceRouteResult.Suc = false
+			traceRouteResult.ErrMsg = "timeout"
+			return
+		case resp := <-hopRespChan:
+			respJSON := resp.Marshal()
+			fmt.Printf("traceroute hop: %v\n", respJSON)
+			var hopResp HopResp
+			err = json.Unmarshal([]byte(respJSON), &hopResp)
+			if err != nil {
+				log.Error().Err(err).Msgf("fail to do traceroute for %s because of hop response %v unmarshal error", traceRouteTarget, respJSON)
+				traceRouteResult.Suc = false
+				traceRouteResult.ErrMsg = "hop response unmarshal error"
+			}
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id:   hopResp.Num,
+				Ip:   hopResp.Ip,
+				Time: fmt.Sprintf("%.2f", hopResp.Elapsed),
+			})
+			traceRouteResult.Suc = true
+			traceRouteResult.ErrMsg = ""
+			if hopResp.Last {
+				traceRouteResult.IP = hopResp.Ip
+				log.Info().Msgf("for target %s, traceroute completed", traceRouteTarget)
+				return
+			}
+			count += 1
+			if count > 30 {
+				log.Info().Msgf("for target %s, traceroute hop counts reach limit", traceRouteTarget)
+				return
+			}
+		}
+	}
+}

From be9542ffeedbb361a6fd53dc33484b432663f94c Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Tue, 2 Aug 2022 10:55:45 +0800
Subject: [PATCH 4/7] using original traceroute command for dial

---
 docs/CHANGELOG.md               |  1 +
 hrp/cmd/dial.go                 |  2 +
 hrp/internal/dial/traceroute.go | 92 +++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5b1128b6..6ee78e52 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -14,6 +14,7 @@
 - fix: optimize websocket step initialization
 - fix: reuse plugin instance if already initialized
 - fix: deep copy api step to avoid data racing
+- feat: support ping/dns/traceroute for dial test
 
 ## v4.1.6 (2022-07-04)
 
diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
index 68ffc3d5..1eeb0881 100644
--- a/hrp/cmd/dial.go
+++ b/hrp/cmd/dial.go
@@ -71,5 +71,7 @@ func init() {
 	dnsCmd.Flags().BoolVar(&dnsOptions.SaveTests, "save-tests", false, "Save DNS resolution result as json")
 
 	rootCmd.AddCommand(traceRouteCmd)
+	traceRouteCmd.Flags().IntVarP(&traceRouteOptions.MaxTTL, "max-hops", "m", 30, "Set the max number of hops (max TTL to be reached)")
+	traceRouteCmd.Flags().IntVarP(&traceRouteOptions.Queries, "queries", "q", 1, "Set the number of probes per each hop")
 	traceRouteCmd.Flags().BoolVar(&traceRouteOptions.SaveTests, "save-tests", false, "Save traceroute result as json")
 }
diff --git a/hrp/internal/dial/traceroute.go b/hrp/internal/dial/traceroute.go
index 5f19c4a1..f9d6550c 100644
--- a/hrp/internal/dial/traceroute.go
+++ b/hrp/internal/dial/traceroute.go
@@ -1,10 +1,14 @@
 package dial
 
 import (
+	"bufio"
 	"fmt"
 	"net/url"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
 	"time"
 
@@ -17,7 +21,16 @@ import (
 	"github.com/httprunner/httprunner/v4/hrp/internal/json"
 )
 
+var (
+	regexIPAddr            = regexp.MustCompile(`([\d.]+)`)
+	regexElapsedTime       = regexp.MustCompile(`(\d+\.\d+)`)
+	regexTraceroutePass    = regexp.MustCompile(fmt.Sprintf(`(\d+)[\s*]+(\S+)\s+\(%s\)\s+%s\s+ms`, regexIPAddr, regexElapsedTime))
+	regexTracerouteFailure = regexp.MustCompile(`(\d+)[\s*]+$`)
+)
+
 type TraceRouteOptions struct {
+	MaxTTL    int
+	Queries   int
 	SaveTests bool
 }
 
@@ -48,6 +61,85 @@ func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err erro
 	if len(args) != 1 {
 		return errors.New("there should be one argument")
 	}
+	var traceRouteResult TraceRouteResult
+	defer func() {
+		if traceRouteOptions.SaveTests {
+			dir, _ := os.Getwd()
+			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
+			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
+			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save traceroute result failed")
+			}
+		}
+	}()
+
+	traceRouteTarget := args[0]
+	parsedURL, err := url.Parse(traceRouteTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
+		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+
+	cmd := exec.Command("traceroute", "-m", strconv.Itoa(traceRouteOptions.MaxTTL),
+		"-q", strconv.Itoa(traceRouteOptions.Queries), traceRouteTarget)
+	stdout, _ := cmd.StdoutPipe()
+
+	startT := time.Now()
+	defer func() {
+		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
+	}()
+
+	log.Info().Msgf("start to traceroute %v", traceRouteTarget)
+	err = cmd.Start()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "execute traceroute failed"
+		log.Error().Err(err).Msg("start command failed")
+		return
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		hopLine := scanner.Text()
+		fmt.Println(hopLine)
+		passLine := regexTraceroutePass.FindStringSubmatch(hopLine)
+		if len(passLine) == 5 {
+			hopID, _ := strconv.Atoi(passLine[1])
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id:   hopID,
+				Ip:   passLine[3],
+				Time: passLine[4],
+			})
+			traceRouteResult.Suc = true
+			continue
+		}
+		failureLine := regexTracerouteFailure.FindStringSubmatch(hopLine)
+		if len(failureLine) == 2 {
+			hopID, _ := strconv.Atoi(failureLine[1])
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id: hopID,
+			})
+			continue
+		}
+	}
+	hopCount := len(traceRouteResult.Details)
+	traceRouteResult.IP = traceRouteResult.Details[hopCount-1].Ip
+	err = cmd.Wait()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "wait traceroute finish failed"
+		log.Error().Err(err).Msg("wait command failed")
+		return
+	}
+	return
+}
+
+// DoTraceRouteSDK with golang SDK, which needs root privilege
+func DoTraceRouteSDK(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
 
 	var traceRouteResult TraceRouteResult
 	defer func() {

From 8b72938f3470aa7fabb53a97687a70b63e54dd77 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Wed, 3 Aug 2022 16:13:01 +0800
Subject: [PATCH 5/7] adapt windows tracert

---
 go.mod                                  |   6 -
 go.sum                                  |  19 ---
 hrp/cmd/dial.go                         |   4 +
 hrp/internal/dial/traceroute.go         | 210 ------------------------
 hrp/internal/dial/traceroute_unix.go    | 106 ++++++++++++
 hrp/internal/dial/traceroute_windows.go | 105 ++++++++++++
 6 files changed, 215 insertions(+), 235 deletions(-)
 create mode 100644 hrp/internal/dial/traceroute_unix.go
 create mode 100644 hrp/internal/dial/traceroute_windows.go

diff --git a/go.mod b/go.mod
index 73df7b9d..51da4a79 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/fatih/color v1.13.0
 	github.com/getsentry/sentry-go v0.13.0
-	github.com/gizak/termui v2.3.0+incompatible // indirect
 	github.com/go-errors/errors v1.0.1
 	github.com/go-openapi/spec v0.20.6
 	github.com/go-ping/ping v1.1.0
@@ -19,12 +18,8 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/maja42/goval v1.2.1
-	github.com/maruel/panicparse v1.6.2 // indirect
-	github.com/mehrdadrad/mylg v0.2.6
 	github.com/miekg/dns v1.0.14
-	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1
-	github.com/nsf/termbox-go v1.1.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
@@ -38,7 +33,6 @@ require (
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.28.0
-	gopkg.in/h2non/gock.v0 v0.1.6 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
diff --git a/go.sum b/go.sum
index 7140eef6..09453f97 100644
--- a/go.sum
+++ b/go.sum
@@ -68,11 +68,8 @@ github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqO
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -123,8 +120,6 @@ github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/gizak/termui v2.3.0+incompatible h1:S8wJoNumYfc/rR5UezUM4HsPEo3RJh0LKdiuDWQpjqw=
-github.com/gizak/termui v2.3.0+incompatible/go.mod h1:PkJoWUt/zacQKysNfQtcw1RW+eK2SxkieVBtl+4ovLA=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -330,13 +325,9 @@ github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/maja42/goval v1.2.1 h1:fyEgzddqPgCZsKcFLk4C6SdCHyEaAHYvtZG4mGzQOHU=
 github.com/maja42/goval v1.2.1/go.mod h1:42LU+BQXL/veE9jnTTUOSj38GRmOTSThYSXRVodI5J4=
-github.com/maruel/panicparse v1.6.2 h1:tZuGQTlbOY5jCprrWMJTikREqKPn+UAKdR4CHSpj834=
-github.com/maruel/panicparse v1.6.2/go.mod h1:uoxI4w9gJL6XahaYPMq/z9uadrdr1SyHuQwV2q80Mm0=
-github.com/maruel/panicparse/v2 v2.1.1/go.mod h1:AeTWdCE4lcq8OKsLb6cHSj1RWHVSnV9HBCk7sKLF4Jg=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
@@ -354,9 +345,6 @@ github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpe
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
-github.com/mehrdadrad/mylg v0.2.6 h1:MsIreb998Yn/T9h2u92fqPMDZrAO+4720swtfjEqbKM=
-github.com/mehrdadrad/mylg v0.2.6/go.mod h1:mh70kG4nkk0dgfP+jRnkCX3E9wOi/bvJTmtiBlFmai4=
-github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -366,8 +354,6 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
-github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -390,8 +376,6 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
-github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -678,7 +662,6 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -899,8 +882,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/h2non/gock.v0 v0.1.6 h1:vKwe08YIEZEZtspT36nTlo9S+edPFwU6k1tWC7mTw3A=
-gopkg.in/h2non/gock.v0 v0.1.6/go.mod h1:KjTyaFK6xOUSpvIeLQDkMc/AyfyRKVKXhFxT4QxkM3Q=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
index 1eeb0881..cb602234 100644
--- a/hrp/cmd/dial.go
+++ b/hrp/cmd/dial.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"runtime"
 	"time"
 
 	"github.com/rs/zerolog/log"
@@ -53,6 +54,9 @@ var traceRouteCmd = &cobra.Command{
 		setLogLevel(logLevel)
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
+		if runtime.GOOS == "windows" {
+			log.Info().Msg("using default probe number (3) on Windows")
+		}
 		return dial.DoTraceRoute(&traceRouteOptions, args)
 	},
 }
diff --git a/hrp/internal/dial/traceroute.go b/hrp/internal/dial/traceroute.go
index f9d6550c..d20e5f1b 100644
--- a/hrp/internal/dial/traceroute.go
+++ b/hrp/internal/dial/traceroute.go
@@ -1,33 +1,5 @@
 package dial
 
-import (
-	"bufio"
-	"fmt"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/mehrdadrad/mylg/cli"
-	"github.com/mehrdadrad/mylg/icmp"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-
-	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
-	"github.com/httprunner/httprunner/v4/hrp/internal/json"
-)
-
-var (
-	regexIPAddr            = regexp.MustCompile(`([\d.]+)`)
-	regexElapsedTime       = regexp.MustCompile(`(\d+\.\d+)`)
-	regexTraceroutePass    = regexp.MustCompile(fmt.Sprintf(`(\d+)[\s*]+(\S+)\s+\(%s\)\s+%s\s+ms`, regexIPAddr, regexElapsedTime))
-	regexTracerouteFailure = regexp.MustCompile(`(\d+)[\s*]+$`)
-)
-
 type TraceRouteOptions struct {
 	MaxTTL    int
 	Queries   int
@@ -46,185 +18,3 @@ type TraceRouteResultNode struct {
 	Ip   string `json:"ip"`
 	Time string `json:"time"`
 }
-
-type HopResp struct {
-	Num     int     `json:"Id"`
-	Hop     string  `json:"Hop"`
-	Ip      string  `json:"Ip"`
-	Elapsed float64 `json:"Elapsed"`
-	Holder  string  `json:"Holder"`
-	ASN     float64 `json:"ASN"`
-	Last    bool    `json:"Last"`
-}
-
-func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
-	if len(args) != 1 {
-		return errors.New("there should be one argument")
-	}
-	var traceRouteResult TraceRouteResult
-	defer func() {
-		if traceRouteOptions.SaveTests {
-			dir, _ := os.Getwd()
-			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
-			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
-			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
-			if err != nil {
-				log.Error().Err(err).Msg("save traceroute result failed")
-			}
-		}
-	}()
-
-	traceRouteTarget := args[0]
-	parsedURL, err := url.Parse(traceRouteTarget)
-	if err == nil && parsedURL.Host != "" {
-		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
-		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
-	}
-
-	cmd := exec.Command("traceroute", "-m", strconv.Itoa(traceRouteOptions.MaxTTL),
-		"-q", strconv.Itoa(traceRouteOptions.Queries), traceRouteTarget)
-	stdout, _ := cmd.StdoutPipe()
-
-	startT := time.Now()
-	defer func() {
-		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
-	}()
-
-	log.Info().Msgf("start to traceroute %v", traceRouteTarget)
-	err = cmd.Start()
-	if err != nil {
-		traceRouteResult.Suc = false
-		traceRouteResult.ErrMsg = "execute traceroute failed"
-		log.Error().Err(err).Msg("start command failed")
-		return
-	}
-
-	scanner := bufio.NewScanner(stdout)
-	for scanner.Scan() {
-		hopLine := scanner.Text()
-		fmt.Println(hopLine)
-		passLine := regexTraceroutePass.FindStringSubmatch(hopLine)
-		if len(passLine) == 5 {
-			hopID, _ := strconv.Atoi(passLine[1])
-			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
-				Id:   hopID,
-				Ip:   passLine[3],
-				Time: passLine[4],
-			})
-			traceRouteResult.Suc = true
-			continue
-		}
-		failureLine := regexTracerouteFailure.FindStringSubmatch(hopLine)
-		if len(failureLine) == 2 {
-			hopID, _ := strconv.Atoi(failureLine[1])
-			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
-				Id: hopID,
-			})
-			continue
-		}
-	}
-	hopCount := len(traceRouteResult.Details)
-	traceRouteResult.IP = traceRouteResult.Details[hopCount-1].Ip
-	err = cmd.Wait()
-	if err != nil {
-		traceRouteResult.Suc = false
-		traceRouteResult.ErrMsg = "wait traceroute finish failed"
-		log.Error().Err(err).Msg("wait command failed")
-		return
-	}
-	return
-}
-
-// DoTraceRouteSDK with golang SDK, which needs root privilege
-func DoTraceRouteSDK(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
-	if len(args) != 1 {
-		return errors.New("there should be one argument")
-	}
-
-	var traceRouteResult TraceRouteResult
-	defer func() {
-		if traceRouteOptions.SaveTests {
-			dir, _ := os.Getwd()
-			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
-			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
-			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
-			if err != nil {
-				log.Error().Err(err).Msg("save traceroute result failed")
-			}
-		}
-	}()
-
-	traceRouteTarget := args[0]
-	parsedURL, err := url.Parse(traceRouteTarget)
-	if err == nil && parsedURL.Host != "" {
-		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
-		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
-	}
-
-	cfg, err := cli.ReadDefaultConfig()
-	if err != nil {
-		log.Error().Err(err).Msgf("fail to read default config")
-		traceRouteResult.Suc = false
-		traceRouteResult.ErrMsg = err.Error()
-		return
-	}
-
-	traceRouter, err := icmp.NewTrace(traceRouteTarget, cfg)
-	if err != nil {
-		log.Error().Err(err).Msgf("fail to new traceRouter for %s", traceRouteTarget)
-		traceRouteResult.Suc = false
-		traceRouteResult.ErrMsg = err.Error()
-		return
-	}
-
-	startT := time.Now()
-	defer func() {
-		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
-	}()
-
-	log.Info().Msgf("start to trace route of %v", traceRouteTarget)
-	hopRespChan, err := traceRouter.MRun()
-	if err != nil {
-		log.Error().Err(err).Msgf("fail to trace route of %v", traceRouteTarget)
-		traceRouteResult.Suc = false
-		traceRouteResult.ErrMsg = err.Error()
-	}
-	count := 0
-	t := time.NewTicker(2 * time.Minute)
-	for {
-		select {
-		case <-t.C:
-			log.Error().Err(err).Msgf("fail to do traceroute for %s because timeout", traceRouteTarget)
-			traceRouteResult.Suc = false
-			traceRouteResult.ErrMsg = "timeout"
-			return
-		case resp := <-hopRespChan:
-			respJSON := resp.Marshal()
-			fmt.Printf("traceroute hop: %v\n", respJSON)
-			var hopResp HopResp
-			err = json.Unmarshal([]byte(respJSON), &hopResp)
-			if err != nil {
-				log.Error().Err(err).Msgf("fail to do traceroute for %s because of hop response %v unmarshal error", traceRouteTarget, respJSON)
-				traceRouteResult.Suc = false
-				traceRouteResult.ErrMsg = "hop response unmarshal error"
-			}
-			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
-				Id:   hopResp.Num,
-				Ip:   hopResp.Ip,
-				Time: fmt.Sprintf("%.2f", hopResp.Elapsed),
-			})
-			traceRouteResult.Suc = true
-			traceRouteResult.ErrMsg = ""
-			if hopResp.Last {
-				traceRouteResult.IP = hopResp.Ip
-				log.Info().Msgf("for target %s, traceroute completed", traceRouteTarget)
-				return
-			}
-			count += 1
-			if count > 30 {
-				log.Info().Msgf("for target %s, traceroute hop counts reach limit", traceRouteTarget)
-				return
-			}
-		}
-	}
-}
diff --git a/hrp/internal/dial/traceroute_unix.go b/hrp/internal/dial/traceroute_unix.go
new file mode 100644
index 00000000..b6621592
--- /dev/null
+++ b/hrp/internal/dial/traceroute_unix.go
@@ -0,0 +1,106 @@
+//go:build darwin || linux
+// +build darwin linux
+
+package dial
+
+import (
+	"bufio"
+	"fmt"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+)
+
+var (
+	regexIPAddr            = regexp.MustCompile(`([\d.]+)`)
+	regexElapsedTime       = regexp.MustCompile(`(\d+\.\d+)`)
+	regexTraceroutePass    = regexp.MustCompile(fmt.Sprintf(`(\d+)[\s*]+(\S+)\s+\(%s\)\s+%s\s+ms`, regexIPAddr, regexElapsedTime))
+	regexTracerouteFailure = regexp.MustCompile(`(\d+)[\s*]+$`)
+)
+
+func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
+	var traceRouteResult TraceRouteResult
+	defer func() {
+		if traceRouteOptions.SaveTests {
+			dir, _ := os.Getwd()
+			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
+			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
+			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save traceroute result failed")
+			}
+		}
+	}()
+
+	traceRouteTarget := args[0]
+	parsedURL, err := url.Parse(traceRouteTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
+		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+
+	cmd := exec.Command("traceroute", "-m", strconv.Itoa(traceRouteOptions.MaxTTL),
+		"-q", strconv.Itoa(traceRouteOptions.Queries), traceRouteTarget)
+	stdout, _ := cmd.StdoutPipe()
+
+	startT := time.Now()
+	defer func() {
+		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
+	}()
+
+	log.Info().Msgf("start to traceroute %v", traceRouteTarget)
+	err = cmd.Start()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "execute traceroute failed"
+		log.Error().Err(err).Msg("start command failed")
+		return
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		hopLine := scanner.Text()
+		fmt.Println(hopLine)
+		failureLine := regexTracerouteFailure.FindStringSubmatch(hopLine)
+		if len(failureLine) == 2 {
+			hopID, _ := strconv.Atoi(failureLine[1])
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id: hopID,
+			})
+			continue
+		}
+		passLine := regexTraceroutePass.FindStringSubmatch(hopLine)
+		if len(passLine) == 5 {
+			hopID, _ := strconv.Atoi(passLine[1])
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id:   hopID,
+				Ip:   passLine[3],
+				Time: passLine[4],
+			})
+			traceRouteResult.Suc = true
+		}
+	}
+	hopCount := len(traceRouteResult.Details)
+	traceRouteResult.IP = traceRouteResult.Details[hopCount-1].Ip
+	err = cmd.Wait()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "wait traceroute finish failed"
+		log.Error().Err(err).Msg("wait command failed")
+		return
+	}
+	return
+}
diff --git a/hrp/internal/dial/traceroute_windows.go b/hrp/internal/dial/traceroute_windows.go
new file mode 100644
index 00000000..a1b4b37b
--- /dev/null
+++ b/hrp/internal/dial/traceroute_windows.go
@@ -0,0 +1,105 @@
+//go:build windows
+// +build windows
+
+package dial
+
+import (
+	"bufio"
+	"fmt"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+)
+
+var (
+	regexTracertPass    = regexp.MustCompile(`(\d+)[\s*<]+(\d+)\s+ms`)
+	regexTracertFailure = regexp.MustCompile(`(\d+)[\s*]+Request timed out`)
+)
+
+func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err error) {
+	if len(args) != 1 {
+		return errors.New("there should be one argument")
+	}
+	var traceRouteResult TraceRouteResult
+	defer func() {
+		if traceRouteOptions.SaveTests {
+			dir, _ := os.Getwd()
+			traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
+			traceRouteResultPath := filepath.Join(dir, traceRouteResultName)
+			err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save traceroute result failed")
+			}
+		}
+	}()
+
+	traceRouteTarget := args[0]
+	parsedURL, err := url.Parse(traceRouteTarget)
+	if err == nil && parsedURL.Host != "" {
+		log.Info().Msgf("parse input url %v and extract host %v", traceRouteTarget, parsedURL.Host)
+		traceRouteTarget = strings.Split(parsedURL.Host, ":")[0]
+	}
+
+	cmd := exec.Command("tracert", "-h", strconv.Itoa(traceRouteOptions.MaxTTL), traceRouteTarget)
+	stdout, _ := cmd.StdoutPipe()
+
+	startT := time.Now()
+	defer func() {
+		log.Info().Msgf("for target %s, traceroute costs %v", traceRouteTarget, time.Since(startT))
+	}()
+
+	log.Info().Msgf("start to traceroute %v", traceRouteTarget)
+	err = cmd.Start()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "execute traceroute failed"
+		log.Error().Err(err).Msg("start command failed")
+		return
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		hopLine := scanner.Text()
+		fmt.Println(hopLine)
+		failureLine := regexTracertFailure.FindStringSubmatch(hopLine)
+		if len(failureLine) == 2 {
+			hopID, _ := strconv.Atoi(failureLine[1])
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id: hopID,
+			})
+			continue
+		}
+		passLine := regexTracertPass.FindStringSubmatch(hopLine)
+		if len(passLine) == 3 {
+			hopID, _ := strconv.Atoi(passLine[1])
+			fields := strings.Fields(hopLine)
+			hopIP := strings.Trim(fields[len(fields)-1], "[]")
+			traceRouteResult.Details = append(traceRouteResult.Details, TraceRouteResultNode{
+				Id:   hopID,
+				Ip:   hopIP,
+				Time: passLine[2],
+			})
+			traceRouteResult.Suc = true
+		}
+	}
+	hopCount := len(traceRouteResult.Details)
+	traceRouteResult.IP = traceRouteResult.Details[hopCount-1].Ip
+	err = cmd.Wait()
+	if err != nil {
+		traceRouteResult.Suc = false
+		traceRouteResult.ErrMsg = "wait traceroute finish failed"
+		log.Error().Err(err).Msg("wait command failed")
+		return
+	}
+	return
+}

From fd5359c02d8f87b207c517886b9b7dd917c48211 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Wed, 3 Aug 2022 16:14:57 +0800
Subject: [PATCH 6/7] feat: support curl command

---
 hrp/cmd/dial.go           | 15 ++++++++
 hrp/internal/dial/curl.go | 72 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 hrp/internal/dial/curl.go

diff --git a/hrp/cmd/dial.go b/hrp/cmd/dial.go
index cb602234..df14f3b1 100644
--- a/hrp/cmd/dial.go
+++ b/hrp/cmd/dial.go
@@ -61,6 +61,19 @@ var traceRouteCmd = &cobra.Command{
 	},
 }
 
+var curlCmd = &cobra.Command{
+	Use:                "curl $url",
+	Short:              "run integrated curl command",
+	Args:               cobra.MinimumNArgs(1),
+	DisableFlagParsing: true,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		setLogLevel(logLevel)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return dial.DoCurl(args)
+	},
+}
+
 func init() {
 	rootCmd.AddCommand(pingCmd)
 	pingCmd.Flags().IntVarP(&pingOptions.Count, "count", "c", 10, "Stop after sending (and receiving) N packets")
@@ -78,4 +91,6 @@ func init() {
 	traceRouteCmd.Flags().IntVarP(&traceRouteOptions.MaxTTL, "max-hops", "m", 30, "Set the max number of hops (max TTL to be reached)")
 	traceRouteCmd.Flags().IntVarP(&traceRouteOptions.Queries, "queries", "q", 1, "Set the number of probes per each hop")
 	traceRouteCmd.Flags().BoolVar(&traceRouteOptions.SaveTests, "save-tests", false, "Save traceroute result as json")
+
+	rootCmd.AddCommand(curlCmd)
 }
diff --git a/hrp/internal/dial/curl.go b/hrp/internal/dial/curl.go
new file mode 100644
index 00000000..8cd3436a
--- /dev/null
+++ b/hrp/internal/dial/curl.go
@@ -0,0 +1,72 @@
+package dial
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"time"
+
+	"github.com/rs/zerolog/log"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+)
+
+const (
+	normalResult = "STDOUT"
+	errorResult  = "STDERR"
+	failedResult = "FAILED"
+)
+
+type CurlResult struct {
+	Result     string `json:"result"`
+	ErrorMsg   string `json:"errorMsg"`
+	ResultType string `json:"resultType"`
+}
+
+func DoCurl(args []string) (err error) {
+	var saveTests bool
+	for i, arg := range args {
+		if arg == "--save-tests" {
+			args = append(args[:i], args[i+1:]...)
+			saveTests = true
+		}
+	}
+	var curlResult CurlResult
+	defer func() {
+		if saveTests {
+			dir, _ := os.Getwd()
+			curlResultName := fmt.Sprintf("curl_result_%v.json", time.Now().Format("20060102150405"))
+			curlResultPath := filepath.Join(dir, curlResultName)
+			err = builtin.Dump2JSON(curlResult, curlResultPath)
+			if err != nil {
+				log.Error().Err(err).Msg("save dns resolution result failed")
+			}
+		}
+	}()
+
+	cmd := exec.Command("curl", args...)
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	err = cmd.Run()
+	if err != nil {
+		log.Error().Err(err).Msgf("fail to run curl command")
+		curlResult.ErrorMsg = err.Error()
+		curlResult.Result = stderr.String()
+		curlResult.ResultType = errorResult
+		return
+	}
+	if stdout.String() != "" {
+		fmt.Printf(stdout.String())
+		curlResult.Result = stdout.String()
+		curlResult.ResultType = normalResult
+	} else if stderr.String() != "" {
+		fmt.Printf(stderr.String())
+		curlResult.ErrorMsg = stderr.String()
+		curlResult.ResultType = errorResult
+	}
+	return
+}

From 809301d089bf749d44c13fc13bac12494afa4d95 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Fri, 12 Aug 2022 18:15:45 +0800
Subject: [PATCH 7/7] fix: add timeout for dns resolution

---
 hrp/internal/dial/dns.go | 77 ++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/hrp/internal/dial/dns.go b/hrp/internal/dial/dns.go
index d91141d0..7f1e7e03 100644
--- a/hrp/internal/dial/dns.go
+++ b/hrp/internal/dial/dns.go
@@ -37,6 +37,10 @@ const (
 	DnsRecordTypeCNAME = 5
 )
 
+var dnsHttpClient = &http.Client{
+	Timeout: 5 * time.Minute,
+}
+
 type DnsOptions struct {
 	DnsSourceType int
 	DnsRecordType int
@@ -142,61 +146,58 @@ func httpDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
 	if dnsRecordType == DnsRecordTypeAAAA {
 		target += "&aid=13&f=2"
 	}
-	resp, err := http.Get(target)
+	resp, err := dnsHttpClient.Get(target)
 
 	dnsResult.DnsSource = DnsSourceTypeHttp
 	dnsResult.DnsRecordType = dnsRecordType
 
 	if err != nil {
 		return
-	} else {
-		defer resp.Body.Close()
-		var buf []byte
-		buf, err = ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return
-		}
-		var result httpDnsResp
-		err = json.Unmarshal(buf, &result)
-		if err != nil {
-			return
-		}
-		dnsResult.DnsList = result.Ips
-		dnsResult.Ttl = result.Ttl
 	}
+	defer resp.Body.Close()
+	var buf []byte
+	buf, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+	var result httpDnsResp
+	err = json.Unmarshal(buf, &result)
+	if err != nil {
+		return
+	}
+	dnsResult.DnsList = result.Ips
+	dnsResult.Ttl = result.Ttl
 	return
 }
 
 func googleDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
-	resp, err := http.Get(googleDnsUrl + "?name=" + url + "&type=" + strconv.Itoa(dnsRecordType))
+	resp, err := dnsHttpClient.Get(googleDnsUrl + "?name=" + url + "&type=" + strconv.Itoa(dnsRecordType))
 
 	dnsResult.DnsSource = DnsSourceTypeGoogle
 	dnsResult.DnsRecordType = dnsRecordType
 
 	if err != nil {
 		return
-	} else {
-		defer resp.Body.Close()
-		var buf []byte
-		buf, err = ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return
+	}
+	defer resp.Body.Close()
+	var buf []byte
+	buf, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+	var result googleDnsResp
+	err = json.Unmarshal(buf, &result)
+	if err != nil {
+		return
+	}
+	if len(result.Answer) == 0 {
+		return
+	}
+	for _, answer := range result.Answer {
+		if answer.Type == dnsRecordType {
+			dnsResult.Ttl = answer.TTL
+			dnsResult.DnsList = append(dnsResult.DnsList, answer.Data)
 		}
-		var result googleDnsResp
-		err = json.Unmarshal(buf, &result)
-		if err != nil {
-			return
-		}
-		if len(result.Answer) == 0 {
-			return
-		}
-		for _, answer := range result.Answer {
-			if answer.Type == dnsRecordType {
-				dnsResult.Ttl = answer.TTL
-				dnsResult.DnsList = append(dnsResult.DnsList, answer.Data)
-			}
-		}
-
 	}
 	return
 }
@@ -240,7 +241,7 @@ func DoDns(dnsOptions *DnsOptions, args []string) (err error) {
 	if err != nil {
 		dnsResult.Suc = false
 		dnsResult.ErrMsg = err.Error()
-		log.Error().Err(err).Msgf("fail to do DNS for %s", dnsTarget, err)
+		log.Error().Err(err).Msgf("fail to do DNS for %s", dnsTarget)
 	} else {
 		dnsResult.Suc = true
 		dnsResult.ErrMsg = ""