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

Maj tests defines

Browse Source
This commit is contained in:
maxdcb
2026-04-29 18:27:28 +02:00
parent d67acbae19
commit c5e34750bf
36 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/AssemblyExec/AssemblyExec.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ std::string AssemblyExec::getInfo()
int AssemblyExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if(splitedCmd.size() == 2)
{
if(splitedCmd[1]=="thread")
@@ -263,7 +263,7 @@ int AssemblyExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Messag
int AssemblyExec::initConfig(const nlohmann::json &config)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
for (auto& it : config.items())
{
if(it.key()=="process")
modules/Cat/Cat.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ std::string Cat::getInfo()
int Cat::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2 )
{
string inputFile;
modules/ChangeDirectory/ChangeDirectory.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ std::string ChangeDirectory::getInfo()
int ChangeDirectory::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
string path;
for (int idx = 1; idx < splitedCmd.size(); idx++)
{
modules/Chisel/Chisel.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ std::string Chisel::getInfo()
int Chisel::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() == 2)
{
if(splitedCmd[1]=="status")
modules/CimExec/CimExec.cpp
+2 -2
View File
@@ -113,7 +113,7 @@ CimExec::Parameters CimExec::unpackParameters(const std::string& data) const
int CimExec::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
Parameters params;
params.namespaceName = "root/cimv2";
@@ -222,7 +222,7 @@ int CimExec::process(C2Message& c2Message, C2Message& c2RetMessage)
int CimExec::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{
modules/DcomExec/DcomExec.cpp
+2 -2
View File
@@ -137,7 +137,7 @@ DcomExec::Parameters DcomExec::unpackParameters(const std::string& data) const
int DcomExec::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
Parameters params;
@@ -285,7 +285,7 @@ int DcomExec::process(C2Message& c2Message, C2Message& c2RetMessage)
int DcomExec::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode > 0)
modules/DotnetExec/DotnetExec.cpp
+3 -3
View File
@@ -193,7 +193,7 @@ std::string DotnetExec::getInfo()
#define runDll "00003"
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
bool endsWithDLL(const std::string& str)
{
@@ -221,7 +221,7 @@ bool endsWithEXE(const std::string& str)
int DotnetExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if((splitedCmd.size()==4 || splitedCmd.size()==5) && splitedCmd[1]=="load")
{
@@ -1186,7 +1186,7 @@ int DotnetExec::invokeMethodDll(const std::string name, const string& method, co
int DotnetExec::errorCodeToMsg(const C2Message &c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{
modules/EnumerateRdpSessions/EnumerateRdpSessions.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ EnumerateRdpSessions::Parameters EnumerateRdpSessions::unpackParameters(const st
int EnumerateRdpSessions::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
if (args.empty())
{
@@ -321,7 +321,7 @@ int EnumerateRdpSessions::followUp(const C2Message& /*c2RetMessage*/)
int EnumerateRdpSessions::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (c2RetMessage.errorCode() > 0)
{
errorMsg = c2RetMessage.returnvalue();
modules/Evasion/Evasion.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ std::string Evasion::getInfo()
int Evasion::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
std::string cmd = splitedCmd[1];
modules/Inject/Inject.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ std::string Inject::getInfo()
int Inject::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 4)
{
bool donut=false;
modules/KerberosUseTicket/KerberosUseTicket.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ std::string KerberosUseTicket::getInfo()
int KerberosUseTicket::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() == 2)
{
string inputFile = splitedCmd[1];
modules/KeyLogger/KeyLogger.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ std::string KeyLogger::getInfo()
int KeyLogger::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2 )
{
if(splitedCmd[1]=="start")
modules/KillProcess/KillProcess.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ std::string KillProcess::getInfo()
int KillProcess::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
c2Message.set_instruction(splitedCmd[0]);
modules/MakeToken/MakeToken.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ std::string MakeToken::getInfo()
int MakeToken::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if(splitedCmd.size()==3)
{
// format DOMAIN\Username Password
@@ -182,7 +182,7 @@ std::string MakeToken::makeToken(const std::string& username, const std::string&
int MakeToken::errorCodeToMsg(const C2Message &c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode > 0)
{
modules/MiniDump/MiniDump.cpp
+1 -1
View File
@@ -212,7 +212,7 @@ std::string xorKey = "nY5LkT7dXmiWeF2QApDLMQmnHaCR4VzsC6zuN3QgZtTqU7qaaf";
int MiniDump::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if(splitedCmd.size() == 3 && splitedCmd[1]=="dump")
{
modules/MkDir/MkDir.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ std::string MkDir::getInfo()
int MkDir::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
std::string path;
modules/ModuleCmd/Common.hpp
+1 -1
View File
@@ -18,7 +18,7 @@
#define SPDLOG_LEVEL_CRITICAL 5
#define SPDLOG_LEVEL_OFF 6
#if (defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)) && ((defined(_MSVC_LANG) && _MSVC_LANG >= 202302L) || __cplusplus >= 202302L)
#if (defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)) && ((defined(_MSVC_LANG) && _MSVC_LANG >= 202302L) || __cplusplus >= 202302L)
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
modules/ModuleCmd/Tools.hpp
+1 -1
View File
@@ -20,7 +20,7 @@
#endif
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
#include <donut.h>
modules/ModuleTemplate/ModuleTemplate.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ std::string ModuleTemplate::getInfo()
// Method that will be trigged server side to construct the message that will be send to the beacon and interpreted by the process method
int ModuleTemplate::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2 )
{
string args = "args from the splited command line";
@@ -85,7 +85,7 @@ int ModuleTemplate::init(std::vector<std::string> &splitedCmd, C2Message &c2Mess
// For exemple a file to write on the disk
int ModuleTemplate::followUp(const C2Message &c2RetMessage)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
// check if there is an error
if(c2RetMessage.errorCode()==-1)
{
modules/Powershell/CMakeLists.txt
-1
View File
@@ -7,7 +7,6 @@ $<TARGET_FILE:Powershell> "${C2_RUNTIME_MODULE_OUTPUT_DIR}/$<TARGET_FILE_NAME:Po
if(C2CORE_BUILD_TESTS)
add_executable(testsPowershell tests/testsPowershell.cpp Powershell.cpp)
target_compile_definitions(testsPowershell PRIVATE C2CORE_BUILD_TESTS)
target_link_libraries(testsPowershell )
add_custom_command(TARGET testsPowershell POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:testsPowershell> "${C2_TEST_BIN_OUTPUT_DIR}/$<TARGET_FILE_NAME:testsPowershell>")
modules/Powershell/Powershell.cpp
+1 -1
View File
@@ -212,7 +212,7 @@ std::string Powershell::getInfo()
int Powershell::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if(splitedCmd.size()<2)
{
c2Message.set_returnvalue(getInfo());
modules/PsExec/PsExec.cpp
+2 -2
View File
@@ -133,7 +133,7 @@ std::string PsExec::getInfo()
int PsExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
@@ -522,7 +522,7 @@ int PsExec::process(C2Message &c2Message, C2Message &c2RetMessage)
int PsExec::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if (errorCode > 0)
{
modules/PwSh/PwSh.cpp
+3 -3
View File
@@ -198,7 +198,7 @@ std::string PwSh::getInfo()
#define scriptPS "00005"
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
bool endsWithDLL(const std::string& str)
{
@@ -226,7 +226,7 @@ bool endsWithEXE(const std::string& str)
int PwSh::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if ((splitedCmd.size() == 2 || splitedCmd.size() == 4) && splitedCmd[1] == "init")
{
@@ -970,7 +970,7 @@ int PwSh::invokeMethodDll(const string& argument, std::string& result)
int PwSh::errorCodeToMsg(const C2Message &c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{
modules/Registry/Registry.cpp
+3 -3
View File
@@ -126,7 +126,7 @@ Registry::Parameters Registry::unpackParameters(const std::string& data) const
return params;
}
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
namespace
{
@@ -168,7 +168,7 @@ namespace
int Registry::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
if (args.size() < 2)
{
@@ -274,7 +274,7 @@ int Registry::process(C2Message& c2Message, C2Message& c2RetMessage)
int Registry::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (c2RetMessage.errorCode() > 0)
{
errorMsg = c2RetMessage.returnvalue();
modules/Remove/Remove.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ std::string Remove::getInfo()
int Remove::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
std::string path;
modules/ReversePortForward/ReversePortForward.cpp
+7 -7
View File
@@ -74,7 +74,7 @@ extern "C" __attribute__((visibility("default"))) ReversePortForward* ReversePor
#endif
ReversePortForward::ReversePortForward()
// #if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
// #if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
: ModuleCmd(std::string(moduleName), moduleHash)
, m_localPort(0)
, m_remotePort(0)
@@ -94,7 +94,7 @@ ReversePortForward::ReversePortForward()
ReversePortForward::~ReversePortForward()
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::lock_guard<std::mutex> lock(m_localMutex);
for (auto& entry : m_localConnections)
{
@@ -132,7 +132,7 @@ std::string ReversePortForward::getInfo()
int ReversePortForward::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() != 4)
{
c2Message.set_returnvalue(formatHelp());
@@ -180,7 +180,7 @@ int ReversePortForward::init(std::vector<std::string>& splitedCmd, C2Message& c2
int ReversePortForward::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
switch (c2RetMessage.errorCode())
{
case 1:
@@ -253,12 +253,12 @@ void ReversePortForward::enqueueChunk(int connectionId, const std::string& data,
std::lock_guard<std::mutex> lock(m_queueMutex);
m_pendingChunks.push({connectionId, data, closeEvent});
}
#if !(defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS))
#if !(defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS))
m_queueCv.notify_all();
#endif
}
// #if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
// #if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
bool ReversePortForward::sendAll(SocketHandle socket, const std::string& data) const
{
@@ -817,7 +817,7 @@ int ReversePortForward::process(C2Message& c2Message, C2Message& c2RetMessage)
// could be usefull
int ReversePortForward::recurringExec(C2Message& c2RetMessage)
{
// #if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
// #if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
pollLocalConnections();
std::unique_lock<std::mutex> lock(m_queueMutex);
modules/ReversePortForward/ReversePortForward.hpp
+1 -1
View File
@@ -57,7 +57,7 @@ private:
void closeSocket(SocketHandle socket) const;
void enqueueChunk(int connectionId, const std::string& data, bool closeEvent);
// #if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
// #if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
bool sendAll(SocketHandle socket, const std::string& data) const;
std::string receiveAvailable(SocketHandle socket, bool& closed) const;
void pollLocalConnections();
modules/ScreenShot/ScreenShot.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ std::string ScreenShot::getInfo()
int ScreenShot::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 1 )
{
c2Message.set_instruction(splitedCmd[0]);
modules/Shell/Shell.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ std::string Shell::getInfo()
int Shell::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::string arg;
if(splitedCmd.size() > 1)
{
modules/SpawnAs/SpawnAs.cpp
+1 -1
View File
@@ -698,7 +698,7 @@ int SpawnAs::process(C2Message &c2Message, C2Message &c2RetMessage)
int SpawnAs::errorCodeToMsg(const C2Message &c2RetMessage, std::string &errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (c2RetMessage.errorCode() > 0)
{
errorMsg = c2RetMessage.returnvalue();
modules/SshExec/SshExec.cpp
+2 -2
View File
@@ -273,7 +273,7 @@ SshExec::Parameters SshExec::unpackParameters(const std::string& data) const
int SshExec::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
if (args.size() < 2)
{
@@ -380,7 +380,7 @@ int SshExec::process(C2Message& c2Message, C2Message& c2RetMessage)
int SshExec::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if (errorCode > 0)
{
modules/StealToken/StealToken.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ std::string StealToken::getInfo()
int StealToken::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if(splitedCmd.size() == 2)
{
int pid=-1;
modules/TaskScheduler/TaskScheduler.cpp
+2 -2
View File
@@ -120,7 +120,7 @@ TaskScheduler::Parameters TaskScheduler::unpackParameters(const std::string& dat
int TaskScheduler::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
std::vector<std::string> args = regroupStrings(splitedCmd);
Parameters params;
@@ -250,7 +250,7 @@ int TaskScheduler::process(C2Message& c2Message, C2Message& c2RetMessage)
int TaskScheduler::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{
modules/Tree/Tree.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ std::string Tree::getInfo()
int Tree::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
string path;
for (int idx = 1; idx < splitedCmd.size(); idx++)
{
modules/WinRM/WinRM.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ std::string WinRM::getInfo()
int WinRM::init(std::vector<std::string>& splitedCmd, C2Message& c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
string mode = splitedCmd[1];
@@ -180,7 +180,7 @@ int WinRM::process(C2Message& c2Message, C2Message& c2RetMessage)
int WinRM::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{
modules/WmiExec/WmiExec.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ std::string WmiExec::getInfo()
int WmiExec::init(std::vector<std::string> &splitedCmd, C2Message &c2Message)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
if (splitedCmd.size() >= 2)
{
string mode = splitedCmd[1];
@@ -245,7 +245,7 @@ int WmiExec::process(C2Message& c2Message, C2Message& c2RetMessage)
int WmiExec::errorCodeToMsg(const C2Message& c2RetMessage, std::string& errorMsg)
{
#if defined(BUILD_TEAMSERVER) || defined(BUILD_TESTS) || defined(C2CORE_BUILD_TESTS)
#if defined(BUILD_TEAMSERVER) || defined(C2CORE_BUILD_TESTS)
int errorCode = c2RetMessage.errorCode();
if(errorCode>0)
{