Merge pull request #1597 from /issues/1516-weavedns-ignore-foreign-do…

…mains Check weaveDNS subdomain on REST PUT Fixes #1516
weaveworks · Oct 28, 2015 · b697b6e · b697b6e
2 parents 94d7f33 + 7408f72
commit b697b6e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/nameserver/http.go b/nameserver/http.go
@@ -35,6 +35,11 @@ func (n *Nameserver) HandleHTTP(router *mux.Router, dockerCli *docker.Client) {
 			return
 		}
 
+		if !dns.IsSubDomain(n.domain, hostname) {
+			n.infof("Ignoring registration %s %s %s (not a subdomain of %s)", hostname, ipStr, container, n.domain)
+			return
+		}
+
 		if err := n.AddEntry(hostname, container, n.ourName, ip); err != nil {
 			n.badRequest(w, fmt.Errorf("Unable to add entry: %v", err))
 			return