gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-09 22:55:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

update IsIPUnique

Browse source 
also:
 - remove unnecessary call to UpertHost in create node
 - remove debugging logs
This commit is contained in:
Matthew R. Kasun 2022-12-23 18:06:59 -05:00
parent afc1812ef3
commit 319193c18a
4 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controllers/node.go
View file

@ -17,7 +17,6 @@ import (
"github.com/gravitl/netmaker/models/promodels" "github.com/gravitl/netmaker/models/promodels"
"github.com/gravitl/netmaker/mq" "github.com/gravitl/netmaker/mq"
"github.com/gravitl/netmaker/servercfg" "github.com/gravitl/netmaker/servercfg"
"github.com/kr/pretty"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -661,8 +660,6 @@ func createNode(w http.ResponseWriter, r *http.Request) {
return return
} }
data.Node.Peers = peerUpdate.Peers data.Node.Peers = peerUpdate.Peers
pretty.Println(data.Node.Peers)
// Create client for this host in Mq // Create client for this host in Mq
event := mq.MqDynsecPayload{ event := mq.MqDynsecPayload{
Commands: []mq.MqDynSecCmd{ Commands: []mq.MqDynSecCmd{
@ -706,13 +703,6 @@ func createNode(w http.ResponseWriter, r *http.Request) {
ServerConfig: server, ServerConfig: server,
PeerIDs: peerUpdate.PeerIDs, PeerIDs: peerUpdate.PeerIDs,
} }
//host, newNode := node.ConvertToNewNode()
logic.UpsertHost(&data.Host)
//logic.CreateNode()
//logic.SaveNode(data.Node)
logger.Log(1, r.Header.Get("user"), "created new node", data.Host.Name, "on network", networkName) logger.Log(1, r.Header.Get("user"), "created new node", data.Host.Name, "on network", networkName)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(response) json.NewEncoder(w).Encode(response)

4
logic/networks.go
View file

@ -222,11 +222,11 @@ func IsIPUnique(network string, ip string, tableName string, isIpv6 bool) bool {
continue continue
} }
if isIpv6 { if isIpv6 {
if node.Address6.String() == ip && node.Network == network { if node.Address6.IP.String() == ip && node.Network == network {
return false return false
} }
} else { } else {
if node.Address.String() == ip && node.Network == network { if node.Address.IP.String() == ip && node.Network == network {
return false return false
} }
} }

2
logic/nodes.go
View file

@ -570,7 +570,6 @@ func createNode(node *models.Node) error {
} else if !IsIPUnique(node.Network, node.Address.String(), database.NODES_TABLE_NAME, false) { } else if !IsIPUnique(node.Network, node.Address.String(), database.NODES_TABLE_NAME, false) {
return fmt.Errorf("invalid address: ipv4 " + node.Address.String() + " is not unique") return fmt.Errorf("invalid address: ipv4 " + node.Address.String() + " is not unique")
} }
if node.Address6.IP == nil { if node.Address6.IP == nil {
if parentNetwork.IsIPv6 == "yes" { if parentNetwork.IsIPv6 == "yes" {
if node.Address6.IP, err = UniqueAddress6(node.Network, false); err != nil { if node.Address6.IP, err = UniqueAddress6(node.Network, false); err != nil {
@ -585,7 +584,6 @@ func createNode(node *models.Node) error {
} else if !IsIPUnique(node.Network, node.Address6.String(), database.NODES_TABLE_NAME, true) { } else if !IsIPUnique(node.Network, node.Address6.String(), database.NODES_TABLE_NAME, true) {
return fmt.Errorf("invalid address: ipv6 " + node.Address6.String() + " is not unique") return fmt.Errorf("invalid address: ipv6 " + node.Address6.String() + " is not unique")
} }
node.ID = uuid.New() node.ID = uuid.New()
//Create a JWT for the node //Create a JWT for the node
tokenString, _ := CreateJWT(node.ID.String(), host.MacAddress.String(), node.Network) tokenString, _ := CreateJWT(node.ID.String(), host.MacAddress.String(), node.Network)

5
logic/peers.go
View file

@ -921,11 +921,6 @@ func getEgressIPs(node, peer *models.Node) []net.IPNet {
func getNodeAllowedIPs(peer, node *models.Node) []net.IPNet { func getNodeAllowedIPs(peer, node *models.Node) []net.IPNet {
var allowedips = []net.IPNet{} var allowedips = []net.IPNet{}
host, err := GetHost(node.HostID.String())
if err != nil {
logger.Log(0, "error retrieving host for node", node.ID.String(), err.Error())
}
if peer.Address.IP != nil { if peer.Address.IP != nil {
allowedips = append(allowedips, peer.Address) allowedips = append(allowedips, peer.Address)
} }