Fixed several issues reported by gosec and code analysis tools

Author: looterz

api.go

@@ -73,7 +73,7 @@ func StartAPIServer(config *Config,
 			}
 		}()
 
-		personalBlockList := []string{}
+		var personalBlockList []string
 
 		scanner := bufio.NewScanner(f)
 		for scanner.Scan() {
@@ -124,8 +124,14 @@ func StartAPIServer(config *Config,
 				logger.Critical("error while reading personal block list")
 				return
 			}
-			f.Truncate(0)
-			f.Write([]byte(personalBlockList))
+			err := f.Truncate(0)
+			if err != nil {
+				logger.Error(err)
+			}
+			_, err = f.Write([]byte(personalBlockList))
+			if err != nil {
+				logger.Error(err)
+			}
 		}
 	})
 

cache.go

@@ -43,15 +43,6 @@ func (e CacheIsFull) Error() string {
 	return "Cache is Full"
 }
 
-// SerializerError type
-type SerializerError struct {
-}
-
-// Error formats an error for the SerializerError type
-func (e SerializerError) Error() string {
-	return "Serializer error"
-}
-
 // Mesg represents a cache entry
 type Mesg struct {
 	Msg            *dns.Msg
@@ -162,7 +153,7 @@ func (c *MemoryCache) Remove(key string) {
 	c.mu.Unlock()
 }
 
-// Exists returns whether or not a key exists in the cache
+// Exists returns whether a key exists in the cache
 func (c *MemoryCache) Exists(key string) bool {
 	key = strings.ToLower(key)
 
@@ -179,7 +170,7 @@ func (c *MemoryCache) Length() int {
 	return len(c.Backend)
 }
 
-// Full returns whether or not the cache is full
+// Full returns whether the cache is full
 func (c *MemoryCache) Full() bool {
 	if c.Maxcount == 0 {
 		return false
@@ -239,7 +230,7 @@ func (c *MemoryBlockCache) Remove(key string) {
 func (c *MemoryBlockCache) Set(key string, value bool) error {
 	c.mu.Lock()
 	if strings.HasPrefix(key, "~") {
-		// get rid of the ~ prefix 
+		// get rid of the ~ prefix
 		runes := []rune(key)
 		ex := string(runes[1:])
 		re, err := regexp.Compile(ex)
@@ -258,7 +249,7 @@ func (c *MemoryBlockCache) Set(key string, value bool) error {
 	return nil
 }
 
-// Exists returns whether or not a key exists in the cache
+// Exists returns whether a key exists in the cache
 func (c *MemoryBlockCache) Exists(key string) bool {
 	key = strings.ToLower(key)
 

drbl.go

@@ -8,10 +8,10 @@ func drblCheckHostname(hostname string) bool {
 	testhost := ""
 	verdict := false
 	if strings.HasSuffix(hostname, ".") {
-		testhost = string(hostname[:len(hostname)-1])
+		testhost = hostname[:len(hostname)-1]
 		logger.Debug("a root query:", hostname)
 	} else {
-		testhost = string(hostname)
+		testhost = hostname
 		logger.Debug("not a root query:", hostname)
 	}
 	block, weight := drblPeers.Check(testhost)

go.sum

@@ -2,6 +2,7 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -24,6 +25,7 @@ github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7a
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -32,6 +34,7 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -54,6 +57,7 @@ github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBO
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 h1:7YvPJVmEeFHR1Tj9sZEYsmarJEQfMVYpd/Vyy/A8dqE=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
@@ -79,13 +83,17 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18 h1:xFbv3LvlvQAmbNJFCBKRv1Ccvnh9FVsW0FX2kTWWowE=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/gin-contrib/cors.v1 v1.0.0-20170318125340-cf4846e6a636 h1:08a5y5i4Uab3iiIv0K3tgMkXIjunoSfqPzbnkOzt3Bc=
 gopkg.in/gin-contrib/cors.v1 v1.0.0-20170318125340-cf4846e6a636/go.mod h1:WNNqtZpyoJM1oJrh6efN7u6jd0EZYwjXlubLsIQUZRU=

grimd_test.go

@@ -15,6 +15,9 @@ func BenchmarkResolver(b *testing.B) {
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		c.Exchange(m, testNameserver)
+		_, _, err := c.Exchange(m, testNameserver)
+		if err != nil {
+			logger.Error(err)
+		}
 	}
 }

handler.go

@@ -92,7 +92,11 @@ func (h *DNSHandler) do(config *Config, blockCache *MemoryBlockCache, questionCa
 			break
 		}
 		func(Net string, w dns.ResponseWriter, req *dns.Msg) {
-			defer w.Close()
+			defer func(w dns.ResponseWriter) {
+				err := w.Close()
+				if err != nil {
+				}
+			}(w)
 			q := req.Question[0]
 			Q := Question{UnFqdn(q.Name), dns.TypeToString[q.Qtype], dns.ClassToString[q.Qclass]}
 
@@ -137,7 +141,7 @@ func (h *DNSHandler) do(config *Config, blockCache *MemoryBlockCache, questionCa
 					} else {
 						logger.Debugf("%s hit cache\n", Q.String())
 
-						// we need this copy against concurrent modification of Id
+						// we need this copy against concurrent modification of ID
 						msg := *mesg
 						msg.Id = req.Id
 						h.WriteReplyMsg(w, &msg)

logger.go

@@ -66,7 +66,7 @@ func parseLogConfig(logConfigString string) (*logConfig, error) {
 		if match != nil {
 			l, err := parseLogLevel(match[2])
 			if err != nil {
-				return nil, fmt.Errorf("Error while parsing '%s': %s", match[0], err.Error())
+				return nil, fmt.Errorf("error while parsing '%s': %s", match[0], err.Error())
 			}
 			result.files = append(result.files, fileConfig{match[1], l})
 			continue
@@ -76,7 +76,7 @@ func parseLogConfig(logConfigString string) (*logConfig, error) {
 		if match != nil {
 			l, err := parseLogLevel(match[2])
 			if err != nil {
-				return nil, fmt.Errorf("Error while parsing '%s': %s", match[0], err.Error())
+				return nil, fmt.Errorf("error while parsing '%s': %s", match[0], err.Error())
 			}
 			switch match[1] {
 			case "syslog":
@@ -88,7 +88,7 @@ func parseLogConfig(logConfigString string) (*logConfig, error) {
 			}
 		}
 
-		return nil, fmt.Errorf("Error: uknown log config fragment: '%s'", part)
+		return nil, fmt.Errorf("error: uknown log config fragment: '%s'", part)
 
 	}
 	return &result, nil
@@ -152,7 +152,10 @@ func createFileLoggers(files []fileConfig, moduleName string) ([]logging.Backend
 		b, file, err := createFileLogger(f, moduleName)
 		if err != nil {
 			for _, toClose := range openFiles {
-				toClose.Close()
+				err := toClose.Close()
+				if err != nil {
+					return nil, nil, err
+				}
 			}
 			return nil, nil, err
 		}
@@ -204,7 +207,10 @@ func loggerInit(cfg string) (loggingState, error) {
 
 func (s loggingState) cleanUp() {
 	for _, f := range s.files {
-		f.Close()
+		err := f.Close()
+		if err != nil {
+			logger.Error(err)
+		}
 	}
 }
 

logger_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"testing"
 
@@ -22,7 +23,7 @@ func TestLogConfigParsing(t *testing.T) {
 			in: "file:grimd.log@0",
 			out: &logConfig{
 				files: []fileConfig{
-					fileConfig{
+					{
 						name:  "grimd.log",
 						level: logging.WARNING,
 					},
@@ -34,11 +35,11 @@ func TestLogConfigParsing(t *testing.T) {
 			in: "file:grimd.log@0,file:something.log@1",
 			out: &logConfig{
 				files: []fileConfig{
-					fileConfig{
+					{
 						name:  "grimd.log",
 						level: logging.WARNING,
 					},
-					fileConfig{
+					{
 						name:  "something.log",
 						level: logging.INFO,
 					},
@@ -49,17 +50,17 @@ func TestLogConfigParsing(t *testing.T) {
 		{
 			in:  "file:grimd.log@aa",
 			out: nil,
-			err: fmt.Errorf("Error while parsing 'file:grimd.log@aa': 'aa' is not an integer"),
+			err: fmt.Errorf("error while parsing 'file:grimd.log@aa': 'aa' is not an integer"),
 		},
 		{
 			in:  "syslog@aa",
 			out: nil,
-			err: fmt.Errorf("Error while parsing 'syslog@aa': 'aa' is not an integer"),
+			err: fmt.Errorf("error while parsing 'syslog@aa': 'aa' is not an integer"),
 		},
 		{
 			in:  "fail:grimd.log@1",
 			out: nil,
-			err: fmt.Errorf("Error: uknown log config fragment: 'fail:grimd.log@1'"),
+			err: fmt.Errorf("error: uknown log config fragment: 'fail:grimd.log@1'"),
 		},
 		{
 			in: "syslog@0",
@@ -75,7 +76,7 @@ func TestLogConfigParsing(t *testing.T) {
 			in: "file:grimd.log@1,syslog@1",
 			out: &logConfig{
 				files: []fileConfig{
-					fileConfig{
+					{
 						name:  "grimd.log",
 						level: logging.INFO,
 					},
@@ -101,7 +102,7 @@ func TestLogConfigParsing(t *testing.T) {
 			in: "file:grimd.log@2,syslog@1,stderr@0",
 			out: &logConfig{
 				files: []fileConfig{
-					fileConfig{
+					{
 						name:  "grimd.log",
 						level: logging.DEBUG,
 					},
@@ -136,7 +137,11 @@ func TestCreateLogFile(t *testing.T) {
 	t.SkipNow()
 	dir, err := ioutil.TempDir("", "test")
 	assert.Nil(t, err)
-	defer os.RemoveAll(dir)
+	defer func(path string) {
+		err := os.RemoveAll(path)
+		if err != nil {
+		}
+	}(dir)
 
 	var testCases = []struct {
 		in  string
@@ -159,8 +164,14 @@ func TestCreateLogFile(t *testing.T) {
 			assert.Equal(t, test.err, err)
 			if err == nil {
 				assert.NotNil(t, result)
-				result.Close()
-				os.Remove(test.in)
+				err := result.Close()
+				if err != nil {
+					logger.Critical(err)
+				}
+				err = os.Remove(test.in)
+				if err != nil {
+					logger.Critical(err)
+				}
 			}
 		})
 	}
@@ -170,7 +181,12 @@ func TestCreateFileLogger(t *testing.T) {
 	t.SkipNow()
 	dir, err := ioutil.TempDir("", "test")
 	assert.Nil(t, err)
-	defer os.RemoveAll(dir)
+	defer func(path string) {
+		err := os.RemoveAll(path)
+		if err != nil {
+			logger.Critical(err)
+		}
+	}(dir)
 
 	var testCases = []struct {
 		in  string
@@ -189,7 +205,10 @@ func TestCreateFileLogger(t *testing.T) {
 			if err == nil {
 				assert.NotNil(t, logger)
 				assert.NotNil(t, file)
-				file.Close()
+				err := file.Close()
+				if err != nil {
+					log.Println(err)
+				}
 			}
 		})
 	}

main.go

@@ -46,7 +46,7 @@ func reloadBlockCache(config *Config,
 	}
 
 	if config.UseDrbl > 0 {
-		drblPeers, _ = drblpeer.NewPeerListFromYamlFile(config.DrblPeersFilename, config.DrblBlockWeight, config.DrblTimeout, (config.DrblDebug > 0))
+		drblPeers, _ = drblpeer.NewPeerListFromYamlFile(config.DrblPeersFilename, config.DrblBlockWeight, config.DrblTimeout, config.DrblDebug > 0)
 		if config.DrblDebug > 0 {
 			log.Println("Drbl Debug is ON")
 			drblPeers.Debug = true
@@ -120,7 +120,10 @@ forever:
 				break forever
 			case syscall.SIGHUP:
 				logger.Error("SIGHUP received: rotating logs\n")
-				loggingState.reopen()
+				err := loggingState.reopen()
+				if err != nil {
+					logger.Error(err)
+				}
 			}
 		case <-reloadChan:
 			blockCache, apiServer, err = reloadBlockCache(config, blockCache, questionCache, drblPeers, apiServer, server, reloadChan)

resolver.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -135,7 +136,11 @@ func (r *Resolver) DoHLookup(url string, timeout int, req *dns.Msg) (*dns.Msg, e
 		return nil, ResolvError{qname, "HTTPS", []string{url}}
 	}
 
-	defer resp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+		}
+	}(resp.Body)
 
 	//Check the request went ok
 	if resp.StatusCode != http.StatusOK {