daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: rm var shadowing vol. 3

Browse Source 
Updates #2803.

Squashed commit of the following:

commit ce711ae2e08c3714a4e0c6d177c02f7801c05fce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 11 20:58:40 2021 +0300

    all: imp code, docs

commit e91094e461893c27eda879b33b5ed2c7085510df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 11 20:42:14 2021 +0300

    all: rm var shadowing vol. 3
This commit is contained in:
Ainar Garipov
2021-03-11 21:30:52 +03:00
parent 4cf44dd1d4
commit 968831c5b9
13 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dnsforward/config.go
View File

@@ -290,7 +290,8 @@ func (s *Server) prepareUpstreamSettings() error {
if len(upstreamConfig.Upstreams) == 0 {
log.Info("warning: no default upstream servers specified, using %v", defaultDNS)
uc, err := proxy.ParseUpstreamsConfig(
var uc proxy.UpstreamConfig
uc, err = proxy.ParseUpstreamsConfig(
defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
@@ -344,7 +345,8 @@ func (s *Server) prepareTLS(proxyConfig *proxy.Config) error {
}
if s.conf.StrictSNICheck {
x, err := x509.ParseCertificate(s.conf.cert.Certificate[0])
var x *x509.Certificate
x, err = x509.ParseCertificate(s.conf.cert.Certificate[0])
if err != nil {
return fmt.Errorf("x509.ParseCertificate(): %w", err)
}

4
internal/dnsforward/dnsforward_test.go
View File

@@ -46,8 +46,8 @@ func startDeferStop(t *testing.T, s *Server) {
require.Nilf(t, err, "failed to start server: %s", err)
t.Cleanup(func() {
err := s.Stop()
require.Nilf(t, err, "dns server failed to stop: %s", err)
serr := s.Stop()
require.Nilf(t, serr, "dns server failed to stop: %s", serr)
})
}

9
internal/dnsforward/http.go
View File

@@ -328,18 +328,17 @@ func ValidateUpstreams(upstreams []string) error {
var defaultUpstreamFound bool
for _, u := range upstreams {
d, err := validateUpstream(u)
var ok bool
ok, err = validateUpstream(u)
if err != nil {
return err
}
// Check this flag until default upstream will not be found
if !defaultUpstreamFound {
defaultUpstreamFound = d
defaultUpstreamFound = ok
}
}
// Return error if there are no default upstreams
if !defaultUpstreamFound {
return fmt.Errorf("no default upstreams specified")
}
@@ -477,7 +476,7 @@ func checkDNS(input string, bootstrap []string) error {
return nil
}
if _, err := validateUpstream(input); err != nil {
if _, err = validateUpstream(input); err != nil {
return fmt.Errorf("wrong upstream format: %w", err)
}

3
internal/dnsforward/http_test.go
View File

@@ -199,7 +199,8 @@ func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) {
})
rBody := ioutil.NopCloser(strings.NewReader(tc.req))
r, err := http.NewRequest(http.MethodPost, "http://example.com", rBody)
var r *http.Request
r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
require.Nil(t, err)
s.handleSetConfig(w, r)

4
internal/dnsforward/ipset_linux.go
View File

@@ -74,7 +74,8 @@ func (c *ipsetCtx) ipsetProps(name string) (set ipsetProps, err error) {
// query only the IPv4 one.
//
// TODO(a.garipov): Find out if this is a bug or a feature.
res, err := c.ipv4Conn.Header(name)
var res *ipset.HeaderPolicy
res, err = c.ipv4Conn.Header(name)
if err != nil {
return set, err
}
@@ -104,7 +105,6 @@ func (c *ipsetCtx) ipsets(names []string) (sets []ipsetProps, err error) {
continue
}
var err error
set, err = c.ipsetProps(name)
if err != nil {
return nil, fmt.Errorf("querying ipset %q: %w", name, err)