zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-17 14:24:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize further

Browse Source
This commit is contained in:
0xdcarns
2021-12-10 21:09:42 -05:00
parent e45a485bce
commit 548997f9ef
18 changed files with 61 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
logic/util.go
View File

@@ -76,18 +76,15 @@ func DeleteNode(node *models.Node, exterminate bool) error {
}
// CreateNode - creates a node in database
func CreateNode(node *models.Node, networkName string) (*models.Node, error) {
func CreateNode(node *models.Node) error {
//encrypt that password so we never see it
hash, err := bcrypt.GenerateFromPassword([]byte(node.Password), 5)
if err != nil {
return node, err
return err
}
//set password to encrypted password
node.Password = string(hash)
node.Network = networkName
if node.Name == models.NODE_SERVER_NAME {
node.IsServer = "yes"
}
@@ -99,35 +96,35 @@ func CreateNode(node *models.Node, networkName string) (*models.Node, error) {
}
}
SetNodeDefaults(node)
node.Address, err = UniqueAddress(networkName)
node.Address, err = UniqueAddress(node.Network)
if err != nil {
return node, err
return err
}
node.Address6, err = UniqueAddress6(networkName)
node.Address6, err = UniqueAddress6(node.Network)
if err != nil {
return node, err
return err
}
//Create a JWT for the node
tokenString, _ := CreateJWT(node.MacAddress, networkName)
tokenString, _ := CreateJWT(node.MacAddress, node.Network)
if tokenString == "" {
//returnErrorResponse(w, r, errorResponse)
return node, err
return err
}
err = ValidateNode(node, false)
if err != nil {
return node, err
return err
}
key, err := GetRecordKey(node.MacAddress, node.Network)
if err != nil {
return node, err
return err
}
nodebytes, err := json.Marshal(&node)
if err != nil {
return node, err
return err
}
err = database.Insert(key, string(nodebytes), database.NODES_TABLE_NAME)
if err != nil {
return node, err
return err
}
if node.IsPending != "yes" {
DecrimentKey(node.Network, node.AccessKey)
@@ -136,7 +133,7 @@ func CreateNode(node *models.Node, networkName string) (*models.Node, error) {
if servercfg.IsDNSMode() {
err = SetDNS()
}
return node, err
return err
}
// SetNetworkNodesLastModified - sets the network nodes last modified