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

remove db read

Browse Source
This commit is contained in:
0xdcarns
2022-01-29 09:14:18 -05:00
parent c40c905b3b
commit db5fc322b8
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
logic/nodes.go
View File

@@ -233,7 +233,6 @@ func CreateNode(node *models.Node) error {
if err != nil { if err != nil {
return err return err
} }
logger.Log(0, "INSERTING: ", node.ID, fmt.Sprintf("pubkey? %v", node.TrafficKeys))
err = database.Insert(node.ID, string(nodebytes), database.NODES_TABLE_NAME) err = database.Insert(node.ID, string(nodebytes), database.NODES_TABLE_NAME)
if err != nil { if err != nil {
return err return err

8
mq/mq.go
View File

@@ -41,7 +41,7 @@ var Ping mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
logger.Log(0, record) logger.Log(0, record)
return return
} }
_, decryptErr := decryptMsg(node.ID, msg.Payload()) _, decryptErr := decryptMsg(msg.Payload())
if decryptErr != nil { if decryptErr != nil {
logger.Log(0, "error updating node ", node.ID, err.Error()) logger.Log(0, "error updating node ", node.ID, err.Error())
return return
@@ -69,7 +69,7 @@ var UpdateNode mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
logger.Log(1, "error getting node ", id, err.Error()) logger.Log(1, "error getting node ", id, err.Error())
return return
} }
decrypted, decryptErr := decryptMsg(id, msg.Payload()) decrypted, decryptErr := decryptMsg(msg.Payload())
if decryptErr != nil { if decryptErr != nil {
logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error()) logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
return return
@@ -114,7 +114,7 @@ func PublishPeerUpdate(newNode *models.Node) error {
logger.Log(2, "error marshaling peer update for node", node.ID, err.Error()) logger.Log(2, "error marshaling peer update for node", node.ID, err.Error())
continue continue
} }
if err = publish(node.ID, fmt.Sprintf("peers/%s/%s", node.Network, node.ID), data); err != nil { if err = publish(&node, fmt.Sprintf("peers/%s/%s", node.Network, node.ID), data); err != nil {
logger.Log(1, "failed to publish peer update for node", node.ID) logger.Log(1, "failed to publish peer update for node", node.ID)
} }
} }
@@ -143,7 +143,7 @@ func NodeUpdate(node *models.Node) error {
logger.Log(2, "error marshalling node update ", err.Error()) logger.Log(2, "error marshalling node update ", err.Error())
return err return err
} }
if err = publish(node.ID, fmt.Sprintf("update/%s/%s", node.Network, node.ID), data); err != nil { if err = publish(node, fmt.Sprintf("update/%s/%s", node.Network, node.ID), data); err != nil {
logger.Log(2, "error publishing node update to peer ", node.ID, err.Error()) logger.Log(2, "error publishing node update to peer ", node.ID, err.Error())
return err return err
} }

13
mq/util.go
View File

@@ -5,10 +5,11 @@ import (
"github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
) )
func decryptMsg(nodeid string, msg []byte) ([]byte, error) { func decryptMsg(msg []byte) ([]byte, error) {
logger.Log(0, "found message for decryption: %s \n", string(msg)) logger.Log(0, "found message for decryption: %s \n", string(msg))
trafficKey, trafficErr := logic.RetrieveTrafficKey() trafficKey, trafficErr := logic.RetrieveTrafficKey()
if trafficErr != nil { if trafficErr != nil {
@@ -17,11 +18,7 @@ func decryptMsg(nodeid string, msg []byte) ([]byte, error) {
return ncutils.DestructMessage(string(msg), &trafficKey), nil return ncutils.DestructMessage(string(msg), &trafficKey), nil
} }
func encrypt(nodeid string, dest string, msg []byte) ([]byte, error) { func encrypt(node *models.Node, dest string, msg []byte) ([]byte, error) {
var node, err = logic.GetNodeByID(nodeid)
if err != nil {
return nil, err
}
encrypted := ncutils.BuildMessage(msg, &node.TrafficKeys.Mine) encrypted := ncutils.BuildMessage(msg, &node.TrafficKeys.Mine)
if encrypted == "" { if encrypted == "" {
return nil, fmt.Errorf("could not encrypt message") return nil, fmt.Errorf("could not encrypt message")
@@ -29,10 +26,10 @@ func encrypt(nodeid string, dest string, msg []byte) ([]byte, error) {
return []byte(encrypted), nil return []byte(encrypted), nil
} }
func publish(nodeid string, dest string, msg []byte) error { func publish(node *models.Node, dest string, msg []byte) error {
client := SetupMQTT() client := SetupMQTT()
defer client.Disconnect(250) defer client.Disconnect(250)
encrypted, encryptErr := encrypt(nodeid, dest, msg) encrypted, encryptErr := encrypt(node, dest, msg)
if encryptErr != nil { if encryptErr != nil {
return encryptErr return encryptErr
} }