Merge pull request #13 from maxDcb/develop

Develop

Author: maxDcb

README.md

@@ -6,20 +6,22 @@
 
 ## What it is
 
-Exploration is a redteam Command and Control framework.  
-This repository contains the TeamServer and the Client.  
-The release includes the TeamServer the Client with preconfigured certificate as well as the beacons and modules for windows from [C2Implant](https://github.com/maxDcb/C2Implant).
+Exploration is a red team Command and Control (C2) framework.  
+This repository includes both the TeamServer and the Client.  
+The release package contains the TeamServer, the Client, as well as the beacons and modules for Windows from [C2Implant](https://github.com/maxDcb/C2Implant) and for Linux from [C2Implant](https://github.com/maxDcb/C2LinuxImplant).
 
+
+You can run the following command to retrieve the latest release:
 ```
 wget -q $(wget -q -O - 'https://api.github.com/repos/maxDcb/C2TeamServer/releases/latest' | jq -r '.assets[] | select(.name=="Release.tar.gz").browser_download_url') -O ./C2TeamServer.tar.gz
 mkdir C2TeamServer && tar xf C2TeamServer.tar.gz -C C2TeamServer --strip-components 1
 ```
 
 ## Introduction
 
-The TeamServer is a stand alone application, coded in c++, that handle listeners. The client, coded in python, communicate with the TeamServer through GRPC.  
-Beacons run on the victime host. Each Beacons which connects back to the TeamServer open a new session. This session is used to control the Beacon, send commands and receive results.  
-Listener and Beacons can communicate through TCP, SMB, HTTP ,HTTPS and Github issues depending on the situation.
+The TeamServer is a standalone application, coded in C++, that handles listeners. The Client, coded in Python, communicates with the TeamServer through gRPC.  
+Beacons run on the victim host. Each Beacon that connects back to the TeamServer opens a new session. This session is used to control the Beacon, send commands, and receive results.  
+Listeners and Beacons can communicate through TCP, SMB, HTTP, HTTPS.  
 
 
 ![alt text](https://github.com/maxDcb/C2TeamServer/blob/master/images/ListenersAndSessions.png?raw=true)
@@ -28,20 +30,26 @@ Listener and Beacons can communicate through TCP, SMB, HTTP ,HTTPS and Github is
 ![alt text](https://github.com/maxDcb/C2TeamServer/blob/master/images/ListenersAndSessions2.png?raw=true)
 
 
-A compiled version of the TeamServer is ready to use in the Releases, with some default certificats for GRPC communication and HTTP Listener:
+A compiled version of the TeamServer is available in the Releases, complete with default certificates for gRPC communication and HTTP Listener.
 
-The TeamServer binary is in Release/TeamServer  
-it's launched using 
+The TeamServer binary is in Release/TeamServer. It can be launched using the following command:
 
 ```
-cd Release/TeamServer  
 ./TeamServer
 ```
 
 ![alt text](https://github.com/maxDcb/C2TeamServer/blob/master/images/TeamServerLaunch.png?raw=true)
 
-The Python Client is in Release/Client 
-It's launched using 'python3 GUI.py'  
+The Python Client is located in Release/Client. It can be launched using the following command:
+
+```
+cd  Release/Client 
+# --dev is to specify that the GRPC hostname in the SSL certificat will not be checked
+# --ip is the ip of the TeamServer
+python3 GUI.py --ip 127.0.0.0 --port 50051 --dev
+```
+
+The following packages are required to run the Client:
 
 ```
 pip3 install pycryptodome
@@ -51,13 +59,6 @@ pip3 install pyqtdarktheme
 pip3 install protobuf==5.27.0
 ```
 
-```
-cd  Release/Client 
-# --dev is to specify that the GRPC hostname in the SSL certificat will not be checked
-# --ip is the ip of the TeamServer
-python3 GUI.py --ip 127.0.0.0 --port 50051 --dev
-```
-
 ## Wiki
 
 For more information, please visit the [wiki](https://github.com/maxDcb/C2TeamServer/wiki)

client/PeDropper

@@ -2,7 +2,7 @@
 protobuf/5.27.0
 openssl/3.3.1 
 zlib/1.3.1 
-grpc/1.65.0
+grpc/1.67.1
 spdlog/1.14.1 
 cpp-httplib/0.16.3
 

client/PowershellWebDelivery

@@ -1064,11 +1064,13 @@ std::string getIPAddress(std::string &interface)
         temp_addr = interfaces;
         while(temp_addr != NULL) 
 		{
-            if(temp_addr->ifa_addr->sa_family == AF_INET) 
-			{ 
+            if (temp_addr->ifa_addr != NULL && temp_addr->ifa_addr->sa_family == AF_INET) 
+			{
                 if(strcmp(temp_addr->ifa_name, interface.c_str())==0)
 				{
-                    ipAddress=inet_ntoa(((struct sockaddr_in*)temp_addr->ifa_addr)->sin_addr);
+                    char addressBuffer[INET_ADDRSTRLEN];
+                    inet_ntop(AF_INET, &((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr, addressBuffer, INET_ADDRSTRLEN);
+                    ipAddress = addressBuffer;
                 }
             }
             temp_addr = temp_addr->ifa_next;