Skip to content

Commit 9f23614

Browse files
committed
integrated the authoritative name server selector
1 parent a7967b2 commit 9f23614

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

engine/plugins/support/resolvers.go

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package support
77
import (
88
"context"
99
"errors"
10-
"math/rand"
1110
"strings"
1211
"time"
1312

@@ -80,10 +79,6 @@ var baselineResolvers = []baseline{
8079

8180
var trusted *resolve.Resolvers
8281

83-
func NumResolvers() int {
84-
return trusted.Len()
85-
}
86-
8782
func PerformQuery(name string, qtype uint16) ([]dns.RR, error) {
8883
msg := resolve.QueryMsg(name, qtype)
8984
if qtype == dns.TypePTR {
@@ -129,19 +124,11 @@ func dnsQuery(msg *dns.Msg, r *resolve.Resolvers, attempts int) (*dns.Msg, error
129124
return nil, nil
130125
}
131126

132-
func trustedResolvers() (*resolve.Resolvers, int) {
133-
blr := baselineResolvers
134-
rand.Shuffle(len(blr), func(i, j int) {
135-
blr[i], blr[j] = blr[j], blr[i]
136-
})
137-
127+
func trustedResolvers() *resolve.Resolvers {
138128
if pool := resolve.NewResolvers(); pool != nil {
139-
for _, r := range blr {
140-
_ = pool.AddResolvers(r.qps, r.address)
141-
}
142129
pool.SetTimeout(3 * time.Second)
143-
pool.SetDetectionResolver(50, "8.8.8.8")
144-
return pool, pool.Len()
130+
pool.SetDetectionResolver("8.8.8.8")
131+
return pool
145132
}
146-
return nil, 0
133+
return nil
147134
}

engine/plugins/support/support.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
oamdns "github.com/owasp-amass/open-asset-model/dns"
2424
oamnet "github.com/owasp-amass/open-asset-model/network"
2525
"github.com/owasp-amass/open-asset-model/url"
26-
"github.com/owasp-amass/resolve"
2726
xurls "mvdan.cc/xurls/v2"
2827
)
2928

@@ -36,9 +35,7 @@ var subre, urlre *regexp.Regexp
3635

3736
func init() {
3837
done = make(chan struct{})
39-
rate := resolve.NewRateTracker()
40-
trusted, _ = trustedResolvers()
41-
trusted.SetRateTracker(rate)
38+
trusted = trustedResolvers()
4239

4340
urlre = xurls.Relaxed()
4441
subre = regexp.MustCompile(dns.AnySubdomainRegexString())

0 commit comments

Comments
 (0)