feat(ui): surface grpc operation status

Author: maxDcb

C2Client/C2Client/ConsolePanel.py

@@ -25,6 +25,7 @@
 from .ScriptPanel import Script
 from .AssistantPanel import Assistant
 from .TerminalModules.Credentials import credentials
+from .grpc_status import is_response_ok, response_message
 
 
 #
@@ -598,8 +599,12 @@ def runCommand(self):
                     command=commandLine,
                 )
                 response = self.grpcClient.getCommandHelp(command)
-                self.printInTerminal(response.command, "", "")
-                self.printInTerminal("", response.command, response.help)
+                command_text = getattr(response, "command", commandLine) or commandLine
+                self.printInTerminal(command_text, "", "")
+                if is_response_ok(response):
+                    self.printInTerminal("", command_text, response.help)
+                else:
+                    self.printInTerminal("", command_text, response_message(response, "No help available."))
 
             else:
                 self.printInTerminal(commandLine, "", "")
@@ -614,10 +619,20 @@ def runCommand(self):
                 )
                 result = self.grpcClient.sendSessionCommand(command)
                 command_id = getattr(result, "command_id", command_id) or command_id
+                if not is_response_ok(result):
+                    message = response_message(result, "Command was rejected by TeamServer.")
+                    self.printInTerminal("", commandLine, message)
+                    with open(os.path.join(logsDir, self.logFileName), 'a') as logFile:
+                        logFile.write('[+] rejected: \"' + commandLine + '\"')
+                        logFile.write('\n' + message + '\n')
+                    self.setCursorEditorAtEnd()
+                    return
+
                 context = "Host " + self.hostname + " - Username " + self.username
                 self.consoleScriptSignal.emit("send", self.beaconHash, self.listenerHash, context, commandLine, "", command_id)
-                if result.message:
-                    self.printInTerminal("", commandLine, result.message)
+                ack_message = response_message(result)
+                if ack_message:
+                    self.printInTerminal("", commandLine, ack_message)
 
         self.setCursorEditorAtEnd()
 
@@ -630,6 +645,8 @@ def displayResponse(self):
             listener_hash = response.session.listener_hash or self.listenerHash
             command_text = response.command or response.instruction
             decoded_response = response.output.decode('utf-8', 'replace')
+            if not is_response_ok(response):
+                decoded_response = response_message(response) or decoded_response or "Command failed."
             self.consoleScriptSignal.emit("receive", self.beaconHash, listener_hash, context, command_text, decoded_response, command_id)
             self.setCursorEditorAtEnd()
             # check the response for mimikatz and not the cmd line ???

C2Client/C2Client/ListenerPanel.py

@@ -19,6 +19,7 @@
 )
 
 from .grpcClient import TeamServerApi_pb2
+from .grpc_status import is_response_ok, operation_ack_text
 
 
 #
@@ -76,6 +77,8 @@ def __init__(self, parent, grpcClient):
 
         self.label = QLabel(ListenerTabTitle)
         self.layout.addWidget(self.label)
+        self.statusLabel = QLabel("")
+        self.layout.addWidget(self.statusLabel)
 
         # List of sessions
         self.listListener = QTableWidget()
@@ -106,6 +109,13 @@ def __init__(self, parent, grpcClient):
 
         self.setLayout(self.layout)
 
+    def setStatusMessage(self, ack, successFallback):
+        message = operation_ack_text(ack, successFallback)
+        self.statusLabel.setText(message)
+        if is_response_ok(ack):
+            self.statusLabel.setStyleSheet("color: #0a7f2e;")
+        else:
+            self.statusLabel.setStyleSheet("color: #b00020;")
 
     def __del__(self):
         self.getListenerWorker.quit()
@@ -166,14 +176,16 @@ def addListener(self, message):
             type=message[0],
             ip=message[1],
             port=int(message[2]))
-        self.grpcClient.addListener(listener)
+        ack = self.grpcClient.addListener(listener)
+        self.setStatusMessage(ack, "Listener command accepted.")
 
 
     # send message for stoping a listener
     def stopListener(self, listenerHash):
         listener = TeamServerApi_pb2.ListenerSelector(
         listener_hash=listenerHash)
-        self.grpcClient.stopListener(listener)
+        ack = self.grpcClient.stopListener(listener)
+        self.setStatusMessage(ack, "Listener stop command accepted.")
 
 
     # query the server to get the list of listeners

C2Client/C2Client/Scripts/checkSandbox.py

@@ -1,6 +1,7 @@
 import uuid
 
 from ..grpcClient import TeamServerApi_pb2
+from ..grpc_status import is_response_ok, response_message
 
 
 def OnSessionStart(grpcClient, beaconHash, listenerHash, hostname, username, arch, privilege, os, lastProofOfLife, killed):
