exploitfarm 0.2.4__tar.gz → 0.2.6__tar.gz

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exploitfarm
-Version: 0.2.4
+Version: 0.2.6
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/exploitfarm/__init__.py

@@ -1,5 +1,5 @@
 
-__version__ = "0.2.4"
+__version__ = "0.2.6"
 
 from exploitfarm.utils import try_tcp_connection
 from exploitfarm.model import ServiceDTO, AttackMode, SetupStatus

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/exploitfarm/xploit.py

@@ -130,13 +130,14 @@ class AttackStorage:
 
 WARNING_RUNTIME = 5
 
-def qprint(*args):
+def qprint(*args, end="\n"):
     try:
         for arg in args:
             if isinstance(arg, str):
                 g.print_queue.put(escape(arg), block=False)
             else:
                 g.print_queue.put(arg, block=False)
+        g.print_queue.put(end, block=False)
     except (KeyboardInterrupt, ValueError):
         traceback.print_exc()
         pass
@@ -304,7 +305,7 @@ def process_sploit_filter(proc:subprocess.Popen, team: dict, start_time: dt, kil
 def read_and_print(stdout:io.BytesIO, buffer:io.BytesIO):
     # Read stdout line by line in a separate thread
     for line in iter(stdout.readline, b''):
-        qprint(line.decode('utf-8', errors='replace'))  # Print to main stdout in real-time
+        qprint(line.decode('utf-8', errors='replace'), end="")  # Print to main stdout in real-time
         buffer.write(line)
         buffer.flush()
     buffer.write(stdout.read())
@@ -480,7 +481,7 @@ def xploit(path: str):
 def run_printer_queue():
     try:
         while True:
-            print(g.print_queue.get())
+            print(g.print_queue.get(), end="")
     except Exception:
         pass
 

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/exploitfarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exploitfarm
-Version: 0.2.4
+Version: 0.2.6
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 with open('requirements.txt', 'r', encoding='utf-8') as f:
     required = [ele.strip() for ele in f.read().splitlines() if not ele.strip().startswith("#") and ele.strip() != ""]
 
-VERSION = "0.2.4"
+VERSION = "0.2.6"
 
 setuptools.setup(
     name="exploitfarm",

{exploitfarm-0.2.4 → exploitfarm-0.2.6}/xfarm

@@ -83,11 +83,11 @@ def reset():
 @app.command(help="Start the exploit")
 def start(
     path: str = typer.Argument(".", help="The path of the exploit"),
-    pool_size: PositiveInt = typer.Option(50, "-p", help="The number of workers to start"),
+    pool_size: PositiveInt = typer.Option(50, "--pool-size", "-p", help="The number of workers to start"),
     submit_pool_timeout: PositiveInt = typer.Option(3, help="The timeout for the submit pool to wait for new attack results and send flags"),
     server_status_refresh_period: PositiveInt = typer.Option(5, help="The period to refresh the server status"),
-    test: Optional[str] = typer.Option(None, help="Test the exploit"),
-    test_timeout: PositiveInt = typer.Option(30, "-t", help="The timeout for the test"),
+    test: Optional[str] = typer.Option(None, "--test", "-t", help="Test the exploit"),
+    test_timeout: PositiveInt = typer.Option(30, help="The timeout for the test"),
 ):
     path = os.path.abspath(path)
     from exploitfarm.xploit import start_xploit, shutdown, xploit_one
@@ -274,7 +274,7 @@ def status(
 
 @app.command(help="Initiate a new exploit configuration")
 def init(
-    edit: bool = typer.Option(False, help="Edit the exploit configuration"),
+    edit: bool = typer.Option(False, "--edit", "-e", help="Edit the exploit configuration"),
     name: Optional[str] = typer.Option(None, help="The name of the exploit"),
     service: Optional[UUID] = typer.Option(None, help="The service of the exploit"),
     language: Optional[Language] = typer.Option(None, help="The language of the exploit"),