From cba454c6e5881639b645f896fb97f8dc7da37bec Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 8 Apr 2026 20:50:30 +0700
Subject: [PATCH] services: validate aliases atomically on registration

Check primary name and all aliases before mutating the registry so a
collision cannot leave a service half-registered. Also reject self-aliases
and duplicate aliases within the same registration.
---
 internal/service/registry.go | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/internal/service/registry.go b/internal/service/registry.go
index d9a25db6..b337e202 100644
--- a/internal/service/registry.go
+++ b/internal/service/registry.go
@@ -67,10 +67,34 @@ func RegisterService(creator happydns.ServiceCreator, analyzer ServiceAnalyzer,
 	// A second registration of the same name almost always means a plugin is
 	// shadowing a built-in (or another plugin) by accident. Log loudly and
 	// keep the existing entry rather than silently overwriting it.
+	//
+	// We validate the primary name *and* every alias up-front, before
+	// touching the registry, so that a collision on an alias cannot leave
+	// the service half-registered (primary in, some aliases in, the rest
+	// rejected). Either the whole set lands or none of it does.
 	if _, exists := services[name]; exists {
 		log.Printf("Warning: service %q is already registered; ignoring duplicate registration", name)
 		return
 	}
+	for _, alias := range aliases {
+		if alias == name {
+			log.Printf("Warning: service %q lists its own primary name as an alias; ignoring registration", name)
+			return
+		}
+		if _, exists := services[alias]; exists {
+			log.Printf("Warning: service %q cannot be registered: alias %q is already taken; ignoring registration", name, alias)
+			return
+		}
+	}
+	// Catch duplicates *within* the alias list itself.
+	seen := make(map[string]struct{}, len(aliases))
+	for _, alias := range aliases {
+		if _, dup := seen[alias]; dup {
+			log.Printf("Warning: service %q lists alias %q twice; ignoring registration", name, alias)
+			return
+		}
+		seen[alias] = struct{}{}
+	}
 
 	// Invalidate ordered_services, which serve as cache
 	ordered_services = nil
@@ -88,12 +112,7 @@ func RegisterService(creator happydns.ServiceCreator, analyzer ServiceAnalyzer,
 	}
 	services[name] = svc
 
-	// Register aliases
 	for _, alias := range aliases {
-		if _, exists := services[alias]; exists {
-			log.Printf("Warning: service alias %q is already registered; ignoring", alias)
-			continue
-		}
 		services[alias] = svc
 	}