Enable support for a plethora of more DNS types. (#24)

Author: patrickdappollonio

internal/dns/dns.go

@@ -240,29 +240,12 @@ func HandleRemoteDNSQuery(ctx context.Context, request mcp.CallToolRequest, conf
 }
 
 // ConvertToQType converts a string record type to the corresponding DNS query type.
+// This function supports all DNS record types available in the miekg/dns package.
 func ConvertToQType(recordType string) (uint16, error) {
-	switch recordType {
-	case "A":
-		return dns.TypeA, nil
-	case "AAAA":
-		return dns.TypeAAAA, nil
-	case "CNAME":
-		return dns.TypeCNAME, nil
-	case "MX":
-		return dns.TypeMX, nil
-	case "NS":
-		return dns.TypeNS, nil
-	case "PTR":
-		return dns.TypePTR, nil
-	case "SOA":
-		return dns.TypeSOA, nil
-	case "SRV":
-		return dns.TypeSRV, nil
-	case "TXT":
-		return dns.TypeTXT, nil
-	default:
-		return 0, fmt.Errorf("unsupported record type: %s", recordType)
+	if qtype, exists := dns.StringToType[recordType]; exists {
+		return qtype, nil
 	}
+	return 0, fmt.Errorf("unsupported record type %q", recordType)
 }
 
 // createDNSResponse creates a JSON-serializable map from a DNS message.
@@ -306,6 +289,10 @@ func createDNSResponse(response *dns.Msg) map[string]any {
 			if rec, ok := a.(*dns.AAAA); ok {
 				data = rec.AAAA.String()
 			}
+		case dns.TypeCAA:
+			if rec, ok := a.(*dns.CAA); ok {
+				data = fmt.Sprintf("%d %s %q", rec.Flag, rec.Tag, rec.Value)
+			}
 		case dns.TypeCNAME:
 			if rec, ok := a.(*dns.CNAME); ok {
 				data = rec.Target

internal/server/server.go

@@ -2,11 +2,13 @@ package server
 
 import (
 	"context"
+	"slices"
 	"time"
 
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
-	"github.com/patrickdappollonio/mcp-domaintools/internal/dns"
+	"github.com/miekg/dns"
+	internaldns "github.com/patrickdappollonio/mcp-domaintools/internal/dns"
 	"github.com/patrickdappollonio/mcp-domaintools/internal/http_ping"
 	"github.com/patrickdappollonio/mcp-domaintools/internal/ping"
 	"github.com/patrickdappollonio/mcp-domaintools/internal/resolver"
@@ -16,7 +18,7 @@ import (
 
 // DomainToolsConfig contains configuration for the domain tools.
 type DomainToolsConfig struct {
-	QueryConfig    *dns.QueryConfig
+	QueryConfig    *internaldns.QueryConfig
 	WhoisConfig    *whois.Config
 	ResolverConfig *resolver.Config
 	PingConfig     *ping.Config
@@ -25,6 +27,16 @@ type DomainToolsConfig struct {
 	Version        string
 }
 
+// getDNSRecordTypes returns a sorted slice of all DNS record type names.
+func getDNSRecordTypes() []string {
+	var recordTypes []string
+	for recordType := range dns.StringToType {
+		recordTypes = append(recordTypes, recordType)
+	}
+	slices.Sort(recordTypes)
+	return recordTypes
+}
+
 // SetupTools creates and configures the domain query tools.
 func SetupTools(config *DomainToolsConfig) (*server.MCPServer, error) {
 	// Create a new MCP server
@@ -34,6 +46,9 @@ func SetupTools(config *DomainToolsConfig) (*server.MCPServer, error) {
 		server.WithRecovery(),
 	)
 
+	// Get all available DNS record types for the enum
+	dnsRecordTypes := getDNSRecordTypes()
+
 	// Initialize resolver config if not provided
 	if config.ResolverConfig == nil {
 		config.ResolverConfig = &resolver.Config{
@@ -74,8 +89,8 @@ func SetupTools(config *DomainToolsConfig) (*server.MCPServer, error) {
 		),
 		mcp.WithString("record_type",
 			mcp.Required(),
-			mcp.Description("The type of DNS record to query; defaults to A"),
-			mcp.Enum("A", "AAAA", "CNAME", "MX", "NS", "PTR", "SOA", "SRV", "TXT"),
+			mcp.Description("The type of DNS record to query (supports all standard DNS record types); defaults to A"),
+			mcp.Enum(dnsRecordTypes...),
 			mcp.DefaultString("A"),
 		),
 	)
@@ -89,8 +104,8 @@ func SetupTools(config *DomainToolsConfig) (*server.MCPServer, error) {
 		),
 		mcp.WithString("record_type",
 			mcp.Required(),
-			mcp.Description("The type of DNS record to query; defaults to A"),
-			mcp.Enum("A", "AAAA", "CNAME", "MX", "NS", "PTR", "SOA", "SRV", "TXT"),
+			mcp.Description("The type of DNS record to query (supports all standard DNS record types); defaults to A"),
+			mcp.Enum(dnsRecordTypes...),
 			mcp.DefaultString("A"),
 		),
 	)
@@ -173,11 +188,11 @@ func SetupTools(config *DomainToolsConfig) (*server.MCPServer, error) {
 
 	// Create handler wrappers
 	localDNSHandler := func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-		return dns.HandleLocalDNSQuery(ctx, request, config.QueryConfig)
+		return internaldns.HandleLocalDNSQuery(ctx, request, config.QueryConfig)
 	}
 
 	remoteDNSHandler := func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-		return dns.HandleRemoteDNSQuery(ctx, request, config.QueryConfig)
+		return internaldns.HandleRemoteDNSQuery(ctx, request, config.QueryConfig)
 	}
 
 	whoisHandler := func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {