fix: normalize DNS names to lowercase

ipshipyard · Sep 18, 2024 · d060dac · d060dac
1 parent f9d8f07
commit d060dac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/acme/reader.go b/acme/reader.go
@@ -27,8 +27,9 @@ func (p acmeReader) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
 			continue
 		}
 
-		subdomain := strings.TrimSuffix(q.Name, "."+p.ForgeDomain+".")
-		if len(subdomain) == len(q.Name) || len(subdomain) == 0 {
+		normalizedName := strings.ToLower(q.Name)
+		subdomain := strings.TrimSuffix(normalizedName, "."+p.ForgeDomain+".")
+		if len(subdomain) == len(normalizedName) || len(subdomain) == 0 {
 			continue
 		}
 

diff --git a/acme/setup.go b/acme/setup.go
@@ -69,7 +69,7 @@ func parse(c *caddy.Controller) (*acmeReader, *acmeWriter, error) {
 		case 0:
 			return nil, nil, c.ArgErr()
 		case 1:
-			forgeDomain = args[0]
+			forgeDomain = strings.ToLower(args[0])
 		default:
 			return nil, nil, c.ArgErr()
 		}
@@ -82,7 +82,7 @@ func parse(c *caddy.Controller) (*acmeReader, *acmeWriter, error) {
 					return nil, nil, c.ArgErr()
 				}
 
-				forgeRegistrationDomain = args[0]
+				forgeRegistrationDomain = strings.ToLower(args[0])
 				for i := 1; i < len(args); i++ {
 					nextArg := args[i]
 					argKV := strings.Split(nextArg, "=")

diff --git a/ipparser/plugin.go b/ipparser/plugin.go
@@ -34,7 +34,7 @@ func setup(c *caddy.Controller) error {
 
 	// Add the Plugin to CoreDNS, so Servers can use it in their plugin chain.
 	dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
-		return ipParser{Next: next, ForgeDomain: forgeDomain}
+		return ipParser{Next: next, ForgeDomain: strings.ToLower(forgeDomain)}
 	})
 
 	return nil
@@ -52,8 +52,9 @@ func (p ipParser) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
 	var answers []dns.RR
 	containsNODATAResponse := false
 	for _, q := range r.Question {
-		subdomain := strings.TrimSuffix(q.Name, "."+p.ForgeDomain+".")
-		if len(subdomain) == len(q.Name) || len(subdomain) == 0 {
+		normalizedName := strings.ToLower(q.Name)
+		subdomain := strings.TrimSuffix(normalizedName, "."+p.ForgeDomain+".")
+		if len(subdomain) == len(normalizedName) || len(subdomain) == 0 {
 			continue
 		}