mirror of
https://github.com/acme-dns/acme-dns.git
synced 2026-02-22 09:35:35 -07:00
* Refactor core * Re-added tests * Small fixes * Add tests for acmetxt cidrslice and util funcs * Remove the last dangling reference to old logging package * Refactoring (#327) * chore: enable more linters and fix linter issues * ci: enable linter checks on all branches and disable recurring checks recurring linter checks don't make that much sense. The code & linter checks should not change on their own over night ;) * chore: update packages * Revert "chore: update packages" This reverts commit 30250bf28c4b39e9e5b3af012a4e28ab036bf9af. * chore: manually upgrade some packages * Updated dependencies, wrote changelog entry and fixed namespace for release * Refactoring - improving coverage (#371) * Increase code coverage in acmedns * More testing of ReadConfig() and its fallback mechanism * Found that if someone put a '"' double quote into the filename that we configure zap to log to, it would cause the the JSON created to be invalid. I have replaced the JSON string with proper config * Better handling of config options for api.TLS - we now error on an invalid value instead of silently failing. added a basic test for api.setupTLS() (to increase test coverage) * testing nameserver isOwnChallenge and isAuthoritative methods * add a unit test for nameserver answerOwnChallenge * fix linting errors * bump go and golangci-lint versions in github actions * Update golangci-lint.yml Bumping github-actions workflow versions to accommodate some changes in upstream golanci-lint * Bump Golang version to 1.23 (currently the oldest supported version) Bump golanglint-ci to 2.0.2 and migrate the config file. This should resolve the math/rand/v2 issue * bump golanglint-ci action version * Fixing up new golanglint-ci warnings and errors --------- Co-authored-by: Joona Hoikkala <5235109+joohoi@users.noreply.github.com> * Minor refactoring, error returns and e2e testing suite * Add a few tests * Fix linter and umask setting * Update github actions * Refine concurrency configuration for GitHub actions * HTTP timeouts to API, and self-validation mutex to nameserver ops --------- Co-authored-by: Florian Ritterhoff <32478819+fritterhoff@users.noreply.github.com> Co-authored-by: Jason Playne <jason@jasonplayne.com>
107 lines
3.2 KiB
Go
107 lines
3.2 KiB
Go
package nameserver
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/miekg/dns"
|
|
"go.uber.org/zap"
|
|
|
|
"github.com/joohoi/acme-dns/pkg/acmedns"
|
|
)
|
|
|
|
// Records is a slice of ResourceRecords
|
|
type Records struct {
|
|
Records []dns.RR
|
|
}
|
|
|
|
type Nameserver struct {
|
|
Config *acmedns.AcmeDnsConfig
|
|
DB acmedns.AcmednsDB
|
|
Logger *zap.SugaredLogger
|
|
Server *dns.Server
|
|
OwnDomain string
|
|
NotifyStartedFunc func()
|
|
SOA dns.RR
|
|
mu sync.RWMutex
|
|
personalAuthKey string
|
|
Domains map[string]Records
|
|
errChan chan error
|
|
}
|
|
|
|
func InitAndStart(config *acmedns.AcmeDnsConfig, db acmedns.AcmednsDB, logger *zap.SugaredLogger, errChan chan error) []acmedns.AcmednsNS {
|
|
dnsservers := make([]acmedns.AcmednsNS, 0)
|
|
waitLock := sync.Mutex{}
|
|
if strings.HasPrefix(config.General.Proto, "both") {
|
|
|
|
// Handle the case where DNS server should be started for both udp and tcp
|
|
udpProto := "udp"
|
|
tcpProto := "tcp"
|
|
if strings.HasSuffix(config.General.Proto, "4") {
|
|
udpProto += "4"
|
|
tcpProto += "4"
|
|
} else if strings.HasSuffix(config.General.Proto, "6") {
|
|
udpProto += "6"
|
|
tcpProto += "6"
|
|
}
|
|
dnsServerUDP := NewDNSServer(config, db, logger, udpProto)
|
|
dnsservers = append(dnsservers, dnsServerUDP)
|
|
dnsServerUDP.ParseRecords()
|
|
dnsServerTCP := NewDNSServer(config, db, logger, tcpProto)
|
|
dnsservers = append(dnsservers, dnsServerTCP)
|
|
dnsServerTCP.ParseRecords()
|
|
// wait for the server to get started to proceed
|
|
waitLock.Lock()
|
|
dnsServerUDP.SetNotifyStartedFunc(waitLock.Unlock)
|
|
go dnsServerUDP.Start(errChan)
|
|
waitLock.Lock()
|
|
dnsServerTCP.SetNotifyStartedFunc(waitLock.Unlock)
|
|
go dnsServerTCP.Start(errChan)
|
|
waitLock.Lock()
|
|
} else {
|
|
dnsServer := NewDNSServer(config, db, logger, config.General.Proto)
|
|
dnsservers = append(dnsservers, dnsServer)
|
|
dnsServer.ParseRecords()
|
|
waitLock.Lock()
|
|
dnsServer.SetNotifyStartedFunc(waitLock.Unlock)
|
|
go dnsServer.Start(errChan)
|
|
waitLock.Lock()
|
|
}
|
|
return dnsservers
|
|
}
|
|
|
|
// NewDNSServer parses the DNS records from config and returns a new DNSServer struct
|
|
func NewDNSServer(config *acmedns.AcmeDnsConfig, db acmedns.AcmednsDB, logger *zap.SugaredLogger, proto string) acmedns.AcmednsNS {
|
|
// dnsServerTCP := NewDNSServer(DB, Config.General.Listen, tcpProto, Config.General.Domain)
|
|
server := Nameserver{Config: config, DB: db, Logger: logger}
|
|
server.Server = &dns.Server{Addr: config.General.Listen, Net: proto}
|
|
domain := config.General.Domain
|
|
if !strings.HasSuffix(domain, ".") {
|
|
domain = domain + "."
|
|
}
|
|
server.OwnDomain = strings.ToLower(domain)
|
|
server.personalAuthKey = ""
|
|
server.Domains = make(map[string]Records)
|
|
return &server
|
|
}
|
|
|
|
func (n *Nameserver) Start(errorChannel chan error) {
|
|
n.errChan = errorChannel
|
|
dns.HandleFunc(".", n.handleRequest)
|
|
n.Logger.Infow("Starting DNS listener",
|
|
"addr", n.Server.Addr,
|
|
"proto", n.Server.Net)
|
|
if n.NotifyStartedFunc != nil {
|
|
n.Server.NotifyStartedFunc = n.NotifyStartedFunc
|
|
}
|
|
err := n.Server.ListenAndServe()
|
|
if err != nil {
|
|
errorChannel <- fmt.Errorf("DNS server %s failed: %w", n.Server.Net, err)
|
|
}
|
|
}
|
|
|
|
func (n *Nameserver) SetNotifyStartedFunc(fun func()) {
|
|
n.Server.NotifyStartedFunc = fun
|
|
}
|