exploitfarm 1.7.7__tar.gz → 1.7.8__tar.gz

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.7.7
+Version: 1.7.8
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -24,7 +24,6 @@ Requires-Dist: python-socketio[client]>=5.14.1
 Requires-Dist: textual>=3.0.0
 Requires-Dist: typer>=0.16
 Requires-Dist: xfarm
-Requires-Dist: orjson
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm/__init__.py

@@ -1,5 +1,5 @@
 def _get_version():
-    v = "1.7.7" if "{" not in "1.7.7" else "0.0.0"
+    v = "1.7.8" if "{" not in "1.7.8" else "0.0.0"
     if v == "0.0.0":
         import os
         env_v = os.getenv("EXPLOITFARM_VERSION")

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm/tui/startxploit.py

@@ -155,8 +155,15 @@ class XploitRun(App[int]):
         time_delta = last_execution_time = last_attack_status = None
         executing = team_info.executing
         if team_info.last:
-            time_delta = str(dt.now(datetime.timezone.utc) - team_info.last.end_time).split(".")[0]
-            last_execution_time = str(team_info.last.end_time - team_info.last.start_time).split(".")[0]
+            if team_info.last.end_time:
+                time_delta = str(dt.now(datetime.timezone.utc) - team_info.last.end_time).split(".")[0]
+                last_execution_time = str(team_info.last.end_time - team_info.last.start_time).split(".")[0]
+            else:
+                time_delta = "N/A"
+                if team_info.last.start_time:
+                    last_execution_time = str(dt.now(datetime.timezone.utc) - team_info.last.start_time).split(".")[0]
+                else:
+                    last_execution_time = "N/A"
             last_attack_status = team_info.last.status
 
         match last_attack_status:

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm/utils/reqs.py

@@ -8,7 +8,7 @@ from uuid import UUID
 from typing import Dict, Any
 from exploitfarm.utils.config import ClientConfig, ExploitConfig
 from exploitfarm.utils import ExploitFarmClientError
-import orjson
+import json
 from datetime import datetime as dt
 from exploitfarm.models.enums import AttackMode, SetupStatus
 from posixpath import join as urljoin
@@ -30,8 +30,19 @@ def get_url(path: str, config: ClientConfig | None = None) -> str:
     return result
 
 
-def jsonify(data: Any) -> str:
-    return orjson.loads(orjson.dumps(data))
+from enum import Enum
+
+def _custom_serializer(obj):
+    if isinstance(obj, UUID):
+        return str(obj)
+    if isinstance(obj, dt):
+        return obj.isoformat()
+    if isinstance(obj, Enum):
+        return obj.value
+    raise TypeError(f"Object of type {obj.__class__.__name__} is not JSON serializable")
+
+def jsonify(data: Any) -> Any:
+    return json.loads(json.dumps(data, default=_custom_serializer))
 
 
 def get_session(auth: str | None | ClientConfig = None) -> requests.Session:

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm/xfarm.py

@@ -24,7 +24,7 @@ from exploitfarm.utils.config import (
 )
 import getpass
 import re
-import orjson
+import json
 import sys
 from pydantic import PositiveInt
 from typing import Optional
@@ -640,7 +640,7 @@ def submitter_test(
 ):
     initial_setup()
     try:
-        kwargs = orjson.loads(kwargs)
+        kwargs = json.loads(kwargs)
     except Exception as e:
         print(f"[bold red]Invalid kwargs json: {e}")
         close_cli()

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm/xploit.py

@@ -8,7 +8,8 @@ And that's one of the reasons why this attacker/submitter is called "exploitfarm
 import dateutil.parser
 import os
 import re
-import orjson
+import json
+import shlex
 import math
 import subprocess
 import time
@@ -285,7 +286,7 @@ def once_in_a_period(period):
 def repush_flags():
     try:
         with open(".flag_queue.json", "rt") as f:
-            old_queue_data = orjson.loads(f.read())
+            old_queue_data = json.loads(f.read())
         if old_queue_data["server_id"] != g.server_id:
             raise Exception("Server ID mismatch")
         for ele in old_queue_data["queue"]:
@@ -497,11 +498,16 @@ def read_and_print(stdout: io.BytesIO, buffer: io.BytesIO):
     stdout.close()
 
 
+_exploit_config_cache = {}
+
 def get_or_download_exploit(exploit_id: str, commit_id: str) -> ExploitConfig:
     # Construct the absolute path for the exploit cache
     base_dir = os.path.expanduser(f"~/.exploitfarm/cache/{exploit_id}/{commit_id}")
     
     with g.exploit_cache_lock:
