Merge: + client: add X-DNS-Prefetch-Control meta tag

* commit '073643537612437430c7035cda679a758ca94d13':
  + client: add meta tag to index.html
  + client: add X-DNS-Prefetch-Control meta tag

client/package-lock.json

@@ -5214,8 +5214,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5236,14 +5235,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5258,20 +5255,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5388,8 +5382,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5401,7 +5394,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5416,7 +5408,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5424,14 +5415,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5450,7 +5439,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5531,8 +5519,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5544,7 +5531,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5630,8 +5616,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5667,7 +5652,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5687,7 +5671,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5731,14 +5714,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

client/public/index.html

@@ -5,6 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="theme-color" content="#000000">
         <meta name="google" content="notranslate">
+        <meta http-equiv="x-dns-prefetch-control" content="off">
         <link rel="icon" type="image/png" href="favicon.png" sizes="48x48">
         <title>AdGuard Home</title>
     </head>

client/src/actions/index.js

@@ -233,6 +233,7 @@ export const getProfile = () => async (dispatch) => {
 export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
 export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
 export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
+export const setDnsRunningStatus = createAction('SET_DNS_RUNNING_STATUS');
 
 export const getDnsStatus = () => async (dispatch) => {
     dispatch(dnsStatusRequest());
@@ -242,15 +243,17 @@ export const getDnsStatus = () => async (dispatch) => {
         dispatch(dnsStatusFailure());
         window.location.reload(true);
     };
-
     const handleRequestSuccess = (response) => {
         const dnsStatus = response.data;
-        const runningStatus = dnsStatus && dnsStatus.running;
+        const { running } = dnsStatus;
+        const runningStatus = dnsStatus && running;
         if (runningStatus === true) {
             dispatch(dnsStatusSuccess(dnsStatus));
             dispatch(getVersion());
             dispatch(getTlsStatus());
             dispatch(getProfile());
+        } else {
+            dispatch(setDnsRunningStatus(running));
         }
     };
 

client/src/components/App/index.js

@@ -89,12 +89,13 @@ class App extends Component {
                     <LoadingBar className="loading-bar" updateTime={1000} />
                     <Route component={Header} />
                     <div className="container container--wrap">
-                        {dashboard.processing && !dashboard.isCoreRunning && (
+                        {dashboard.processing && <Loading />}
+                        {!dashboard.isCoreRunning && (
                             <div className="row row-cards">
                                 <div className="col-lg-12">
                                     <Status reloadPage={this.reloadPage}
                                             message="dns_start"
-                                    />
+                                        />
                                     <Loading />
                                 </div>
                             </div>

client/src/reducers/index.js

@@ -58,12 +58,13 @@ const settings = handleActions(
 
 const dashboard = handleActions(
     {
+        [actions.setDnsRunningStatus]: (state, { payload }) =>
+            ({ ...state, isCoreRunning: payload }),
         [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
         [actions.dnsStatusFailure]: state => ({ ...state, processing: false }),
         [actions.dnsStatusSuccess]: (state, { payload }) => {
             const {
                 version,
-                running,
                 dns_port: dnsPort,
                 dns_addresses: dnsAddresses,
                 upstream_dns: upstreamDns,
@@ -75,7 +76,7 @@ const dashboard = handleActions(
             } = payload;
             const newState = {
                 ...state,
-                isCoreRunning: running,
+                isCoreRunning: true,
                 processing: false,
                 dnsVersion: version,
                 dnsPort,
@@ -187,7 +188,7 @@ const dashboard = handleActions(
     },
     {
         processing: true,
-        isCoreRunning: false,
+        isCoreRunning: true,
         processingVersion: true,
         processingFiltering: true,
         processingClients: true,

dnsforward/access.go

@@ -119,13 +119,13 @@ type accessListJSON struct {
 }
 
 func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
-	s.Lock()
+	s.RLock()
 	j := accessListJSON{
 		AllowedClients:    s.conf.AllowedClients,
 		DisallowedClients: s.conf.DisallowedClients,
 		BlockedHosts:      s.conf.BlockedHosts,
 	}
-	s.Unlock()
+	s.RUnlock()
 
 	w.Header().Set("Content-Type", "application/json")
 	err := json.NewEncoder(w).Encode(j)

dnsforward/dnsforward.go

@@ -94,7 +94,7 @@ func stringArrayDup(a []string) []string {
 
 // WriteDiskConfig - write configuration
 func (s *Server) WriteDiskConfig(c *FilteringConfig) {
-	s.Lock()
+	s.RLock()
 	sc := s.conf.FilteringConfig
 	*c = sc
 	c.RatelimitWhitelist = stringArrayDup(sc.RatelimitWhitelist)
@@ -103,7 +103,7 @@ func (s *Server) WriteDiskConfig(c *FilteringConfig) {
 	c.DisallowedClients = stringArrayDup(sc.DisallowedClients)
 	c.BlockedHosts = stringArrayDup(sc.BlockedHosts)
 	c.UpstreamDNS = stringArrayDup(sc.UpstreamDNS)
-	s.Unlock()
+	s.RUnlock()
 }
 
 // FilteringConfig represents the DNS filtering configuration of AdGuard Home
@@ -233,6 +233,13 @@ func (s *Server) startInternal() error {
 func (s *Server) Prepare(config *ServerConfig) error {
 	if config != nil {
 		s.conf = *config
+		if s.conf.BlockingMode == "custom_ip" {
+			s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
+			s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
+			if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
+				return fmt.Errorf("DNS: invalid custom blocking IP address specified")
+			}
+		}
 	}
 
 	if len(s.conf.UpstreamDNS) == 0 {
@@ -628,8 +635,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 		d.Res = s.genDNSFilterMessage(d, &res)
 
 	} else if res.Reason == dnsfilter.ReasonRewrite && len(res.IPList) != 0 {
-		resp := dns.Msg{}
-		resp.SetReply(req)
+		resp := s.makeResponse(req)
 
 		name := host
 		if len(res.CanonName) != 0 {
@@ -650,7 +656,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 			}
 		}
 
-		d.Res = &resp
+		d.Res = resp
 	}
 
 	return &res, err
@@ -704,6 +710,15 @@ func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error)
 	return nil, nil
 }
 
+// Create a DNS response by DNS request and set necessary flags
+func (s *Server) makeResponse(req *dns.Msg) *dns.Msg {
+	resp := dns.Msg{}
+	resp.SetReply(req)
+	resp.RecursionAvailable = true
+	resp.Compress = true
+	return &resp
+}
+
 // genDNSFilterMessage generates a DNS message corresponding to the filtering result
 func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
 	m := d.Req
@@ -751,17 +766,15 @@ func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
 }
 
 func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
-	resp := dns.Msg{}
-	resp.SetReply(request)
+	resp := s.makeResponse(request)
 	resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
-	return &resp
+	return resp
 }
 
 func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
-	resp := dns.Msg{}
-	resp.SetReply(request)
+	resp := s.makeResponse(request)
 	resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
-	return &resp
+	return resp
 }
 
 func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
@@ -797,9 +810,8 @@ func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
 	}
 
 	// empty response
-	resp := dns.Msg{}
-	resp.SetReply(req)
-	return &resp
+	resp := s.makeResponse(req)
+	return resp
 }
 
 func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSContext) *dns.Msg {
@@ -827,9 +839,7 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
 		return s.genServerFailure(request)
 	}
 
-	resp := dns.Msg{}
-	resp.SetReply(request)
-	resp.Authoritative, resp.RecursionAvailable = true, true
+	resp := s.makeResponse(request)
 	if newContext.Res != nil {
 		for _, answer := range newContext.Res.Answer {
 			answer.Header().Name = request.Question[0].Name
@@ -837,7 +847,7 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
 		}
 	}
 
-	return &resp
+	return resp
 }
 
 // Make a CNAME response

dnsforward/dnsforward_test.go

@@ -424,6 +424,55 @@ func TestNullBlockedRequest(t *testing.T) {
 	}
 }
 
+func TestBlockedCustomIP(t *testing.T) {
+	rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1	host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
+	filters := map[int]string{}
+	filters[0] = rules
+	c := dnsfilter.Config{}
+
+	f := dnsfilter.New(&c, filters)
+	s := NewServer(f, nil, nil)
+	conf := ServerConfig{}
+	conf.UDPListenAddr = &net.UDPAddr{Port: 0}
+	conf.TCPListenAddr = &net.TCPAddr{Port: 0}
+	conf.ProtectionEnabled = true
+	conf.BlockingMode = "custom_ip"
+	conf.BlockingIPv4 = "bad IP"
+	conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
+	err := s.Prepare(&conf)
+	assert.True(t, err != nil) // invalid BlockingIPv4
+
+	conf.BlockingIPv4 = "0.0.0.1"
+	conf.BlockingIPv6 = "::1"
+	err = s.Prepare(&conf)
+	assert.True(t, err == nil)
+	err = s.Start()
+	assert.True(t, err == nil, "%s", err)
+
+	addr := s.dnsProxy.Addr(proxy.ProtoUDP)
+
+	req := createTestMessageWithType("null.example.org.", dns.TypeA)
+	reply, err := dns.Exchange(req, addr.String())
+	assert.True(t, err == nil)
+	assert.True(t, len(reply.Answer) == 1)
+	a, ok := reply.Answer[0].(*dns.A)
+	assert.True(t, ok)
+	assert.True(t, a.A.String() == "0.0.0.1")
+
+	req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
+	reply, err = dns.Exchange(req, addr.String())
+	assert.True(t, err == nil)
+	assert.True(t, len(reply.Answer) == 1)
+	a6, ok := reply.Answer[0].(*dns.AAAA)
+	assert.True(t, ok)
+	assert.True(t, a6.AAAA.String() == "::1")
+
+	err = s.Stop()
+	if err != nil {
+		t.Fatalf("DNS server failed to stop: %s", err)
+	}
+}
+
 func TestBlockedByHosts(t *testing.T) {
 	s := createTestServer(t)
 	err := s.Start()
@@ -652,6 +701,16 @@ func createTestMessage(host string) *dns.Msg {
 	return &req
 }
 
+func createTestMessageWithType(host string, qtype uint16) *dns.Msg {
+	req := dns.Msg{}
+	req.Id = dns.Id()
+	req.RecursionDesired = true
+	req.Question = []dns.Question{
+		{Name: host, Qtype: qtype, Qclass: dns.ClassINET},
+	}
+	return &req
+}
+
 func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
 	assertResponse(t, reply, "8.8.8.8")
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.13
 
 require (
-	github.com/AdguardTeam/dnsproxy v0.23.2
+	github.com/AdguardTeam/dnsproxy v0.23.3
 	github.com/AdguardTeam/golibs v0.3.0
 	github.com/AdguardTeam/urlfilter v0.7.0
 	github.com/NYTimes/gziphandler v1.1.1

go.sum

@@ -1,5 +1,5 @@
-github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
-github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
+github.com/AdguardTeam/dnsproxy v0.23.3 h1:RzI9M0sX99t7qnlikvKTPW25sCFzgfBStxUJ+2z1KQI=
+github.com/AdguardTeam/dnsproxy v0.23.3/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
 github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
 github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
 github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU=

home/dns.go

@@ -70,6 +70,9 @@ func initDNSServer() error {
 
 	sessFilename := filepath.Join(baseDir, "sessions.db")
 	config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
+	if config.auth == nil {
+		return fmt.Errorf("Couldn't initialize Auth module")
+	}
 	config.Users = nil
 
 	Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
@@ -254,6 +257,10 @@ func reconfigureDNSServer() error {
 }
 
 func stopDNSServer() error {
+	if !isRunning() {
+		return nil
+	}
+
 	err := Context.dnsServer.Stop()
 	if err != nil {
 		return errorx.Decorate(err, "Couldn't stop forwarding DNS server")