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

implmented chunking

Browse source
This commit is contained in:
0xdcarns 2022-02-14 20:04:30 -05:00
parent 83250980eb
commit 98609ac61e
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mq/mq.go
View file

@ -53,12 +53,13 @@ func Ping(client mqtt.Client, msg mqtt.Message) {
}
_, decryptErr := decryptMsg(&node, msg.Payload())
if decryptErr != nil {
logger.Log(0, "error updating node ", node.ID, err.Error())
logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error())
return
}
node.SetLastCheckIn()
if err := logic.UpdateNode(&node, &node); err != nil {
logger.Log(0, "error updating node ", err.Error())
logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error())
return
}
logger.Log(3, "ping processed for node", node.ID)
// --TODO --set client version once feature is implemented.
@ -84,7 +85,6 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
return
}
logger.Log(1, "Update Node Handler", id)
var newNode models.Node
if err := json.Unmarshal(decrypted, &newNode); err != nil {
logger.Log(1, "error unmarshaling payload ", err.Error())
@ -92,12 +92,13 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
}
if err := logic.UpdateNode(&currentNode, &newNode); err != nil {
logger.Log(1, "error saving node", err.Error())
return
}
if err := PublishPeerUpdate(&newNode); err != nil {
logger.Log(1, "error publishing peer update ", err.Error())
return
}
logger.Log(1, "no need to update peers")
logger.Log(1, "Updated node", id, newNode.Name)
}()
}

33
netclient/ncutils/encryption.go
View file

@ -3,7 +3,6 @@ package ncutils
import (
"bytes"
"crypto/rand"
"encoding/gob"
"fmt"
"io"
@ -11,7 +10,7 @@ import (
)
const (
chunkSize = 16128 // 16128 bytes max message size
chunkSize = 16000 // 16128 bytes max message size
)
// BoxEncrypt - encrypts traffic box
@ -66,7 +65,7 @@ func Chunk(message []byte, recipientPubKey *[32]byte, senderPrivateKey *[32]byte
// DeChunk - "de" chunks and decrypts a message
func DeChunk(chunkedMsg []byte, senderPublicKey *[32]byte, recipientPrivateKey *[32]byte) ([]byte, error) {
chunks, err := convertMsgToBytes(chunkedMsg)
chunks, err := convertMsgToBytes(chunkedMsg) // convert the message to it's original chunks form
if err != nil {
return nil, err
}
@ -84,26 +83,28 @@ func DeChunk(chunkedMsg []byte, senderPublicKey *[32]byte, recipientPrivateKey *
// == private ==
var splitKey = []byte("|(,)(,)|")
// ConvertMsgToBytes - converts a message (MQ) to it's chunked version
// decode action
func convertMsgToBytes(msg []byte) ([][]byte, error) {
var buffer = bytes.NewBuffer(msg)
var dec = gob.NewDecoder(buffer)
var result [][]byte
var err = dec.Decode(&result)
if err != nil {
return nil, err
}
return result, err
splitMsg := bytes.Split(msg, splitKey)
return splitMsg, nil
}
// ConvertBytesToMsg - converts the chunked message into a MQ message
// encode action
func convertBytesToMsg(b [][]byte) ([]byte, error) {
var buffer bytes.Buffer
var enc = gob.NewEncoder(&buffer)
if err := enc.Encode(b); err != nil {
return nil, err
// var totalSize = len(b) * len(splitKey)
// for _, buf := range b {
// totalSize += len(buf)
// }
var buffer []byte // allocate a buffer with adequate sizing
for i := range b { // append bytes to it with key
buffer = append(buffer, b[i]...)
if i != len(b)-1 {
buffer = append(buffer, splitKey...)
}
}
return buffer.Bytes(), nil
return buffer, nil
}