Added random generated XID ID to messages, regenerated protobuf, and ID mismatch handling.

Author: VikingPingvin

go.mod

@@ -5,6 +5,7 @@ go 1.15
 require (
 	github.com/golang/protobuf v1.4.1
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/rs/xid v1.2.1
 	github.com/rs/zerolog v1.20.0
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.1

go.sum

@@ -156,6 +156,7 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs=
 github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=

locker/agent.go

@@ -14,6 +14,7 @@ import (
 	"vikingPingvin/locker/locker/messaging"
 	"vikingPingvin/locker/locker/messaging/protobuf"
 
+	"github.com/rs/xid"
 	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/proto"
 )
@@ -26,6 +27,7 @@ type InputData struct {
 	FileInput string
 	FileName  string
 	FileHash  []byte
+	ID        xid.ID
 }
 
 type Agent interface {
@@ -52,7 +54,7 @@ func (a ArtifactAgent) Start(inputData *InputData) bool {
 	parseAndSendPayload(connection, inputData)
 
 	// Listen for ACK from server
-	listenForACK(connection)
+	listenForACK(connection, inputData)
 
 	return true
 }
@@ -71,10 +73,11 @@ func parseAndSendMetaData(connection net.Conn, inputData *InputData) (fileInfo o
 		Str("file name", fileInfo.Name()).
 		Str("size", fmt.Sprintf("%d", fileInfo.Size())).
 		Str("hash", fmt.Sprintf("%v", inputData.FileHash)).
+		Str("id", inputData.ID.String()).
 		Msg("Artifact metadata parsing finished")
 
 	message, err := messaging.CreateMessage_FileMeta(
-		2234,
+		inputData.ID.Bytes(),
 		protobuf.MessageType_META,
 		"test_namespace",
 		"test_project",
@@ -111,7 +114,7 @@ func parseAndSendPayload(connection net.Conn, inputData *InputData) {
 			isPayloadFinal = true
 			// Send terminating payload protobuf message
 			terminalMessage, err := messaging.CreateMessage_FilePackage(
-				2234,
+				inputData.ID.Bytes(),
 				protobuf.MessageType_PACKAGE,
 				make([]byte, 1),
 				isPayloadFinal,
@@ -124,7 +127,7 @@ func parseAndSendPayload(connection net.Conn, inputData *InputData) {
 		}
 
 		message, err := messaging.CreateMessage_FilePackage(
-			2234,
+			inputData.ID.Bytes(),
 			protobuf.MessageType_PACKAGE,
 			(buffer)[:n],
 			isPayloadFinal)
@@ -153,7 +156,7 @@ func hashFile(path string) (hash []byte) {
 	return hasher.Sum(nil)
 }
 
-func listenForACK(connection net.Conn) {
+func listenForACK(connection net.Conn, inputData *InputData) {
 
 	// TODO: Make into const in message_handler (also server.go)
 	// sizePrefix is 4 bytes protobug message size
@@ -172,7 +175,18 @@ func listenForACK(connection net.Conn) {
 	if genericProto.GetAck().ProtoReflect().IsValid() {
 		ackPacket := genericProto.GetAck()
 
-		log.Info().Msgf("ACK packet recieved from server with success flag: %v", ackPacket.GetServerSuccess())
+		serverResult := ackPacket.GetServerSuccess()
+		ackID, _ := xid.FromBytes(ackPacket.GetId())
+		if ackID != inputData.ID {
+			log.Warn().
+				Str("respone_id", ackID.String()).
+				Str("original_id", inputData.ID.String()).
+				Msg("Response ID mismatch.")
+		}
+
+		log.Info().
+			Str("id_back", ackID.String()).
+			Msgf("ACK packet recieved from server with success flag: %v", serverResult)
 	}
 }
 
@@ -202,6 +216,7 @@ func parseInputArguments() *InputData {
 	}
 	data := &InputData{
 		FileInput: inputPath,
+		ID:        xid.New(),
 	}
 	return data
 }

locker/messaging/message_handler.go

@@ -10,7 +10,7 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func CreateMessage_ServerACk(id int32, messageType pb.MessageType, isSuccess bool) (protoMessage *pb.LockerMessage, err error) {
+func CreateMessage_ServerACk(id []byte, messageType pb.MessageType, isSuccess bool) (protoMessage *pb.LockerMessage, err error) {
 
 	protoMessage = &pb.LockerMessage{
 		Message: &pb.LockerMessage_Ack{
@@ -30,7 +30,7 @@ func CreateMessage_ServerACk(id int32, messageType pb.MessageType, isSuccess boo
 //  msgType
 //  fileName
 //  fileHash
-func CreateMessage_FileMeta(id int32, msgType pb.MessageType, namesSpace string, projectName string, fileName string, fileHash []byte) (protoMessage *pb.LockerMessage, err error) {
+func CreateMessage_FileMeta(id []byte, msgType pb.MessageType, namesSpace string, projectName string, fileName string, fileHash []byte) (protoMessage *pb.LockerMessage, err error) {
 
 	protoMessage = &pb.LockerMessage{
 		Message: &pb.LockerMessage_Meta{
@@ -48,7 +48,7 @@ func CreateMessage_FileMeta(id int32, msgType pb.MessageType, namesSpace string,
 	return protoMessage, err
 }
 
-func CreateMessage_FilePackage(id int32, msgType pb.MessageType, payload []byte, isFinalPayload bool) (protoMessage *pb.LockerMessage, err error) {
+func CreateMessage_FilePackage(id []byte, msgType pb.MessageType, payload []byte, isFinalPayload bool) (protoMessage *pb.LockerMessage, err error) {
 
 	protoMessage = &pb.LockerMessage{
 		Message: &pb.LockerMessage_Package{