@@ -18,5 +19,7 @@ def OnSessionStart(grpcClient, beaconHash, listenerHash, hostname, username, arc
 			command_id=uuid.uuid4().hex,
 		)
 		result = grpcClient.sendSessionCommand(command)
+		if not is_response_ok(result):
+			output += response_message(result, "Command was rejected by TeamServer.") + "\n"
 
 	return output

C2Client/C2Client/Scripts/listDirectory.py

@@ -1,6 +1,7 @@
 import uuid
 
 from ..grpcClient import TeamServerApi_pb2
+from ..grpc_status import is_response_ok, response_message
 
 
 def OnSessionStart(grpcClient, beaconHash, listenerHash, hostname, username, arch, privilege, os, lastProofOfLife, killed):
@@ -17,6 +18,8 @@ def OnSessionStart(grpcClient, beaconHash, listenerHash, hostname, username, arc
 		command_id=uuid.uuid4().hex,
 	)
 	result = grpcClient.sendSessionCommand(command)
+	if not is_response_ok(result):
+		output += response_message(result, "Command was rejected by TeamServer.") + "\n"
 
 	# commandLine = "ls"
 	# command = TeamServerApi_pb2.SessionCommandRequest(session=TeamServerApi_pb2.SessionSelector(beacon_hash=beaconHash, listener_hash=listenerHash), command=commandLine, command_id=uuid.uuid4().hex)

C2Client/C2Client/Scripts/startListenerHttp8443.py

@@ -1,4 +1,5 @@
 from ..grpcClient import TeamServerApi_pb2
+from ..grpc_status import operation_ack_text
 
 
 def OnStart(grpcClient):
@@ -9,7 +10,9 @@ def OnStart(grpcClient):
             ip="0.0.0.0",
             port=8443)
 
-	grpcClient.addListener(listener)
+	ack = grpcClient.addListener(listener)
+	message = operation_ack_text(ack, "Listener command accepted.")
+	if message:
+		output += message + "\n"
 
 	return output
-

C2Client/C2Client/SessionPanel.py

@@ -15,6 +15,7 @@
 )
 
 from .grpcClient import TeamServerApi_pb2
+from .grpc_status import is_response_ok, operation_ack_text
 
 
 #
@@ -57,6 +58,8 @@ def __init__(self, parent, grpcClient):
 
         self.label = QLabel('Sessions')
         self.layout.addWidget(self.label)
+        self.statusLabel = QLabel("")
+        self.layout.addWidget(self.statusLabel)
 
         # List of sessions
         self.listSession = QTableWidget()
@@ -86,6 +89,13 @@ def __init__(self, parent, grpcClient):
 
         self.setLayout(self.layout)
 
+    def setStatusMessage(self, ack, successFallback):
+        message = operation_ack_text(ack, successFallback)
+        self.statusLabel.setText(message)
+        if is_response_ok(ack):
+            self.statusLabel.setStyleSheet("color: #0a7f2e;")
+        else:
+            self.statusLabel.setStyleSheet("color: #b00020;")
 
     def resizeEvent(self, event):
         super().resizeEvent(event) 
@@ -140,7 +150,8 @@ def  actionClicked(self, action):
     def stopSession(self, beaconHash, listenerHash):
         session = TeamServerApi_pb2.SessionSelector(
             beacon_hash=beaconHash, listener_hash=listenerHash)
-        self.grpcClient.stopSession(session)
+        ack = self.grpcClient.stopSession(session)
+        self.setStatusMessage(ack, "Session stop command accepted.")
         self.listSessions()
 
 

C2Client/C2Client/TerminalModules/Credentials/credentials.py

@@ -2,6 +2,7 @@
 import re
 
 from ...grpcClient import GrpcClient
+from ...grpc_status import is_response_ok, terminal_response_text
 
 GetCredentialsInstruction = "getCred"
 AddCredentialsInstruction = "addCred"
@@ -11,7 +12,9 @@ def getCredentials(grpcClient: GrpcClient, TeamServerApi_pb2):
     commandTeamServer = GetCredentialsInstruction
     termCommand = TeamServerApi_pb2.TerminalCommandRequest(command=commandTeamServer, data=b"")
     resultTermCommand = grpcClient.executeTerminalCommand(termCommand)
-    result = resultTermCommand.result
+    result = terminal_response_text(resultTermCommand)
+    if not is_response_ok(resultTermCommand):
+        raise RuntimeError(result)
     return result
 
 
@@ -25,7 +28,9 @@ def addCredentials(grpcClient: GrpcClient,TeamServerApi_pb2, cred: str):
     commandTeamServer = AddCredentialsInstruction
     termCommand = TeamServerApi_pb2.TerminalCommandRequest(command=commandTeamServer, data=cred.encode())
     resultTermCommand = grpcClient.executeTerminalCommand(termCommand)
-    result = resultTermCommand.result
+    result = terminal_response_text(resultTermCommand)
+    if not is_response_ok(resultTermCommand):
+        raise RuntimeError(result)
     return result