-(global): docker image - dirty version

Merge: - DNS: configuration settings were not applied until full restart
* commit 'd65cdd4544efdecb9bbe36e411c0bbcb6475ba94': - DNS: configuration settings were not applied until full restart
2019-12-19 19:50:12 +03:00 · 2019-12-19 15:03:13 +03:00 · 2019-12-19 14:49:15 +03:00 · 2019-12-19 13:28:08 +03:00 · 2019-12-19 12:16:13 +03:00 · 2019-12-19 12:13:15 +03:00
6 changed files with 35 additions and 67 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
  - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.19.1

 install:
-  - npm --prefix client install
+  - npm --prefix client ci

 cache:
  directories:
--- a/2
+++ b/2
@@ -14,7 +14,7 @@ all: build
 build: $(TARGET)

 client/node_modules: client/package.json client/package-lock.json
-	npm --prefix client install
+	npm --prefix client ci
 	touch client/node_modules

 $(STATIC): $(JSFILES) client/node_modules
--- a/client/package-lock.json
+++ b/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
        }
      }
    },
--- a/client/public/index.html
+++ b/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>
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -352,23 +352,6 @@ func (s *Server) IsRunning() bool {
 	return s.isRunning
 }

-// Restart - restart server
-func (s *Server) Restart() error {
-	s.Lock()
-	defer s.Unlock()
-	log.Print("Start reconfiguring the server")
-	err := s.stopInternal()
-	if err != nil {
-		return errorx.Decorate(err, "could not reconfigure the server")
-	}
-	err = s.startInternal()
-	if err != nil {
-		return errorx.Decorate(err, "could not reconfigure the server")
-	}
-
-	return nil
-}
-
 // Reconfigure applies the new configuration to the DNS server
 func (s *Server) Reconfigure(config *ServerConfig) error {
 	s.Lock()
@@ -635,8 +618,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 {
@@ -657,7 +639,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 			}
 		}

-		d.Res = &resp
+		d.Res = resp
 	}

 	return &res, err
@@ -711,6 +693,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
@@ -758,17 +749,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 {
@@ -804,9 +793,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 {
@@ -834,9 +822,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
@@ -844,7 +830,7 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
 		}
 	}

-	return &resp
+	return resp
 }

 // Make a CNAME response
--- a/dnsforward/dnsforward_http.go
+++ b/dnsforward/dnsforward_http.go
@@ -121,7 +121,7 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
 	s.conf.ConfigModified()

 	if restart {
-		err = s.Restart()
+		err = s.Reconfigure(nil)
 		if err != nil {
 			httpError(r, w, http.StatusInternalServerError, "%s", err)
 			return
@@ -172,7 +172,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request)
 	s.Unlock()
 	s.conf.ConfigModified()

-	err = s.Restart()
+	err = s.Reconfigure(nil)
 	if err != nil {
 		httpError(r, w, http.StatusInternalServerError, "%s", err)
 		return
Author	SHA1	Message	Date
Andrey Meshkov	32f780366e	-(global): docker image - dirty version	2019-12-19 19:50:12 +03:00
Andrey Meshkov	041ea65d14	Merge: - DNS: configuration settings were not applied until full restart * commit 'd65cdd4544efdecb9bbe36e411c0bbcb6475ba94': - DNS: configuration settings were not applied until full restart	2019-12-19 15:03:13 +03:00
Simon Zolin	d65cdd4544	- DNS: configuration settings were not applied until full restart	2019-12-19 14:49:15 +03:00
Andrey Meshkov	cde15afd90	*: use npm ci for more reliable builds	2019-12-19 13:28:08 +03:00
Andrey Meshkov	00fabb0ecf	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	2019-12-19 12:16:13 +03:00
Ildar Kamalov	0736435376	+ client: add meta tag to index.html	2019-12-19 12:13:15 +03:00
Andrey Meshkov	f6976f3c7e	Merge: - DNS: set RecursionAvailable flag in response message * commit '4540a4e94ad204fc1cba9e15b95ce9b684ed2335': - DNS: set RecursionAvailable flag in response message	2019-12-19 12:09:32 +03:00
Simon Zolin	4540a4e94a	- DNS: set RecursionAvailable flag in response message	2019-12-19 11:52:21 +03:00
Ildar Kamalov	bf410c81ae	+ client: add X-DNS-Prefetch-Control meta tag	2019-12-19 10:23:04 +03:00