fix: fqdn error in NS and SOA

wintbiit · Dec 11, 2023 · 35886d9 · 35886d9
1 parent 3550d74
commit 35886d9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/model/config.go b/model/config.go
@@ -23,6 +23,12 @@ type Domain struct {
 	Upstream      string            `json:"upstream,default=127.0.0.1:53"`
 	Providers     map[string]string `json:"providers"`
 	TTL           uint32            `json:"ttl,default=60"`
+	Tsig          TSIG              `json:"tsig"`
+}
+
+type TSIG struct {
+	KeyName string `json:"key_name"`
+	Key     string `json:"key"`
 }
 
 type Rule struct {

diff --git a/provider/lark.go b/provider/lark.go
@@ -67,7 +67,11 @@ func (p *LarkProvider) Provide(ruleset string) ([]model.Record, error) {
 
 	var records []model.Record
 	for _, rec := range baseRec {
-		weight, err := strconv.ParseUint(rec.Fields["Weight"].(string), 10, 16)
+		weightStr, ok := rec.Fields["Weight"].(string)
+		if !ok {
+			weightStr = "0"
+		}
+		weight, err := strconv.ParseUint(weightStr, 10, 16)
 		if err != nil {
 			weight = 0
 		}

diff --git a/server/CNAME.go b/server/CNAME.go
@@ -28,9 +28,7 @@ func (s *RuleSet) handleCNAME(r, m *dns.Msg, name string) error {
 	s.l.Infof("Response for question: %+v", name)
 
 	cname := record.Value.String()
-	if !strings.HasSuffix(cname, ".") {
-		cname = cname + "." + s.DomainName
-	}
+	cname = dns.Fqdn(cname)
 
 	m.Answer = append(m.Answer, &dns.CNAME{
 		Hdr:    s.Header(record),

diff --git a/server/NS.go b/server/NS.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/miekg/dns"
 )
@@ -29,7 +28,7 @@ func (s *RuleSet) handleNS(r, m *dns.Msg, name string) error {
 
 	m.Answer = append(m.Answer, &dns.NS{
 		Hdr: s.Header(record),
-		Ns:  strings.TrimSuffix(record.Value.String(), "."),
+		Ns:  dns.Fqdn(record.Value.String()),
 	})
 
 	return nil

diff --git a/server/SOA.go b/server/SOA.go
@@ -31,7 +31,7 @@ func (s *RuleSet) handleSOA(r, m *dns.Msg, name string) error {
 	}
 	m.Answer = append(m.Answer, &dns.SOA{
 		Hdr:     s.Header(record),
-		Ns:      soa.NS,
+		Ns:      dns.Fqdn(soa.NS),
 		Mbox:    soa.MBox,
 		Serial:  soa.Serial,
 		Refresh: soa.Refresh,

diff --git a/server/server.go b/server/server.go
@@ -113,6 +113,11 @@ func (s *Server) handle(w dns.ResponseWriter, r *dns.Msg) {
 	m.SetReply(r)
 	m.Authoritative = s.Authoritative
 	m.RecursionAvailable = s.Recursion
+	if r.IsTsig() != nil {
+		if w.TsigStatus() != nil {
+			m.SetTsig(s.Tsig.KeyName, dns.HmacSHA256, 300, time.Now().Unix())
+		}
+	}
 
 	handler := s.MatchHandler(w)
 
@@ -136,6 +141,8 @@ func (s *Server) Header(r *model.Record) dns.RR_Header {
 	if r.Host != "@" {
 		name = r.Host + "." + s.DomainName
 	}
+	name = dns.Fqdn(name)
+
 	return dns.RR_Header{
 		Name:   name,
 		Rrtype: r.Type.DnsType(),