From 4288adec692cfd6ae9396def5213f88dfd92d211 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Mon, 22 Oct 2018 21:43:41 +0200
Subject: [PATCH] =?UTF-8?q?dns:=20don=E2=80=99t=20let=20clients=20override?=
 =?UTF-8?q?=20the=20hostname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #11
---
 internal/dns/dns.go      |  3 +++
 internal/dns/dns_test.go | 48 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/internal/dns/dns.go b/internal/dns/dns.go
index 93b73e9..5ba0c70 100644
--- a/internal/dns/dns.go
+++ b/internal/dns/dns.go
@@ -134,6 +134,9 @@ func (s *Server) SetLeases(leases []dhcp4d.Lease) {
 		if l.Expired(now) {
 			continue
 		}
+		if _, ok := s.hostsByName[l.Hostname]; ok {
+			continue // don’t overwrite e.g. the hostname entry
+		}
 		s.hostsByName[l.Hostname] = l.Addr.String()
 		if rev, err := dns.ReverseAddr(l.Addr.String()); err == nil {
 			s.hostsByIP[rev] = l.Hostname
diff --git a/internal/dns/dns_test.go b/internal/dns/dns_test.go
index be27fc9..a331681 100644
--- a/internal/dns/dns_test.go
+++ b/internal/dns/dns_test.go
@@ -126,6 +126,54 @@ func TestHostname(t *testing.T) {
 		t.Skipf("os.Hostname: %v", err)
 	}
 
+	r := &recorder{}
+	s := NewServer("127.0.0.2:0", "lan")
+	s.SetLeases([]dhcp4d.Lease{
+		{
+			Hostname: hostname,
+			Addr:     net.IP{192, 168, 42, 23},
+		},
+	})
+
+	t.Run("A", func(t *testing.T) {
+		m := new(dns.Msg)
+		m.SetQuestion(hostname+".lan.", dns.TypeA)
+		s.Mux.ServeDNS(r, m)
+		if got, want := len(r.response.Answer), 1; got != want {
+			t.Fatalf("unexpected number of answers for %v: got %d, want %d", m.Question, got, want)
+		}
+		a := r.response.Answer[0]
+		if _, ok := a.(*dns.A); !ok {
+			t.Fatalf("unexpected response type: got %T, want dns.A", a)
+		}
+		if got, want := a.(*dns.A).A, net.ParseIP("127.0.0.2"); !got.Equal(want) {
+			t.Fatalf("unexpected response IP: got %v, want %v", got, want)
+		}
+	})
+
+	t.Run("PTR", func(t *testing.T) {
+		m := new(dns.Msg)
+		m.SetQuestion("2.0.0.127.in-addr.arpa.", dns.TypePTR)
+		s.Mux.ServeDNS(r, m)
+		if got, want := len(r.response.Answer), 1; got != want {
+			t.Fatalf("unexpected number of answers: got %d, want %d", got, want)
+		}
+		a := r.response.Answer[0]
+		if _, ok := a.(*dns.PTR); !ok {
+			t.Fatalf("unexpected response type: got %T, want dns.PTR", a)
+		}
+		if got, want := a.(*dns.PTR).Ptr, hostname+".lan."; got != want {
+			t.Fatalf("unexpected response record: got %q, want %q", got, want)
+		}
+	})
+}
+
+func TestHostnameDHCP(t *testing.T) {
+	hostname, err := os.Hostname()
+	if err != nil {
+		t.Skipf("os.Hostname: %v", err)
+	}
+
 	r := &recorder{}
 	s := NewServer("127.0.0.2:0", "lan")