+        if base_dir in _exploit_config_cache:
+            return _exploit_config_cache[base_dir]
+            
         # Check if the exploit configuration file exists in the cache
         if not check_exploit_config_exists(base_dir):
             # If the directory exists but is incomplete/corrupted, we might need to clear it,
@@ -514,7 +520,9 @@ def get_or_download_exploit(exploit_id: str, commit_id: str) -> ExploitConfig:
             tar.extractall(base_dir)
             tar.close()
             
-        return ExploitConfig.read(base_dir)
+        config = ExploitConfig.read(base_dir)
+        _exploit_config_cache[base_dir] = config
+        return config
 
 
 def launch_sploit(
@@ -532,7 +540,8 @@ def launch_sploit(
     env = os.environ.copy()
     env["PYTHONUNBUFFERED"] = "1"
     env["XFARM_HOST"] = team["host"]
-    env["XFARM_TEAM"] = orjson.dumps(team).decode()
+    team_json = json.dumps(team)
+    env["XFARM_TEAM"] = team_json.decode() if isinstance(team_json, bytes) else team_json
     env["XFARM_EXPLOIT_ID"] = str(config.uuid)
     env["XFARM_REMOTE_URL"] = get_url_from_config("", g.exec.config)
     if g.exec.config.server.auth_key:
@@ -540,32 +549,33 @@ def launch_sploit(
 
     # Command to run the exploit
     command = f"{config.interpreter} {config.run}".strip()
+    cmd_args = shlex.split(command)
     need_close_fds = not os_windows
 
     proc = None
     if os_windows:
         with g.ctrl_c_win.skip_ctrl_c_handling():
             proc = subprocess.Popen(
-                command,
+                cmd_args,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
                 close_fds=need_close_fds,
                 env=env,
                 cwd=config._ExploitConfig__folder,
-                shell=True,
+                shell=False,
             )
             nicenessify(pid=proc.pid)
     else:
         proc = subprocess.Popen(
-            command,
+            cmd_args,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             close_fds=need_close_fds,
             env=env,
             cwd=config._ExploitConfig__folder,
-            shell=True,
-            preexec_fn=nicenessify,
+            shell=False,
         )
+        nicenessify(pid=proc.pid)
 
     read_function = None
     if stream_output:
@@ -582,12 +592,21 @@ def launch_sploit(
             return value
 
         read_function = func
-
-    if not read_function:
+    else:
+        pipe = proc.stdout
+        buffer = io.BytesIO()
+        
+        def silent_read():
+            buffer.write(pipe.read())
+            
+        thr = threading.Thread(target=silent_read)
+        thr.start()
 
         def func():
-            value = proc.stdout.read()
+            thr.join()
             proc.stdout.close()
+            value = buffer.getvalue()
+            buffer.close()
             return value
 
         read_function = func
@@ -1046,7 +1065,7 @@ def shutdown(restart: bool = False):
         attacks = g.attack_storage.pick_attacks()
         if attacks:
             with open(".flag_queue.json", "wb") as f:
-                f.write(orjson.dumps({"server_id": g.server_id, "queue": attacks}))
+                f.write(json.dumps({"server_id": g.server_id, "queue": attacks}))
         elif os.path.exists(".flag_queue.json"):
             os.remove(".flag_queue.json")
     except Exception:

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.7.7
+Version: 1.7.8
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -24,7 +24,6 @@ Requires-Dist: python-socketio[client]>=5.14.1
 Requires-Dist: textual>=3.0.0
 Requires-Dist: typer>=0.16
 Requires-Dist: xfarm
-Requires-Dist: orjson
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/exploitfarm.egg-info/requires.txt

@@ -12,4 +12,3 @@ python-socketio[client]>=5.14.1
 textual>=3.0.0
 typer>=0.16
 xfarm
-orjson

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/requirements.txt

@@ -12,4 +12,3 @@ python-socketio[client]>=5.14.1
 textual>=3.0.0
 typer>=0.16
 xfarm
-orjson

{exploitfarm-1.7.7 → exploitfarm-1.7.8}/setup.py

@@ -10,7 +10,7 @@ with open("requirements.txt", "r", encoding="utf-8") as f:
         if not ele.strip().startswith("#") and ele.strip() != ""
     ]
 
-VERSION = "1.7.7"
+VERSION = "1.7.8"
 
 setuptools.setup(
     name="exploitfarm",