Skip to content

Resolve default IPv4 and IPv6 addresses #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve default IPv4 and IPv6 addresses #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package challtestsrv

import (
"context"
"net"

"github.com/miekg/dns"
Expand Down Expand Up @@ -86,20 +87,32 @@ func (s *ChallSrv) aAnswers(q dns.Question) []dns.RR {
values = []string{defaultIPv4}
}
for _, resp := range values {
var ipAddrs []net.IP
ipAddr := net.ParseIP(resp)
if ipAddr == nil || ipAddr.To4() == nil {
// If the mock data isn't a valid IPv4 address, don't use it.
continue
var err error
// We resolve every time and do not cache it here but we leave
// it to the upstream resolver to cache it.
ipAddrs, err = net.DefaultResolver.LookupIP(context.Background(), "ip4", resp)
if err != nil {
// If the mock data isn't a valid IPv4 address and resolving
// it didn't work as well, don't use it.
continue
}
} else {
ipAddrs = []net.IP{ipAddr}
}
record := &dns.A{
Hdr: dns.RR_Header{
Name: q.Name,
Rrtype: dns.TypeA,
Class: dns.ClassINET,
},
A: ipAddr,
for _, ipAddr := range ipAddrs {
record := &dns.A{
Hdr: dns.RR_Header{
Name: q.Name,
Rrtype: dns.TypeA,
Class: dns.ClassINET,
},
A: ipAddr,
}
records = append(records, record)
}
records = append(records, record)
}
return records
}
Expand All @@ -115,20 +128,32 @@ func (s *ChallSrv) aaaaAnswers(q dns.Question) []dns.RR {
values = []string{defaultIPv6}
}
for _, resp := range values {
var ipAddrs []net.IP
ipAddr := net.ParseIP(resp)
if ipAddr == nil || ipAddr.To4() != nil {
// If the mock data isn't a valid IPv6 address, don't use it.
continue
var err error
// We resolve every time and do not cache it here but we leave
// it to the upstream resolver to cache it.
ipAddrs, err = net.DefaultResolver.LookupIP(context.Background(), "ip6", resp)
if err != nil {
// If the mock data isn't a valid IPv6 address and resolving
// it didn't work as well, don't use it.
continue
}
} else {
ipAddrs = []net.IP{ipAddr}
}
record := &dns.AAAA{
Hdr: dns.RR_Header{
Name: q.Name,
Rrtype: dns.TypeAAAA,
Class: dns.ClassINET,
},
AAAA: ipAddr,
for _, ipAddr := range ipAddrs {
record := &dns.AAAA{
Hdr: dns.RR_Header{
Name: q.Name,
Rrtype: dns.TypeAAAA,
Class: dns.ClassINET,
},
AAAA: ipAddr,
}
records = append(records, record)
}
records = append(records, record)
}
return records
}
Expand Down