Fix #96 short version of sensor id added in backend

backend/handlers.go

@@ -1,16 +1,16 @@
 package backend
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
-	"io"
-	"net/http"
-	"os"
-
+	"fmt"
 	"github.com/honeynet/ochi/backend/entities"
-
 	"github.com/julienschmidt/httprouter"
 	"google.golang.org/api/idtoken"
+	"io"
+	"net/http"
+	"os"
 )
 
 func (cs *server) indexHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -38,6 +38,14 @@ func (cs *server) cssHandler(w http.ResponseWriter, r *http.Request, _ httproute
 	}
 }
 
+// Helper function which splits into two parts the sensorID by the hyphen
+func extractFirst8CharactersOfSensorId(sensorID string) (string, error) {
+	if len(sensorID) < 8 {
+		return "", fmt.Errorf("Sensor ID must have at least 8 characters")
+	}
+	return sensorID[:8], nil
+}
+
 // publishHandler reads the request body with a limit of 8192 bytes and then publishes
 // the received message.
 func (cs *server) publishHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -48,9 +56,45 @@ func (cs *server) publishHandler(w http.ResponseWriter, r *http.Request, _ httpr
 		return
 	}
 	defer body.Close()
-
-	cs.publish(msg)
-
+	// Unmarshal the JSON message into a map
+	decoder := json.NewDecoder(bytes.NewReader(msg))
+	// Create a new map to store the sensorDataMap
+	var sensorIDMap map[string]interface{}
+	// Decode into the sensorDataMap
+	if err := decoder.Decode(&sensorIDMap); err != nil {
+		http.Error(w, "Invalid JSON payload", http.StatusBadRequest)
+		return
+	}
+	if sensorIDMap == nil {
+		// Handle the case where sensorMap is nil
+		http.Error(w, "Invalid JSON payload", http.StatusBadRequest)
+		return
+	}
+	// Get the sensorID from the map
+	sensorID, exists := sensorIDMap["sensorID"]
+	if !exists {
+		http.Error(w, "Sensor Id does not exists.", http.StatusBadRequest)
+		return
+	}
+	sensorIDStr, ok := sensorID.(string)
+	if !ok {
+		http.Error(w, "Sensor ID is not a string.", http.StatusBadRequest)
+		return
+	}
+	sensorID, err = extractFirst8CharactersOfSensorId(sensorIDStr)
+	if err != nil {
+		http.Error(w, "Sensor ID is less than 8 characters.", http.StatusBadRequest)
+		return
+	}
+	sensorIDMap["sensorID"] = sensorID
+	// Convert the sensorID back to a JSON message
+	alteredMsg, err := json.Marshal(sensorIDMap)
+	if err != nil {
+		http.Error(w, "Error processing JSON", http.StatusInternalServerError)
+		return
+	}
+	// Publish the altered JSON message
+	cs.publish(alteredMsg)
 	w.WriteHeader(http.StatusAccepted)
 }
 

frontend/components/Message.svelte

@@ -16,7 +16,7 @@
 </script>
 
 <p on:click={click} on:keypress={click} bind:this={element}>
-    {message.sensorID.split('-')[0]} | {message.srcHost}:{message.srcPort} -> {message.dstPort}:
+    {message.sensorID} | {message.srcHost}:{message.srcPort} -> {message.dstPort}:
     {#if message.handler}{message.handler}{:else}{message.rule}{/if}
     {#if message.scanner}"{message.scanner}"{/if}
     <u>Details</u>