simon/acme-dns
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Minor refactoring, error returns and e2e testing suite

Browse Source
This commit is contained in:
Joona Hoikkala
2026-02-03 23:27:11 +02:00
parent dc1a8f54b1
commit 48bfe812c0
12 changed files with 275 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/auth.go
+1 -1
View File
@@ -67,7 +67,7 @@ func (a *AcmednsAPI) getUserFromRequest(r *http.Request) (acmedns.ACMETxt, error
passwd := r.Header.Get("X-Api-Key")
username, err := getValidUsername(uname)
if err != nil {
return acmedns.ACMETxt{}, fmt.Errorf("invalid username: %s: %s", uname, err.Error())
return acmedns.ACMETxt{}, fmt.Errorf("invalid username: %s: %w", uname, err)
}
if validKey(passwd) {
dbuser, err := a.DB.GetByUsername(username)
pkg/database/db.go
+3 -4
View File
@@ -3,7 +3,6 @@ package database
import (
"database/sql"
"encoding/json"
"errors"
"fmt"
"regexp"
"strconv"
@@ -216,7 +215,7 @@ func (d *acmednsdb) Register(afrom acmedns.Cidrslice) (acmedns.ACMETxt, error) {
if err != nil {
d.Logger.Errorw("Database error in prepare",
"error", err.Error())
return a, errors.New("SQL error")
return a, fmt.Errorf("failed to prepare registration statement: %w", err)
}
defer sm.Close()
_, err = sm.Exec(a.Username.String(), passwordHash, a.Subdomain, a.AllowFrom.JSON())
@@ -246,7 +245,7 @@ func (d *acmednsdb) GetByUsername(u uuid.UUID) (acmedns.ACMETxt, error) {
defer sm.Close()
rows, err := sm.Query(u.String())
if err != nil {
return acmedns.ACMETxt{}, err
return acmedns.ACMETxt{}, fmt.Errorf("failed to query user: %w", err)
}
defer rows.Close()
@@ -261,7 +260,7 @@ func (d *acmednsdb) GetByUsername(u uuid.UUID) (acmedns.ACMETxt, error) {
if len(results) > 0 {
return results[0], nil
}
return acmedns.ACMETxt{}, errors.New("no user")
return acmedns.ACMETxt{}, fmt.Errorf("user not found: %s", u.String())
}
func (d *acmednsdb) GetTXTForDomain(domain string) ([]string, error) {
pkg/nameserver/handler.go
+25 -27
View File
@@ -55,13 +55,14 @@ func (n *Nameserver) answer(q dns.Question) ([]dns.RR, int, bool, error) {
var rcode int
var err error
var txtRRs []dns.RR
var authoritative = n.isAuthoritative(q)
if !n.isOwnChallenge(q.Name) && !n.answeringForDomain(q.Name) {
loweredName := strings.ToLower(q.Name)
var authoritative = n.isAuthoritative(loweredName)
if !n.isOwnChallenge(loweredName) && !n.answeringForDomain(loweredName) {
rcode = dns.RcodeNameError
}
r, _ := n.getRecord(q)
r, _ := n.getRecord(loweredName, q.Qtype)
if q.Qtype == dns.TypeTXT {
if n.isOwnChallenge(q.Name) {
if n.isOwnChallenge(loweredName) {
txtRRs, err = n.answerOwnChallenge(q)
} else {
txtRRs, err = n.answerTXT(q)
@@ -101,31 +102,28 @@ func (n *Nameserver) answerTXT(q dns.Question) ([]dns.RR, error) {
return ra, nil
}
func (n *Nameserver) isAuthoritative(q dns.Question) bool {
if n.answeringForDomain(q.Name) {
func (n *Nameserver) isAuthoritative(name string) bool {
if n.answeringForDomain(name) {
return true
}
domainParts := strings.Split(strings.ToLower(q.Name), ".")
for i := range domainParts {
if n.answeringForDomain(strings.Join(domainParts[i:], ".")) {
off := 0
for {
i, next := dns.NextLabel(name, off)
if next {
return false
}
off = i
if n.answeringForDomain(name[off:]) {
return true
}
}
return false
}
// isOwnChallenge checks if the query is for the domain of this acme-dns instance. Used for answering its own ACME challenges
func (n *Nameserver) isOwnChallenge(name string) bool {
domainParts := strings.SplitN(name, ".", 2)
if len(domainParts) == 2 {
if strings.ToLower(domainParts[0]) == "_acme-challenge" {
domain := strings.ToLower(domainParts[1])
if !strings.HasSuffix(domain, ".") {
domain = domain + "."
}
if domain == n.OwnDomain {
return true
}
if strings.HasPrefix(name, "_acme-challenge.") {
domain := name[16:]
if domain == n.OwnDomain {
return true
}
}
return false
@@ -133,22 +131,22 @@ func (n *Nameserver) isOwnChallenge(name string) bool {
// answeringForDomain checks if we have any records for a domain
func (n *Nameserver) answeringForDomain(name string) bool {
if n.OwnDomain == strings.ToLower(name) {
if n.OwnDomain == name {
return true
}
_, ok := n.Domains[strings.ToLower(name)]
_, ok := n.Domains[name]
return ok
}
func (n *Nameserver) getRecord(q dns.Question) ([]dns.RR, error) {
func (n *Nameserver) getRecord(name string, qtype uint16) ([]dns.RR, error) {
var rr []dns.RR
var cnames []dns.RR
domain, ok := n.Domains[strings.ToLower(q.Name)]
domain, ok := n.Domains[name]
if !ok {
return rr, fmt.Errorf("no records for domain %s", q.Name)
return rr, fmt.Errorf("no records for domain %s", name)
}
for _, ri := range domain.Records {
if ri.Header().Rrtype == q.Qtype {
if ri.Header().Rrtype == qtype {
rr = append(rr, ri)
}
if ri.Header().Rrtype == dns.TypeCNAME {
pkg/nameserver/handler_test.go
+5 -5
View File
@@ -25,7 +25,7 @@ func TestNameserver_isOwnChallenge(t *testing.T) {
OwnDomain: "some-domain.test.",
},
args: args{
name: "_acme-challenge.some-domain.test",
name: "_acme-challenge.some-domain.test.",
},
want: true,
},
@@ -35,7 +35,7 @@ func TestNameserver_isOwnChallenge(t *testing.T) {
OwnDomain: "some-domain.test.",
},
args: args{
name: "_acme-challenge.some-other-domain.test",
name: "_acme-challenge.some-other-domain.test.",
},
want: false,
},
@@ -45,7 +45,7 @@ func TestNameserver_isOwnChallenge(t *testing.T) {
OwnDomain: "domain.test.",
},
args: args{
name: "domain.test",
name: "domain.test.",
},
want: false,
},
@@ -55,7 +55,7 @@ func TestNameserver_isOwnChallenge(t *testing.T) {
OwnDomain: "domain.test.",
},
args: args{
name: "my-domain.test",
name: "my-domain.test.",
},
want: false,
},
@@ -142,7 +142,7 @@ func TestNameserver_isAuthoritative(t *testing.T) {
OwnDomain: tt.fields.OwnDomain,
Domains: tt.fields.Domains,
}
if got := n.isAuthoritative(tt.args.q); got != tt.want {
if got := n.isAuthoritative(tt.args.q.Name); got != tt.want {
t.Errorf("isAuthoritative() = %v, want %v", got, tt.want)
}
})
pkg/nameserver/initialize.go
+2 -1
View File
@@ -1,6 +1,7 @@
package nameserver
import (
"fmt"
"strings"
"sync"
@@ -95,7 +96,7 @@ func (n *Nameserver) Start(errorChannel chan error) {
}
err := n.Server.ListenAndServe()
if err != nil {
errorChannel <- err
errorChannel <- fmt.Errorf("DNS server %s failed: %w", n.Server.Net, err)
}
}