Merge pull request #22 from maxDcb/develop

Maj Client

Author: maxDcb

.github/workflows/Release.yml

@@ -19,7 +19,7 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/Tests.yml

@@ -11,7 +11,7 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v4

.gitignore

@@ -1,3 +1,4 @@
-build*
 Tests
-.vscode/
+C2Client/build/
+.vscode
+build/

C2Client/.gitignore

@@ -0,0 +1,2 @@
+C2Client.egg-info
+C2Client/__pycache__

C2Client/C2Client/.gitignore

@@ -0,0 +1,4 @@
+.termHistory
+.cmdHistory
+*.exe
+*.dll

client/CMakeLists.txt C2Client/C2Client/CMakeLists.txtclient/CMakeLists.txt renamed to C2Client/C2Client/CMakeLists.txt

@@ -10,10 +10,29 @@
 from grpcClient import *
 
 from TerminalPanel import *
+from ScriptPanel import *
 
 sys.path.insert(1, './Credentials')
 import credentials
 
+
+#
+# Log
+#
+try:
+    import pkg_resources
+    logsDir = pkg_resources.resource_filename(
+        'C2Client',  
+        'logs' 
+    )
+
+except ImportError:
+    logsDir = os.path.join(os.path.dirname(__file__), 'logs')
+
+if not os.path.exists(logsDir):
+    os.makedirs(logsDir)
+
+
 #
 # Constant
 #
@@ -270,14 +289,10 @@
 #
 class ConsolesTab(QWidget):
 
-    def __init__(self, parent, ip, port, devMode):
+    def __init__(self, parent, grpcClient):
         super(QWidget, self).__init__(parent)
         widget = QWidget(self)
         self.layout = QHBoxLayout(widget)
-
-        self.ip = ip
-        self.port = port
-        self.devMode = devMode
 
         # Initialize tab screen
         self.tabs = QTabWidget()
@@ -288,11 +303,21 @@ def __init__(self, parent, ip, port, devMode):
         self.layout.addWidget(self.tabs)
         self.setLayout(self.layout)
 
+        self.grpcClient = grpcClient
+
         tab = QWidget()
         self.tabs.addTab(tab, TerminalTabTitle)
         tab.layout = QVBoxLayout(self.tabs)
-        terminal = Terminal(self, self.ip, self.port, self.devMode)
-        tab.layout.addWidget(terminal)
+        self.terminal = Terminal(self, self.grpcClient)
+        tab.layout.addWidget(self.terminal)
+        tab.setLayout(tab.layout)
+        self.tabs.setCurrentIndex(self.tabs.count()-1)
+
+        tab = QWidget()
+        self.tabs.addTab(tab, "Script")
+        tab.layout = QVBoxLayout(self.tabs)
+        self.script = Script(self, self.grpcClient)
+        tab.layout.addWidget(self.script)
         tab.setLayout(tab.layout)
         self.tabs.setCurrentIndex(self.tabs.count()-1)
 
@@ -314,7 +339,8 @@ def addConsole(self, beaconHash, listenerHash, hostname, username):
             tab = QWidget()
             self.tabs.addTab(tab, beaconHash[0:8])
             tab.layout = QVBoxLayout(self.tabs)
-            console = Console(self, self.ip, self.port, self.devMode, beaconHash, listenerHash, hostname, username)
+            console = Console(self, self.grpcClient, beaconHash, listenerHash, hostname, username)
+            console.consoleScriptSignal.connect(self.script.consoleScriptMethod)
             tab.layout.addWidget(console)
             tab.setLayout(tab.layout)
             self.tabs.setCurrentIndex(self.tabs.count()-1)
@@ -328,18 +354,21 @@ def closeTab(self, currentIndex):
 
 
 class Console(QWidget):
+
+    consoleScriptSignal = pyqtSignal(str, str, str, str,  str)
+
     tabPressed = pyqtSignal()
     beaconHash=""
     hostname=""
     username=""
     logFileName=""
     listenerHash=""
 
-    def __init__(self, parent, ip, port, devMode, beaconHash, listenerHash, hostname, username):
+    def __init__(self, parent, grpcClient, beaconHash, listenerHash, hostname, username):
         super(QWidget, self).__init__(parent)
         self.layout = QVBoxLayout(self)
 
-        self.grpcClient = GrpcClient(ip, port, devMode)
+        self.grpcClient = grpcClient
 
         self.beaconHash=beaconHash
         self.listenerHash=listenerHash
@@ -412,7 +441,7 @@ def runCommand(self):
             cmdHistoryFile.write('\n')
             cmdHistoryFile.close()
 
-            logFile = open("./logs/"+self.logFileName, 'a')
+            logFile = open(logsDir+"/"+self.logFileName, 'a')
             logFile.write('[+] send: \"' + commandLine + '\"')
             logFile.write('\n')
             logFile.close()
@@ -429,6 +458,7 @@ def runCommand(self):
                 self.printInTerminal(commandLine, "", "")
                 command = TeamServerApi_pb2.Command(beaconHash=self.beaconHash, listenerHash=self.listenerHash, cmd=commandLine)
                 result = self.grpcClient.sendCmdToSession(command)
