Merge: - DNS: filtering didn't work

Fix #1504

* commit '7c192212410ef877aea5c0d018cc0f9ae8b41879':
  minor
  - DNS: filtering didn't work

dnsforward/dnsforward.go

@@ -686,12 +686,12 @@ func processFilteringAfterResponse(ctx *dnsContext) int {
 			d.Res.Answer = answer
 		}
 
-	case dnsfilter.RewriteEtcHosts:
 	case dnsfilter.NotFilteredWhiteList:
 		// nothing
 
 	default:
-		if !ctx.protectionEnabled {
+		if !ctx.protectionEnabled || // filters are disabled: there's nothing to check for
+			!ctx.responseFromUpstream { // only check response if it's from an upstream server
 			break
 		}
 		origResp2 := d.Res
@@ -817,6 +817,10 @@ func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dns
 	case dnsfilter.NotFilteredWhiteList:
 		fallthrough
 	case dnsfilter.NotFilteredError:
+		fallthrough
+	case dnsfilter.ReasonRewrite:
+		fallthrough
+	case dnsfilter.RewriteEtcHosts:
 		e.Result = stats.RNotFiltered
 
 	case dnsfilter.FilteredSafeBrowsing:

util/auto_hosts.go

@@ -225,11 +225,15 @@ func (a *AutoHosts) update() {
 }
 
 // Process - get the list of IP addresses for the hostname
+// Return nil if not found
 func (a *AutoHosts) Process(host string) []net.IP {
+	var ipsCopy []net.IP
 	a.lock.Lock()
 	ips, _ := a.table[host]
-	ipsCopy := make([]net.IP, len(ips))
-	copy(ipsCopy, ips)
+	if len(ips) != 0 {
+		ipsCopy = make([]net.IP, len(ips))
+		copy(ipsCopy, ips)
+	}
 	a.lock.Unlock()
 	return ipsCopy
 }

util/auto_hosts_test.go

@@ -37,7 +37,7 @@ func TestAutoHosts(t *testing.T) {
 	ips := ah.Process("localhost")
 	assert.True(t, ips[0].Equal(net.ParseIP("127.0.0.1")))
 	ips = ah.Process("newhost")
-	assert.True(t, len(ips) == 0)
+	assert.True(t, ips == nil)
 
 	table := ah.List()
 	ips, _ = table["host"]