GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-06 16:07:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add timeout for dns resolution

Browse Source
This commit is contained in:
buyuxiang
2022-08-12 18:15:45 +08:00
parent 54cd702c85
commit fa2d932299
1 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/internal/dial/dns.go
+9 -8
View File
@@ -37,6 +37,10 @@ const (
DnsRecordTypeCNAME = 5
)
var dnsHttpClient = &http.Client{
Timeout: 5 * time.Minute,
}
type DnsOptions struct {
DnsSourceType int
DnsRecordType int
@@ -142,14 +146,14 @@ 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)
@@ -163,19 +167,18 @@ func httpDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
}
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)
@@ -196,8 +199,6 @@ func googleDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
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 = ""