+                self.consoleScriptSignal.emit("send", self.beaconHash, self.listenerHash, commandLine, "")
                 if result.message:
                     self.printInTerminal("", commandLine, result.message.decode(encoding="latin1", errors="ignore"))
 
@@ -438,14 +468,15 @@ def displayResponse(self):
         session = TeamServerApi_pb2.Session(beaconHash=self.beaconHash)
         responses = self.grpcClient.getResponseFromSession(session)
         for response in responses:
+            self.consoleScriptSignal.emit("receive", "", "", response.cmd, response.response.decode(encoding="latin1", errors="ignore"))
             self.setCursorEditorAtEnd()
             # check the response for mimikatz and not the cmd line ???
             if "-e mimikatz.exe" in response.cmd:
                 credentials.handleMimikatzCredentials(response.response.decode(encoding="latin1", errors="ignore"), self.grpcClient, TeamServerApi_pb2)
             self.printInTerminal("", response.instruction + " " + response.cmd, response.response.decode(encoding="latin1", errors="ignore"))
             self.setCursorEditorAtEnd()
 
-            logFile = open("./logs/"+self.logFileName, 'a')
+            logFile = open(logsDir+"/"+self.logFileName, 'a')
             logFile.write('[+] result: \"' + response.instruction + " " + response.cmd + '\"')
             logFile.write('\n' + response.response.decode(encoding="latin1", errors="ignore")  + '\n')
             logFile.write('\n')

client/ConsolePanel.py C2Client/C2Client/ConsolePanel.pyclient/ConsolePanel.py renamed to C2Client/C2Client/ConsolePanel.py

@@ -1,11 +1,15 @@
 import sys
+import os
 import signal
 import argparse
-from threading import Thread, Lock
+import logging
+
 from PyQt5.QtWidgets import *
 from PyQt5.QtGui import *
 from PyQt5.QtCore import *
 
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
 from grpcClient import *
 from ListenerPanel import *
 from SessionPanel import *
@@ -14,6 +18,7 @@
 
 import qdarktheme
 
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
 
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
@@ -27,6 +32,11 @@ def __init__(self, ip, port, devMode):
         self.port = port
         self.devMode = devMode
 
+        try:
+            self.grpcClient = GrpcClient(self.ip, self.port, self.devMode)
+        except ValueError as e:
+            raise e
+
         self.createPayloadWindow = None
 
         self.title = 'Exploration C2'
@@ -51,7 +61,12 @@ def __init__(self, ip, port, devMode):
         self.topLayout()
         self.botLayout()
 
+        self.sessionsWidget.sessionScriptSignal.connect(self.consoleWidget.script.sessionScriptMethod)
+        self.listenersWidget.listenerScriptSignal.connect(self.consoleWidget.script.listenerScriptMethod)
+
         self.sessionsWidget.interactWithSession.connect(self.consoleWidget.addConsole)
+
+        self.consoleWidget.script.mainScriptMethod("start", "", "", "")
 
         self.show()
 
@@ -64,27 +79,28 @@ def topLayout(self):
 
         self.m_main.layout = QHBoxLayout(self.m_main)
         self.m_main.layout.setContentsMargins(0, 0, 0, 0)
-        self.sessionsWidget = Sessions(self, self.ip, self.port, self.devMode)
+        self.sessionsWidget = Sessions(self, self.grpcClient)
         self.m_main.layout.addWidget(self.sessionsWidget)
-        self.listenersWidget = Listeners(self, self.ip, self.port, self.devMode)
+        self.listenersWidget = Listeners(self, self.grpcClient)
         self.m_main.layout.addWidget( self.listenersWidget)
 
         self.topWidget.addTab(self.m_main, "Main")
 
-        self.graphWidget = Graph(self, self.ip, self.port, self.devMode)
+        self.graphWidget = Graph(self, self.grpcClient)
         self.topWidget.addTab(self.graphWidget, "Graph")
 
         self.mainLayout.addWidget(self.topWidget, 1, 1, 1, 1)
 
 
     def botLayout(self):
 
-        self.consoleWidget = ConsolesTab(self, self.ip, self.port, self.devMode)
+        self.consoleWidget = ConsolesTab(self, self.grpcClient)
         self.mainLayout.addWidget(self.consoleWidget, 2, 0, 1, 2)
 
 
     def __del__(self):
-        print("Exit")
+        if hasattr(self, 'consoleWidget'):
+            self.consoleWidget.script.mainScriptMethod("stop", "", "", "")
 
 
     def payloadForm(self):
@@ -93,8 +109,7 @@ def payloadForm(self):
         self.createPayloadWindow.show()
 
 
-if __name__ == '__main__':
-
+def main():
     parser = argparse.ArgumentParser(description='TeamServer IP and port.')
     parser.add_argument('--ip', default='127.0.0.1', help='IP address (default: 127.0.0.1)')
     parser.add_argument('--port', type=int, default=50051, help='Port number (default: 50051)')
@@ -105,5 +120,12 @@ def payloadForm(self):
     app = QApplication(sys.argv)
     app.setStyleSheet(qdarktheme.load_stylesheet())
 
-    ex = App(args.ip, args.port, args.dev)
+    try:
+        ex = App(args.ip, args.port, args.dev)
+    except ValueError as e:
+        sys.exit(1)
     sys.exit(app.exec_())
+
+
+if __name__ == "__main__":
+    main()