Minor

Author: kali

CHANGELOG.md

@@ -0,0 +1,19 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+  
+## [0.5.0] - 2024-12-01
+ 
+First change log entry
+ 
+### Added
+
+- Graph tab in the client with the simplest visualisation
+- 2 new modules, KeyLogger and ScreenShot for windows
+- Batcave
+
+### Changed
+
+- TCP communication in windows and linux for both beacon and listener
+ 
+### Fixed
+

client/SessionPanel.py

@@ -146,7 +146,20 @@ def getSessions(self):
                     inStore=True
                     sessionStore.lastProofOfLife=session.lastProofOfLife
                     sessionStore.listenerHash=session.listenerHash
-                    sessionStore.killed=session.killed
+                    if session.hostname:
+                        sessionStore.hostname=session.hostname
+                    if session.username:
+                        sessionStore.username=session.username
+                    if session.arch:
+                        sessionStore.arch=session.arch
+                    if session.privilege:
+                        sessionStore.privilege=session.privilege
+                    if session.os:
+                        sessionStore.os=session.os
+                    if session.lastProofOfLife:
+                        sessionStore.lastProofOfLife=session.lastProofOfLife
+                    if session.killed:
+                        sessionStore.killed=session.killed
             # add
             if not inStore:
                 self.listSessionObject.append(Session(self.idSession,

teamServer/teamServer/TeamServer.cpp

@@ -1489,8 +1489,14 @@ int TeamServer::prepMsg(const std::string& input, C2Message& c2Message, bool isW
 }
 
 
-int main(int argc, char* argv[])
+int main(int argc, char* argv[]) 
 {
+    std::string configFile = "TeamServerConfig.json";
+    if (argc >= 2) 
+	{
+        configFile = argv[1];
+    }
+
 	//
     // Logger
 	//
@@ -1510,9 +1516,26 @@ int main(int argc, char* argv[])
 	//
 	// TeamServer Config
 	//
-	std::ifstream f("TeamServerConfig.json");
-	json config = json::parse(f);
-	
+	std::ifstream f(configFile);
+
+	// Check if the file is successfully opened
+    if (!f.is_open()) 
+	{
+        std::cerr << "Error: Config file '" << configFile << "' not found or could not be opened." << std::endl;
+        return 1;
+    }
+
+	json config;
+	try 
+	{
+		config = json::parse(f);
+	} 
+	catch (const json::parse_error& e) 
+	{
+        std::cerr << "Error: Failed to parse JSON in config file '" << configFile << "' - " << e.what() << std::endl;
+        return 1;
+    }
+
 	std::string serverGRPCAdd = config["ServerGRPCAdd"].get<std::string>();
 	std::string ServerGRPCPort = config["ServerGRPCPort"].get<std::string>();
 	std::string serverAddress = serverGRPCAdd;