mirrors/acme-dns
1
0
Fork 0
mirror of https://github.com/joohoi/acme-dns.git synced 2024-12-22 21:33:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Respond case insensitively to A and SOA requests (#152)

Browse Source 
* When appending the SOA for authoritative NXDOMAIN responses, it needs to go in
the Authoritative section, not the Answer section.

This fixes the acme-dns validation for the lego Let's Encrypt client.

* Respond case-insensitively to A and SOA requests. Add corresponding tests.

This fixes the autocert feature with Let's Encrypt, because Let's Encrypt does
a lookup for the A record with a deliberately mangled case.
This commit is contained in:
Ward Vandewege 2019-02-07 02:16:33 -05:00 committed by Joona Hoikkala
parent 41a1cff0ae
commit 37db83e5b7
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dns.go
View File

@ -113,7 +113,7 @@ func (d *DNSServer) readQuery(m *dns.Msg) {
func (d *DNSServer) getRecord(q dns.Question) ([]dns.RR, error) { func (d *DNSServer) getRecord(q dns.Question) ([]dns.RR, error) {
var rr []dns.RR var rr []dns.RR
var cnames []dns.RR var cnames []dns.RR
domain, ok := d.Domains[q.Name] domain, ok := d.Domains[strings.ToLower(q.Name)]
if !ok { if !ok {
return rr, fmt.Errorf("No records for domain %s", q.Name) return rr, fmt.Errorf("No records for domain %s", q.Name)
} }
@ -133,7 +133,7 @@ func (d *DNSServer) getRecord(q dns.Question) ([]dns.RR, error) {
// answeringForDomain checks if we have any records for a domain // answeringForDomain checks if we have any records for a domain
func (d *DNSServer) answeringForDomain(name string) bool { func (d *DNSServer) answeringForDomain(name string) bool {
_, ok := d.Domains[name] _, ok := d.Domains[strings.ToLower(name)]
return ok return ok
} }
@ -141,7 +141,7 @@ func (d *DNSServer) isAuthoritative(q dns.Question) bool {
if d.answeringForDomain(q.Name) { if d.answeringForDomain(q.Name) {
return true return true
} }
domainParts := strings.Split(q.Name, ".") domainParts := strings.Split(strings.ToLower(q.Name), ".")
for i := range domainParts { for i := range domainParts {
if d.answeringForDomain(strings.Join(domainParts[i:], ".")) { if d.answeringForDomain(strings.Join(domainParts[i:], ".")) {
return true return true

24
dns_test.go
View File

@ -218,3 +218,27 @@ func TestResolveTXT(t *testing.T) {
} }
} }
} }
func TestCaseInsensitiveResolveA(t *testing.T) {
resolv := resolver{server: "127.0.0.1:15353"}
answer, err := resolv.lookup("aUtH.eXAmpLe.org", dns.TypeA)
if err != nil {
t.Errorf("%v", err)
}
if len(answer.Answer) == 0 {
t.Error("No answer for DNS query")
}
}
func TestCaseInsensitiveResolveSOA(t *testing.T) {
resolv := resolver{server: "127.0.0.1:15353"}
answer, _ := resolv.lookup("doesnotexist.aUtH.eXAmpLe.org", dns.TypeSOA)
if answer.Rcode != dns.RcodeNameError {
t.Errorf("Was expecing NXDOMAIN rcode, but got [%s] instead.", dns.RcodeToString[answer.Rcode])
}
if len(answer.Ns) == 0 {
t.Error("No SOA answer for DNS query")
}
}