GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-03 14:59:38 +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

77
hrp/internal/dial/dns.go
View File

@@ -37,6 +37,10 @@ const (
DnsRecordTypeCNAME = 5 DnsRecordTypeCNAME = 5
) )
var dnsHttpClient = &http.Client{
Timeout: 5 * time.Minute,
}
type DnsOptions struct { type DnsOptions struct {
DnsSourceType int DnsSourceType int
DnsRecordType int DnsRecordType int
@@ -142,61 +146,58 @@ func httpDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) {
if dnsRecordType == DnsRecordTypeAAAA { if dnsRecordType == DnsRecordTypeAAAA {
target += "&aid=13&f=2" target += "&aid=13&f=2"
} }
resp, err := http.Get(target) resp, err := dnsHttpClient.Get(target)
dnsResult.DnsSource = DnsSourceTypeHttp dnsResult.DnsSource = DnsSourceTypeHttp
dnsResult.DnsRecordType = dnsRecordType dnsResult.DnsRecordType = dnsRecordType
if err != nil { if err != nil {
return 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 return
} }
func googleDns(url string, dnsRecordType int) (dnsResult DnsResult, err error) { 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.DnsSource = DnsSourceTypeGoogle
dnsResult.DnsRecordType = dnsRecordType dnsResult.DnsRecordType = dnsRecordType
if err != nil { if err != nil {
return return
} else { }
defer resp.Body.Close() defer resp.Body.Close()
var buf []byte var buf []byte
buf, err = ioutil.ReadAll(resp.Body) buf, err = ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return 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 return
} }
@@ -240,7 +241,7 @@ func DoDns(dnsOptions *DnsOptions, args []string) (err error) {
if err != nil { if err != nil {
dnsResult.Suc = false dnsResult.Suc = false
dnsResult.ErrMsg = err.Error() 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 { } else {
dnsResult.Suc = true dnsResult.Suc = true
dnsResult.ErrMsg = "" dnsResult.ErrMsg = ""