* auto-hosts: support '#' comments after ip and hosts

eoghan2t9 · Jun 17, 2020 · 9b8c710 · 9b8c710
1 parent ec6ca93
commit 9b8c710
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/util/auto_hosts.go b/util/auto_hosts.go
@@ -169,7 +169,7 @@ func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string]string,
 		}
 		for i := 1; i != len(fields); i++ {
 			host := fields[i]
-			if len(host) == 0 {
+			if len(host) == 0 || host[0] == '#' {
 				break
 			}
 			a.updateTable(table, host, ipAddr)

diff --git a/util/auto_hosts_test.go b/util/auto_hosts_test.go
@@ -29,7 +29,7 @@ func TestAutoHostsResolution(t *testing.T) {
 	defer func() { _ = os.Remove(f.Name()) }()
 	defer f.Close()
 
-	_, _ = f.WriteString("  127.0.0.1   host  localhost  \n")
+	_, _ = f.WriteString("  127.0.0.1   host  localhost # comment \n")
 	_, _ = f.WriteString("  ::1   localhost  \n")
 
 	ah.Init(f.Name())
@@ -47,6 +47,10 @@ func TestAutoHostsResolution(t *testing.T) {
 	ips = ah.Process("newhost", dns.TypeA)
 	assert.Nil(t, ips)
 
+	// Unknown host (comment)
+	ips = ah.Process("comment", dns.TypeA)
+	assert.Nil(t, ips)
+
 	// Test hosts file
 	table := ah.List()
 	name, ok := table["127.0.0.1"]