Implemented agent removal, changed object structures

server/agent/agent.nim

@@ -1,4 +1,4 @@
-import terminal, strformat
+import terminal, strformat, strutils
 import ../[types, globals, utils]
 import ../db/database
 
@@ -16,29 +16,45 @@ Usage:
 Commands:
 
   list             List all agents.
-  build            Build an agent to connect to an active listener.
+  kill             Terminate the connection of an active listener and remove it from the interface.
   interact         Interact with an active agent.
 
 Options:
   -h, --help""")
 
+# List agents
 proc agentList*(cq: Conquest, args: varargs[string]) = 
     let agents = cq.dbGetAllAgents()
     cq.drawTable(agents)
 
-proc agentBuild*(cq: Conquest, args: varargs[string]) = 
-    discard
+# Terminate agent and remove it from the database
+proc agentKill*(cq: Conquest, name: string) =
+
+    # Check if agent supplied via -n parameter exists in database
+    if not cq.dbAgentExists(name.toUpperAscii): 
+        cq.writeLine(fgRed, styleBright, fmt"[-] Agent {name.toUpperAscii} does not exist.")
+        return
+
+    # TODO: Stop the process of the agent on the target system
+    # TODO: Add flag to self-delete executable after killing agent
+
+
+    # Remove the agent from the database
+    if not cq.dbDeleteAgentByName(name.toUpperAscii): 
+        cq.writeLine(fgRed, styleBright, "[-] Failed to terminate agent: ", getCurrentExceptionMsg())
+        return
+
+    cq.delAgent(name)
+    cq.writeLine(fgYellow, styleBright, "[+] ", resetStyle, "Terminated agent ", fgYellow, styleBright, name.toUpperAscii, resetStyle, ".")
 
 # Switch to interact mode
 proc agentInteract*(cq: Conquest, args: varargs[string]) = 
 
     cq.setIndicator("[AGENT] (username@hostname)> ")
-    cq.setStatusBar(@[("mode", "interact"), ("listeners", "X"), ("agents", "4")])    
+    cq.setStatusBar(@[("[mode]", "interact"), ("[username]", "X"), ("[hostname]", "4"), ("[ip]", "127.0.0.1"), ("[domain]", "domain.local")])    
 
     var command: string = cq.readLine()
 
-    discard
-
 #[
   Agent API
   Functions relevant for dealing with the agent API, such as registering new agents, querying tasks and posting results
@@ -51,7 +67,7 @@ proc register*(agent: Agent): bool =
         # Check if listener that is requested exists
         # TODO: Verify that the listener accessed is also the listener specified in the URL
         # This can be achieved by extracting the port number from the `Host` header and matching it to the one queried from the database
-        if not cq.listenerExists(agent.listener): 
+        if not cq.dbListenerExists(agent.listener): 
             cq.writeLine(fgRed, styleBright, fmt"[-] Agent from {agent.ip} attempted to register to non-existent listener: {agent.listener}.", "\n")
             return false
 
@@ -60,10 +76,11 @@ proc register*(agent: Agent): bool =
             cq.writeLine(fgRed, styleBright, fmt"[-] Failed to insert agent {agent.name} into database.", "\n")
             return false
 
-        cq.add(agent.name, agent)
+        cq.add(agent)
         cq.writeLine(fgYellow, styleBright, fmt"[{agent.firstCheckin}] ", resetStyle, "Agent ", fgYellow, styleBright, agent.name, resetStyle, " connected to listener ", fgGreen, styleBright, agent.listener, resetStyle, ": ", fgYellow, styleBright, fmt"{agent.username}@{agent.hostname}", "\n") 
 
     return true
+    
 #[
     Agent interaction mode
     When interacting with a agent, the following functions are called: