zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

added nil checks, handled empty map

Browse Source
This commit is contained in:
0xdcarns
2022-05-11 12:07:06 -04:00
parent e7f9310b3d
commit 2de7beb31e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
logic/util.go
View File

@@ -202,10 +202,11 @@ func StringSliceContains(slice []string, item string) bool {
// sets the network server peers of a given node // sets the network server peers of a given node
func setNetworkServerPeers(serverNode *models.Node) { func setNetworkServerPeers(serverNode *models.Node) {
if currentPeersList, err := getSystemPeers(serverNode); err == nil { if currentPeersList, err := getSystemPeers(serverNode); err == nil {
if len(currentPeersList) > 0 { if currentPeersList == nil {
if database.SetPeers(currentPeersList, serverNode.Network) { currentPeersList = make(map[string]string)
logger.Log(1, "set new peers on network", serverNode.Network) }
} if database.SetPeers(currentPeersList, serverNode.Network) {
logger.Log(1, "set new peers on network", serverNode.Network)
} }
} else { } else {
logger.Log(1, "could not set peers on network", serverNode.Network, ":", err.Error()) logger.Log(1, "could not set peers on network", serverNode.Network, ":", err.Error())

2
logic/wireguard.go
View File

@@ -114,7 +114,7 @@ func getSystemPeers(node *models.Node) (map[string]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(device.Peers) > 0 { if device.Peers != nil && len(device.Peers) > 0 {
for _, peer := range device.Peers { for _, peer := range device.Peers {
if IsBase64(peer.PublicKey.String()) && peer.Endpoint != nil && CheckEndpoint(peer.Endpoint.String()) { if IsBase64(peer.PublicKey.String()) && peer.Endpoint != nil && CheckEndpoint(peer.Endpoint.String()) {
peers[peer.PublicKey.String()] = peer.Endpoint.String() peers[peer.PublicKey.String()] = peer.Endpoint.String()

4
netclient/wireguard/common.go
View File

@@ -80,10 +80,10 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
} }
} }
if len(devicePeers) > 0 { if devicePeers != nil && len(devicePeers) > 0 {
for _, currentPeer := range devicePeers { for _, currentPeer := range devicePeers {
shouldDelete := true shouldDelete := true
if len(peers) > 0 { if peers != nil && len(peers) > 0 {
for _, peer := range peers { for _, peer := range peers {
if peer.AllowedIPs[0].String() == currentPeer.AllowedIPs[0].String() { if peer.AllowedIPs[0].String() == currentPeer.AllowedIPs[0].String() {
shouldDelete = false shouldDelete = false