Merge pull request #15 from maxDcb/develop

Develop

Author: maxDcb

.gitmodules

@@ -19,15 +19,6 @@
 [submodule "libs/libSocks5"]
 	path = libs/libSocks5
 	url = https://github.com/maxDcb/libSocks5.git
-[submodule "client/PowershellWebDelivery"]
-	path = client/PowershellWebDelivery
-	url = https://github.com/maxDcb/PowershellWebDelivery.git
-[submodule "client/PeDropper"]
-	path = client/PeDropper
-	url = https://github.com/maxDcb/PeDropper.git
-[submodule "client/GoDroplets"]
-	path = client/GoDroplets
-	url = https://github.com/almounah/GoDroplets
 [submodule "libs/libSocketHandler"]
 	path = libs/libSocketHandler
 	url = https://github.com/maxDcb/libSocketHandler.git

CMakeLists.txt

@@ -28,7 +28,9 @@ include_directories(${CMAKE_INCLUDE_PATH})
 
 option(WITH_TESTS "Compile for tests" ON)
 
+option(BUILD_TEAMSERVER "Enable Teamserver config" ON)
 add_definitions(-DBUILD_TEAMSERVER)
+
 if(WITH_TESTS)
   add_definitions(-DBUILD_TESTS)
   set(SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG)
@@ -61,8 +63,6 @@ add_subdirectory(certs)
 add_subdirectory(client)
 
 if(WITH_TESTS)
-    add_subdirectory(core/beacon)
-    add_subdirectory(core/beacon/tests)
     add_subdirectory(core/listener/tests)
 endif()
 

README.md

@@ -49,16 +49,6 @@ cd  Release/Client
 python3 GUI.py --ip 127.0.0.0 --port 50051 --dev
 ```
 
-The following packages are required to run the Client:
-
-```
-pip3 install pycryptodome
-pip3 install grpcio==1.66.1
-pip3 install PyQt5
-pip3 install pyqtdarktheme
-pip3 install protobuf==5.27.0
-```
-
 ## Wiki
 
 For more information, please visit the [wiki](https://github.com/maxDcb/C2TeamServer/wiki)

client/CMakeLists.txt

@@ -8,11 +8,9 @@ foreach(ClientFile ${ClientFiles})
 endforeach()
 
 file(COPY images DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
-file(COPY Batcave DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
 
-file(COPY Credentials DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
+file(COPY TerminalModules DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
+file(COPY DropperModules DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
 
-file(COPY PowershellWebDelivery DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
-file(COPY PeDropper DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
-file(COPY GoDroplets DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
+file(COPY DropperModules.conf DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
 

client/ConsolePanel.py

@@ -25,7 +25,6 @@
 EndInstruction = "end"
 ListenerInstruction = "listener"
 LoadModuleInstruction = "loadModule"
-SocksInstruction = "socks"
 
 AssemblyExecInstruction = "assemblyExec"
 UploadInstruction = "upload"
@@ -228,10 +227,6 @@
     (SpawnAsInstruction,[
         ('user password implant.exe',  []),
     ]),
-    (SocksInstruction,[
-        ('start 1080',  []),
-        ('stop',  []),
-    ]),
     (EvasionInstruction,[
         ('CheckHooks',  []),
         ('Unhook',  []),

client/DropperModules.conf

@@ -0,0 +1,6 @@
+https://github.com/maxDcb/PeDropper
+https://github.com/maxDcb/PowershellWebDelivery
+https://github.com/maxDcb/PeInjectorSyscall
+https://github.com/almounah/GoDroplets.git
+https://github.com/maxDcb/ElfDropper.git
+https://github.com/maxDcb/EarlyCascade.git

client/DropperModules/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore