admin/maxDcb-C2Core
1
0
Fork 0
mirror of https://github.com/maxDcb/C2Core synced 2026-06-08 15:48:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch for modules that need it

Browse Source
This commit is contained in:
maxdcb
2026-05-01 14:38:13 +02:00
parent aba4949d44
commit d2cb88a75b
8 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/AssemblyExec/AssemblyExec.cpp
+1 -15
View File
@@ -79,7 +79,6 @@ AssemblyExec::~AssemblyExec()
}
// TODO add arch
std::string AssemblyExec::getInfo()
{
std::string info;
@@ -220,20 +219,7 @@ int AssemblyExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Messag
{
// if we create a process we need to exite process with donut shellcode
// Otherwise we exite the threadd
std::string arch = "x64";
// for tests
#ifdef _WIN32
#if defined(_M_X64) || defined(__x86_64__)
arch = "x64";
#elif defined(_M_IX86) || defined(__i386__)
arch = "x86";
#elif defined(_M_ARM64) || defined(__aarch64__)
arch = "arm64";
#endif
#endif
creatShellCodeDonut(inputFile, method, args, payload, true, false, arch);
creatShellCodeDonut(inputFile, method, args, payload, true, false, m_windowsArch);
}
else
{
modules/AssemblyExec/tests/testsAssemblyExec.cpp
+4
View File
@@ -40,6 +40,7 @@ int main()
{
bool ok = true;
const std::string dummyExe = dummyExePath();
const std::string currentArch = buildWindowsArch();
{
AssemblyExec module;
@@ -150,6 +151,7 @@ int main()
{
AssemblyExec module;
module.setWindowsArch(currentArch);
std::vector<std::string> cmd = {"assemblyExec", "-e", dummyPath.string()};
C2Message message;
@@ -159,6 +161,7 @@ int main()
{
AssemblyExec module;
module.setWindowsArch(currentArch);
C2Message modeMessage;
std::vector<std::string> modeCmd = {"assemblyExec", "thread"};
ok &= expect(module.init(modeCmd, modeMessage) == -1, "thread mode should be configurable before Donut EXE mode");
@@ -173,6 +176,7 @@ int main()
{
AssemblyExec module;
module.setWindowsArch(currentArch);
C2Message modeMessage;
std::vector<std::string> modeCmd = {"assemblyExec", "processWithSpoofedParent"};
ok &= expect(module.init(modeCmd, modeMessage) == -1, "spoofed-parent mode should be configurable before Donut EXE mode");
modules/Chisel/Chisel.cpp
+1 -15
View File
@@ -47,7 +47,6 @@ Chisel::~Chisel()
{
}
// TODO add arch
std::string Chisel::getInfo()
{
std::string info;
@@ -158,20 +157,7 @@ int Chisel::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
std::string method;
std::string payload;
std::string arch = "x64";
// for tests
#ifdef _WIN32
#if defined(_M_X64) || defined(__x86_64__)
arch = "x64";
#elif defined(_M_IX86) || defined(__i386__)
arch = "x86";
#elif defined(_M_ARM64) || defined(__aarch64__)
arch = "arm64";
#endif
#endif
creatShellCodeDonut(inputFile, method, args, payload, true, false, arch);
creatShellCodeDonut(inputFile, method, args, payload, true, false, m_windowsArch);
if(payload.size()==0)
{
modules/Chisel/tests/testsChisel.cpp
+2
View File
@@ -9,6 +9,7 @@ using namespace test_helpers;
int main()
{
bool ok = true;
const std::string currentArch = buildWindowsArch();
{
Chisel module;
@@ -59,6 +60,7 @@ int main()
{
Chisel module;
module.setWindowsArch(currentArch);
std::vector<std::string> cmd = {"chisel", "missing.exe", "client", "host:8000", "R:socks"};
C2Message message;
modules/Inject/Inject.cpp
+1 -16
View File
@@ -67,7 +67,6 @@ int Inject::initConfig(const nlohmann::json &config)
return 0;
}
// TODO add arch
std::string Inject::getInfo()
{
std::string info;
@@ -183,20 +182,7 @@ int Inject::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
std::string payload;
if(donut)
{
std::string arch = "x64";
// for tests
#ifdef _WIN32
#if defined(_M_X64) || defined(__x86_64__)
arch = "x64";
#elif defined(_M_IX86) || defined(__i386__)
arch = "x86";
#elif defined(_M_ARM64) || defined(__aarch64__)
arch = "arm64";
#endif
#endif
creatShellCodeDonut(inputFile, method, args, payload, true, false, arch);
creatShellCodeDonut(inputFile, method, args, payload, true, false, m_windowsArch);
}
else
{
@@ -468,4 +454,3 @@ int Inject::errorCodeToMsg(const C2Message &c2RetMessage, std::string &errorMsg)
#endif
return 0;
}
modules/Inject/tests/testsInject.cpp
+2
View File
@@ -132,6 +132,7 @@ int main()
{
bool ok = true;
const std::string dummyExe = dummyExePath();
const std::string currentArch = buildWindowsArch();
{
Inject module;
@@ -224,6 +225,7 @@ int main()
{
Inject module;
module.setWindowsArch(currentArch);
std::vector<std::string> cmd = {"inject", "-e", dummyPath.string(), "1234", "alpha", "beta gamma"};
C2Message message;
modules/ModuleCmd/ModuleCmd.hpp
+35
View File
@@ -1,5 +1,9 @@
#pragma once
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS) || defined(C2CORE_BUILD_FUNCTIONAL_TESTS)
#include <algorithm>
#include <cctype>
#endif
#include <iostream>
#include <fstream>
#include <memory>
@@ -31,6 +35,9 @@ public:
{
m_name=name;
m_hash=hash;
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS) || defined(C2CORE_BUILD_FUNCTIONAL_TESTS)
m_windowsArch="x64";
#endif
}
~ModuleCmd()
@@ -69,6 +76,31 @@ public:
virtual std::string getInfo() = 0;
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS) || defined(C2CORE_BUILD_FUNCTIONAL_TESTS)
virtual int setWindowsArch(const std::string& windowsArch)
{
std::string normalizedArch = windowsArch;
std::transform(normalizedArch.begin(), normalizedArch.end(), normalizedArch.begin(), [](unsigned char c)
{
return static_cast<char>(std::tolower(c));
});
if(normalizedArch=="amd64" || normalizedArch=="x86_64")
normalizedArch="x64";
else if(normalizedArch=="i386" || normalizedArch=="i686")
normalizedArch="x86";
else if(normalizedArch=="aarch64")
normalizedArch="arm64";
if(normalizedArch=="x64" || normalizedArch=="x86" || normalizedArch=="arm64")
m_windowsArch=normalizedArch;
else
m_windowsArch="x64";
return 0;
}
#endif
// if an error ocurre:
// set_returnvalue(errorMsg) && return -1
virtual int init(std::vector<std::string>& splitedCmd, C2Message& c2Message) = 0;
@@ -90,6 +122,9 @@ protected:
std::string m_windowsBeaconsDirectoryPath;
std::string m_toolsDirectoryPath;
std::string m_scriptsDirectoryPath;
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS) || defined(C2CORE_BUILD_FUNCTIONAL_TESTS)
std::string m_windowsArch;
#endif
private:
modules/tests/TestHelpers.hpp
+11
View File
@@ -60,4 +60,15 @@ namespace test_helpers
out << content;
return path;
}
inline std::string buildWindowsArch()
{
#if defined(_M_ARM64) || defined(__aarch64__)
return "arm64";
#elif defined(_M_IX86) || defined(__i386__)
return "x86";
#else
return "x64";
#endif
}
}