Compare commits
1 Commits
66f8ad4048
...
fix/query-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc35480e26 |
@@ -227,7 +227,7 @@ func (r *Resolver) followDelegation(
|
|||||||
|
|
||||||
authNS := extractNSSet(resp.Ns)
|
authNS := extractNSSet(resp.Ns)
|
||||||
if len(authNS) == 0 {
|
if len(authNS) == 0 {
|
||||||
return r.resolveNSIterative(ctx, domain)
|
return r.resolveNSRecursive(ctx, domain)
|
||||||
}
|
}
|
||||||
|
|
||||||
glue := extractGlue(resp.Extra)
|
glue := extractGlue(resp.Extra)
|
||||||
@@ -291,84 +291,70 @@ func (r *Resolver) resolveNSIPs(
|
|||||||
return ips
|
return ips
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolveNSIterative queries for NS records using iterative
|
// publicResolvers returns well-known public recursive DNS resolvers.
|
||||||
// resolution as a fallback when followDelegation finds no
|
func publicResolvers() []string {
|
||||||
// authoritative answer in the delegation chain.
|
return []string{
|
||||||
func (r *Resolver) resolveNSIterative(
|
"1.1.1.1", // Cloudflare
|
||||||
|
"8.8.8.8", // Google
|
||||||
|
"9.9.9.9", // Quad9
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveNSRecursive queries for NS records using a public
|
||||||
|
// recursive resolver as a fallback for intercepted environments.
|
||||||
|
func (r *Resolver) resolveNSRecursive(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
domain string,
|
domain string,
|
||||||
) ([]string, error) {
|
) ([]string, error) {
|
||||||
if checkCtx(ctx) != nil {
|
|
||||||
return nil, ErrContextCanceled
|
|
||||||
}
|
|
||||||
|
|
||||||
domain = dns.Fqdn(domain)
|
domain = dns.Fqdn(domain)
|
||||||
servers := rootServerList()
|
msg := new(dns.Msg)
|
||||||
|
msg.SetQuestion(domain, dns.TypeNS)
|
||||||
|
msg.RecursionDesired = true
|
||||||
|
|
||||||
for range maxDelegation {
|
for _, ip := range publicResolvers() {
|
||||||
if checkCtx(ctx) != nil {
|
if checkCtx(ctx) != nil {
|
||||||
return nil, ErrContextCanceled
|
return nil, ErrContextCanceled
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := r.queryServers(
|
addr := net.JoinHostPort(ip, "53")
|
||||||
ctx, servers, domain, dns.TypeNS,
|
|
||||||
)
|
resp, _, err := r.client.ExchangeContext(ctx, msg, addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
nsNames := extractNSSet(resp.Answer)
|
nsNames := extractNSSet(resp.Answer)
|
||||||
if len(nsNames) > 0 {
|
if len(nsNames) > 0 {
|
||||||
return nsNames, nil
|
return nsNames, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Follow delegation.
|
|
||||||
authNS := extractNSSet(resp.Ns)
|
|
||||||
if len(authNS) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
glue := extractGlue(resp.Extra)
|
|
||||||
nextServers := glueIPs(authNS, glue)
|
|
||||||
|
|
||||||
if len(nextServers) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
servers = nextServers
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, ErrNoNameservers
|
return nil, ErrNoNameservers
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolveARecord resolves a hostname to IPv4 addresses using
|
// resolveARecord resolves a hostname to IPv4 addresses using
|
||||||
// iterative resolution through the delegation chain.
|
// public recursive resolvers.
|
||||||
func (r *Resolver) resolveARecord(
|
func (r *Resolver) resolveARecord(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
hostname string,
|
hostname string,
|
||||||
) ([]string, error) {
|
) ([]string, error) {
|
||||||
if checkCtx(ctx) != nil {
|
|
||||||
return nil, ErrContextCanceled
|
|
||||||
}
|
|
||||||
|
|
||||||
hostname = dns.Fqdn(hostname)
|
hostname = dns.Fqdn(hostname)
|
||||||
servers := rootServerList()
|
msg := new(dns.Msg)
|
||||||
|
msg.SetQuestion(hostname, dns.TypeA)
|
||||||
|
msg.RecursionDesired = true
|
||||||
|
|
||||||
for range maxDelegation {
|
for _, ip := range publicResolvers() {
|
||||||
if checkCtx(ctx) != nil {
|
if checkCtx(ctx) != nil {
|
||||||
return nil, ErrContextCanceled
|
return nil, ErrContextCanceled
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := r.queryServers(
|
addr := net.JoinHostPort(ip, "53")
|
||||||
ctx, servers, hostname, dns.TypeA,
|
|
||||||
)
|
resp, _, err := r.client.ExchangeContext(ctx, msg, addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf(
|
continue
|
||||||
"resolving %s: %w", hostname, err,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for A records in the answer section.
|
|
||||||
var ips []string
|
var ips []string
|
||||||
|
|
||||||
for _, rr := range resp.Answer {
|
for _, rr := range resp.Answer {
|
||||||
@@ -380,24 +366,6 @@ func (r *Resolver) resolveARecord(
|
|||||||
if len(ips) > 0 {
|
if len(ips) > 0 {
|
||||||
return ips, nil
|
return ips, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Follow delegation if present.
|
|
||||||
authNS := extractNSSet(resp.Ns)
|
|
||||||
if len(authNS) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
glue := extractGlue(resp.Extra)
|
|
||||||
nextServers := glueIPs(authNS, glue)
|
|
||||||
|
|
||||||
if len(nextServers) == 0 {
|
|
||||||
// Resolve NS IPs iteratively — but guard
|
|
||||||
// against infinite recursion by using only
|
|
||||||
// already-resolved servers.
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
servers = nextServers
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf(
|
return nil, fmt.Errorf(
|
||||||
|
|||||||
Reference in New Issue
Block a user