switch to miekg/dns for better results

cmd/domaincheckbot/dns/domain.go

@@ -1,8 +1,11 @@
 package dns
 
 import (
+	"fmt"
+	"github.com/miekg/dns"
 	"net"
-	"sort"
+	"slices"
+	"strings"
 )
 
 type Domain struct {
@@ -10,30 +13,63 @@ type Domain struct {
 	NS   []string
 }
 
-func CheckDomain(domain string) Domain {
-	nameservers, err := net.LookupNS(domain)
+func CheckDomain(domain, tld string) Domain {
+	nameservers := []string{}
+	// Create a new DNS message
+	m := new(dns.Msg)
+	// Set the question section of the message with the domain and query type
+	m.SetQuestion(dns.Fqdn(fmt.Sprintf("%v.%v", domain, tld)), dns.TypeNS)
 
-	if len(nameservers) > 0 && err == nil {
+	// Create a DNS client
+	c := new(dns.Client)
+	// Define the .com TLD server
+	ns, err := net.LookupNS(tld)
+	if err != nil {
 		return Domain{
-			Name: domain,
-			NS:   nsToArray(nameservers),
+			Name: domain + "." + tld,
+			NS:   nameservers,
 		}
 	}
+	var tldServer string
+	if len(ns) > 0 {
+		tldServer = strings.Trim(ns[0].Host, ".") + ":53"
+	} else {
+		//log.Fatalf("Could not resolve %v", tld)
+		return Domain{
+			Name: domain + "." + tld,
+			NS:   nameservers,
+		}
+	}
+
+	// Send the DNS query to the TLD server
+	r, _, err := c.Exchange(m, tldServer)
+	if err != nil {
+		//log.Fatalf("Failed to query the TLD server: %v", err)
+		return Domain{
+			Name: domain + "." + tld,
+			NS:   nameservers,
+		}
+	}
+
+	// Check for response errors
+	if r.Rcode != dns.RcodeSuccess {
+		//log.Fatalf("Failed to get a valid response: %v", r.Rcode)
+		return Domain{
+			Name: domain + "." + tld,
+			NS:   nameservers,
+		}
+	}
+
+	// Print the nameservers from the response
+	for _, ans := range r.Ns {
+		if ns, ok := ans.(*dns.NS); ok {
+			nameservers = append(nameservers, strings.ToLower(ns.Ns))
+		}
+	}
+
+	slices.Sort(nameservers)
 	return Domain{
-		Name: domain,
-		NS:   []string{},
+		Name: domain + "." + tld,
+		NS:   nameservers,
 	}
 }
-
-func nsToArray(nameservers []*net.NS) []string {
-	var nsArray []string
-	for _, nameserver := range nameservers {
-		nsArray = append(nsArray, nameserver.Host)
-	}
-
-	sort.SliceStable(nsArray, func(i, j int) bool {
-		return nsArray[i] < nsArray[j]
-	})
-
-	return nsArray
-}

cmd/domaincheckbot/main.go

@@ -67,7 +67,7 @@ func main() {
 			case <-ticker.C:
 				for d, tlds := range config.Domains {
 					for _, tld := range tlds {
-						go checkDomain(0, fmt.Sprintf("%v.%v", d, tld), query, client)
+						go checkDomain(0, d, tld, query, client)
 					}
 				}
 
@@ -85,18 +85,19 @@ func main() {
 	<-s
 }
 
-func checkDomain(counter int, d string, query *db.Queries, client webhook.Client) {
-	domain := dns.CheckDomain(d)
-	retrievedDomainJson, dbErr := query.GetItem(context.TODO(), d)
+func checkDomain(counter int, d, tld string, query *db.Queries, client webhook.Client) {
+	domain := dns.CheckDomain(d, tld)
+	fqdn := fmt.Sprintf("%s.%s", d, tld)
+	retrievedDomainJson, dbErr := query.GetItem(context.TODO(), fqdn)
 	retrievedDomain := dns.Domain{}
 	if err := json.Unmarshal(retrievedDomainJson.Data, &retrievedDomain); !errors.Is(dbErr, sql.ErrNoRows) && err != nil {
 		logger.Error("failed unmarshalling deal", slog.Any("error", err))
 	}
 	if reflect.DeepEqual(domain, retrievedDomain) {
-		logger.Debug("domain did not change", slog.String("domain", d))
+		logger.Debug("domain did not change", slog.String("domain", fqdn))
 		return
 	}
-	logger.Info("domain changed", slog.String("domain", d))
+	logger.Info("domain changed", slog.String("domain", fqdn))
 	counter += 1
 	if counter >= 2 {
 		go sendWebhook(client, domain, retrievedDomain)
@@ -113,7 +114,7 @@ func checkDomain(counter int, d string, query *db.Queries, client webhook.Client
 		return
 	}
 	time.Sleep(1 * time.Minute)
-	checkDomain(counter, d, query, client)
+	checkDomain(counter, d, tld, query, client)
 }
 
 func sendWebhook(client webhook.Client, domain dns.Domain, oldDomain dns.Domain) {