Merge pull request #1218 from gravitl/bugfix_v0.14.4_go_static_check

fix statticcheck errors/warnings

controllers/dns_test.go

@@ -150,6 +150,7 @@ func TestGetDNS(t *testing.T) {
 	t.Run("NodeAndCustomDNS", func(t *testing.T) {
 		entry := models.DNSEntry{"10.0.0.2", "", "newhost", "skynet"}
 		_, err := CreateDNS(entry)
+		assert.Nil(t, err)
 		dns, err := logic.GetDNS("skynet")
 		t.Log(dns)
 		assert.Nil(t, err)

controllers/ext_client.go

@@ -68,7 +68,7 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	clients := []models.ExtClient{}
-	err := errors.New("Networks Error")
+	var err error
 	if networksSlice[0] == ALL_NETWORK_ACCESS {
 		clients, err = functions.GetAllExtClients()
 		if err != nil && !database.IsEmptyRecord(err) {

controllers/response_test.go

@@ -37,7 +37,7 @@ func TestReturnSuccessResponse(t *testing.T) {
 	assert.Equal(t, "This is a test message", response.Message)
 }
 
-func testReturnErrorResponse(t *testing.T) {
+func TestReturnErrorResponse(t *testing.T) {
 	var response, errMessage models.ErrorResponse
 	errMessage.Code = http.StatusUnauthorized
 	errMessage.Message = "You are not authorized to access this endpoint"

controllers/user.go

@@ -56,7 +56,7 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 
 	if jwt == "" {
 		// very unlikely that err is !nil and no jwt returned, but handle it anyways.
-		returnErrorResponse(response, request, formatError(errors.New("No token returned"), "internal"))
+		returnErrorResponse(response, request, formatError(errors.New("no token returned"), "internal"))
 		return
 	}
 
@@ -280,7 +280,7 @@ func deleteUser(w http.ResponseWriter, r *http.Request) {
 		returnErrorResponse(w, r, formatError(err, "internal"))
 		return
 	} else if !success {
-		returnErrorResponse(w, r, formatError(errors.New("delete unsuccessful."), "badrequest"))
+		returnErrorResponse(w, r, formatError(errors.New("delete unsuccessful"), "badrequest"))
 		return
 	}
 

logic/accesskeys.go

@@ -16,10 +16,6 @@ import (
 	"github.com/gravitl/netmaker/servercfg"
 )
 
-const (
-	charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-)
-
 // CreateAccessKey - create access key
 func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models.AccessKey, error) {
 
@@ -229,15 +225,3 @@ func GenKey() string {
 	entropy, _ := rand.Int(rand.Reader, maxentropy)
 	return entropy.Text(16)[:16]
 }
-
-func getAllAccessKeys() []models.AccessKey {
-	var accesskeys = make([]models.AccessKey, 0)
-	networks, err := GetNetworks()
-	if err != nil {
-		return accesskeys
-	}
-	for i := range networks {
-		accesskeys = append(accesskeys, networks[i].AccessKeys...)
-	}
-	return accesskeys
-}

logic/dns.go

@@ -119,7 +119,7 @@ func SetCorefile(domains string) error {
 
 	_, err = os.Stat(dir + "/config/dnsconfig")
 	if os.IsNotExist(err) {
-		err = os.MkdirAll(dir+"/config/dnsconfig", 744)
+		err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
 	}
 	if err != nil {
 		logger.Log(0, "couldnt find or create /config/dnsconfig")

logic/nodes.go

@@ -618,29 +618,6 @@ func validateServer(currentNode, newNode *models.Node) bool {
 		newNode.IsServer == "yes")
 }
 
-// isMacAddressUnique - checks if mac is unique
-func isMacAddressUnique(macaddress string, networkName string) (bool, error) {
-
-	isunique := true
-
-	nodes, err := GetNetworkNodes(networkName)
-	if err != nil {
-		if database.IsEmptyRecord(err) {
-			return true, nil
-		}
-		return false, err
-	}
-
-	for _, node := range nodes {
-
-		if node.MacAddress == macaddress {
-			isunique = false
-		}
-	}
-
-	return isunique, nil
-}
-
 // unsetHub - unset hub on network nodes
 func unsetHub(networkName string) error {
 

netclient/functions/daemon.go

@@ -280,34 +280,6 @@ func publishSignal(nodeCfg *config.ClientConfig, signal byte) error {
 	return nil
 }
 
-func initialPull(network string) {
-	logger.Log(0, "pulling latest config for ", network)
-	var configPath = fmt.Sprintf("%snetconfig-%s", ncutils.GetNetclientPathSpecific(), network)
-	fileInfo, err := os.Stat(configPath)
-	if err != nil {
-		logger.Log(0, "could not stat config file: ", configPath)
-		return
-	}
-	// speed up UDP rest
-	if !fileInfo.ModTime().IsZero() && time.Now().After(fileInfo.ModTime().Add(time.Minute)) {
-		sleepTime := 2
-		for {
-			_, err := Pull(network, true)
-			if err == nil {
-				break
-			}
-			if sleepTime > 3600 {
-				sleepTime = 3600
-			}
-			logger.Log(0, "failed to pull for network ", network)
-			logger.Log(0, fmt.Sprintf("waiting %d seconds to retry...", sleepTime))
-			time.Sleep(time.Second * time.Duration(sleepTime))
-			sleepTime = sleepTime * 2
-		}
-		time.Sleep(time.Second << 1)
-	}
-}
-
 func parseNetworkFromTopic(topic string) string {
 	return strings.Split(topic, "/")[1]
 }

netclient/local/routes.go

@@ -25,7 +25,7 @@ func SetPeerRoutes(iface string, oldPeers map[string]bool, newPeers []wgtypes.Pe
 		}
 	}
 	// traverse through all remaining existing peers
-	for i, _ := range oldPeers {
+	for i := range oldPeers {
 		ip, err := ncutils.GetIPNetFromString(i)
 		if err != nil {
 			logger.Log(1, err.Error())

netclient/ncutils/netclientutils.go

@@ -22,7 +22,6 @@ import (
 	"github.com/c-robinson/iplib"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 var (
@@ -61,7 +60,6 @@ const DEFAULT_GC_PERCENT = 10
 const KEY_SIZE = 2048
 
 // constants for random strings
-const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 const (
 	letterIdxBits = 6                    // 6 bits to represent a letter index
 	letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits
@@ -170,37 +168,6 @@ func GetMacAddr() ([]string, error) {
 	return as, nil
 }
 
-func parsePeers(keepalive int32, peers []wgtypes.PeerConfig) (string, error) {
-	peersString := ""
-	if keepalive <= 0 {
-		keepalive = 0
-	}
-
-	for _, peer := range peers {
-		endpointString := ""
-		if peer.Endpoint != nil && peer.Endpoint.String() != "" {
-			endpointString += "Endpoint = " + peer.Endpoint.String()
-		}
-		newAllowedIps := []string{}
-		for _, allowedIP := range peer.AllowedIPs {
-			newAllowedIps = append(newAllowedIps, allowedIP.String())
-		}
-		peersString += fmt.Sprintf(`[Peer]
-PublicKey = %s
-AllowedIps = %s
-PersistentKeepAlive = %s
-%s
-
-`,
-			peer.PublicKey.String(),
-			strings.Join(newAllowedIps, ","),
-			strconv.Itoa(int(keepalive)),
-			endpointString,
-		)
-	}
-	return peersString, nil
-}
-
 // GetLocalIP - gets local ip of machine
 func GetLocalIP(localrange string) (string, error) {
 	_, localRange, err := net.ParseCIDR(localrange)
@@ -472,19 +439,6 @@ func GetSystemNetworks() ([]string, error) {
 	return networks, nil
 }
 
-func stringAfter(original string, substring string) string {
-	position := strings.LastIndex(original, substring)
-	if position == -1 {
-		return ""
-	}
-	adjustedPosition := position + len(substring)
-
-	if adjustedPosition >= len(original) {
-		return ""
-	}
-	return original[adjustedPosition:]
-}
-
 // ShortenString - Brings string down to specified length. Stops names from being too long
 func ShortenString(input string, length int) string {
 	output := input
@@ -616,6 +570,7 @@ func GetIPNetFromString(ip string) (net.IPNet, error) {
 	}
 	if ipnet == nil {
 		err = errors.New(ip + " is not a valid ip or cidr")
+		return net.IPNet{}, err
 	}
 	return *ipnet, err
 }

netclient/wireguard/common.go

@@ -60,11 +60,11 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
 		var allowedips string
 		var iparr []string
 		for _, ipaddr := range peer.AllowedIPs {
-			if hasPeerIP && (&ipaddr) != nil {
+			if hasPeerIP {
 				iparr = append(iparr, ipaddr.String())
 			}
 		}
-		if iparr != nil && len(iparr) > 0 {
+		if len(iparr) > 0 {
 			allowedips = strings.Join(iparr, ",")
 		}
 		keepAliveString := strconv.Itoa(int(keepalive))
@@ -86,10 +86,10 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
 		}
 	}
 
-	if devicePeers != nil && len(devicePeers) > 0 {
+	if len(devicePeers) > 0 {
 		for _, currentPeer := range devicePeers {
 			shouldDelete := true
-			if peers != nil && len(peers) > 0 {
+			if len(peers) > 0 {
 				for _, peer := range peers {
 
 					if len(peer.AllowedIPs) > 0 && len(currentPeer.AllowedIPs) > 0 &&
@@ -117,7 +117,7 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
 		err = SetMacPeerRoutes(iface)
 		return err
 	} else if ncutils.IsLinux() {
-		if peers != nil && len(peers) > 0 {
+		if len(peers) > 0 {
 			local.SetPeerRoutes(iface, oldPeerAllowedIps, peers)
 		}
 	}

serverctl/serverctl.go

@@ -1,7 +1,6 @@
 package serverctl
 
 import (
-	"errors"
 	"net"
 	"os"
 	"strings"
@@ -76,14 +75,7 @@ func SyncServerNetwork(network string) error {
 	} else if !ifaceExists {
 		_, err := logic.ServerJoin(&serverNetworkSettings)
 		if err != nil {
-			if err == nil {
-				err = errors.New("network add failed for " + serverNetworkSettings.NetID)
-			}
-			/*
-				if !strings.Contains(err.Error(), "macaddress_unique") { // ignore macaddress unique error throws
-					logger.Log(1, "error adding network", serverNetworkSettings.NetID, "during sync:", err.Error())
-				}
-			*/
+			logger.Log(0, "network add failed for "+serverNetworkSettings.NetID)
 		}
 	}
 	return nil