remove payload encryption

Signed-off-by: Matthew R. Kasun <[email protected]>

mq/handlers.go

@@ -36,11 +36,17 @@ func Ping(client mqtt.Client, msg mqtt.Message) {
 			logger.Log(0, record)
 			return
 		}
-		version, decryptErr := decryptMsg(&node, msg.Payload())
-		if decryptErr != nil {
-			logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error())
+		//version, decryptErr := decryptMsg(&node, msg.Payload())
+		//if decryptErr != nil {
+		//	logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error())
+		//	return
+		//}
+		version := []byte{}
+		if err := json.Unmarshal(msg.Payload(), &version); err != nil {
+			logger.Log(0, "error getting version from payload ", node.ID, err.Error())
 			return
 		}
+
 		node.SetLastCheckIn()
 		node.Version = string(version)
 		if err := logic.UpdateNode(&node, &node); err != nil {
@@ -67,13 +73,14 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
 			logger.Log(1, "error getting node ", id, err.Error())
 			return
 		}
-		decrypted, decryptErr := decryptMsg(&currentNode, msg.Payload())
-		if decryptErr != nil {
-			logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
-			return
-		}
+		//decrypted, decryptErr := decryptMsg(&currentNode, msg.Payload())
+		//if decryptErr != nil {
+		//	logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
+		//	return
+		//}
 		var newNode models.Node
-		if err := json.Unmarshal(decrypted, &newNode); err != nil {
+		//if err := json.Unmarshal(decrypted, &newNode); err != nil {
+		if err := json.Unmarshal(msg.Payload(), &newNode); err != nil {
 			logger.Log(1, "error unmarshaling payload ", err.Error())
 			return
 		}
@@ -98,12 +105,18 @@ func ClientPeerUpdate(client mqtt.Client, msg mqtt.Message) {
 			logger.Log(1, "error getting node ", id, err.Error())
 			return
 		}
-		decrypted, decryptErr := decryptMsg(&currentNode, msg.Payload())
-		if decryptErr != nil {
-			logger.Log(1, "failed to decrypt message during client peer update for node ", id, decryptErr.Error())
+		//decrypted, decryptErr := decryptMsg(&currentNode, msg.Payload())
+		//if decryptErr != nil {
+		//	logger.Log(1, "failed to decrypt message during client peer update for node ", id, decryptErr.Error())
+		//	return
+		//}
+		response := []byte{}
+		if err := json.Unmarshal(msg.Payload(), &response); err != nil {
+			logger.Log(1, "failed to decode message during client peer update for node ", id, err.Error())
 			return
 		}
-		switch decrypted[0] {
+		//switch decrypted[0] {
+		switch response[0] {
 		case ncutils.ACK:
 			currentServerNode, err := logic.GetNetworkServerLocal(currentNode.Network)
 			if err != nil {

mq/util.go

@@ -61,11 +61,12 @@ func encryptMsg(node *models.Node, msg []byte) ([]byte, error) {
 func publish(node *models.Node, dest string, msg []byte) error {
 	client := SetupMQTT(true)
 	defer client.Disconnect(250)
-	encrypted, encryptErr := encryptMsg(node, msg)
-	if encryptErr != nil {
-		return encryptErr
-	}
-	if token := client.Publish(dest, 0, true, encrypted); token.Wait() && token.Error() != nil {
+	//encrypted, encryptErr := encryptMsg(node, msg)
+	//if encryptErr != nil {
+	//return encryptErr
+	//}
+	//if token := client.Publish(dest, 0, true, encrypted); token.Wait() && token.Error() != nil {
+	if token := client.Publish(dest, 0, true, msg); token.Wait() && token.Error() != nil {
 		return token.Error()
 	}
 	return nil

netclient/functions/daemon.go

@@ -100,9 +100,8 @@ func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error {
 }
 
 // PingServer -- checks if server is reachable
-func PingServer(nodeCfg *config.ClientConfig) error {
-	node := getServerAddress(nodeCfg)
-	pinger, err := ping.NewPinger(node)
+func PingServer(cfg *config.ClientConfig) error {
+	pinger, err := ping.NewPinger(cfg.Server.ServerName)
 	if err != nil {
 		return err
 	}

netclient/functions/mqhandlers.go

@@ -34,11 +34,13 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 	nodeCfg.Network = network
 	nodeCfg.ReadConfig()
 
-	data, dataErr := decryptMsg(&nodeCfg, msg.Payload())
-	if dataErr != nil {
-		return
-	}
-	err := json.Unmarshal([]byte(data), &newNode)
+	//data, dataErr := decryptMsg(&nodeCfg, msg.Payload())
+	//if dataErr != nil {
+	//	return
+	//}
+	//err := json.Unmarshal([]byte(data), &newNode)
+	data := msg.Payload()
+	err := json.Unmarshal(msg.Payload(), &newNode)
 	if err != nil {
 		logger.Log(0, "error unmarshalling node update data"+err.Error())
 		return
@@ -165,11 +167,13 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 	cfg.Network = network
 	cfg.ReadConfig()
 
-	data, dataErr := decryptMsg(&cfg, msg.Payload())
-	if dataErr != nil {
-		return
-	}
-	err := json.Unmarshal([]byte(data), &peerUpdate)
+	//data, dataErr := decryptMsg(&cfg, msg.Payload())
+	//if dataErr != nil {
+	//	return
+	//}
+	//err := json.Unmarshal([]byte(data), &peerUpdate)
+	data := msg.Payload()
+	err := json.Unmarshal(msg.Payload(), &peerUpdate)
 	if err != nil {
 		logger.Log(0, "error unmarshalling peer data")
 		return