Fix submodule & Config for ExternalIp

README.md

@@ -186,7 +186,7 @@ git submodule update --init
 
 mkdir build
 cd build
-cmake ..
+cmake .. -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./conan_provider.cmake
 make -j4
 ```
 

client/CMakeLists.txt

@@ -8,4 +8,5 @@ foreach(ClientFile ${ClientFiles})
 endforeach()
 
 file(COPY PowershellWebDelivery DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
+file(COPY PeDropper DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/)
 

teamServer/teamServer/TeamServer.cpp

@@ -978,21 +978,26 @@ grpc::Status TeamServer::SendTermCmd(grpc::ServerContext* context, const teamser
 				{
 					std::string type = m_listeners[i]->getType();
 
-					std::string interface="";
-					auto it = m_config.find("IpInterface");
-					if(it != m_config.end())
-						interface = m_config["IpInterface"].get<std::string>();
-
 					std::string domainName="";
-					it = m_config.find("DomainName");
+					auto it = m_config.find("DomainName");
 					if(it != m_config.end())
 						domainName = m_config["DomainName"].get<std::string>();
 
+					std::string exposedIp="";
+					it = m_config.find("ExposedIp");
+					if(it != m_config.end())
+						exposedIp = m_config["ExposedIp"].get<std::string>();
+
+					std::string interface="";
+					it = m_config.find("IpInterface");
+					if(it != m_config.end())
+						interface = m_config["IpInterface"].get<std::string>();
+
 					std::string ip = "";
 					if(!interface.empty())
 						ip = getIPAddress(interface);
 
-					if(ip.empty() && domainName.empty())
+					if(ip.empty() && domainName.empty() && exposedIp.empty())
 					{
 						responseTmp.set_result("Error: No IP or Hostname in config.");
 						*response = responseTmp;
@@ -1024,6 +1029,8 @@ grpc::Status TeamServer::SendTermCmd(grpc::ServerContext* context, const teamser
 					result+="\n";
 					if(!domainName.empty())
 						result+=domainName;
+					else if(!exposedIp.empty())
+						result+=exposedIp;
 					else if(!ip.empty())
 						result+=ip;
 					result+="\n";

teamServer/teamServer/TeamServerConfig.json

@@ -1,8 +1,10 @@
 {
     "//LogLevelValues": "trace, debug, info, warning, error, fatal",
     "LogLevel": "info",
-    "IpInterface": "eth0",
+    "//Host contacted by the beacon": "3 following value are related to the host, probably a proxy, that will be contacted by the beacon, if DomainName is filled it will be selected first, then the ExposedIp and then the IpInterface",
     "DomainName": "",
+    "ExposedIp": "",
+    "IpInterface": "eth0",
     "ServerGRPCAdd": "0.0.0.0",
     "ServerGRPCPort": "50051",
     "ServCrtFile": "server.crt",