exploitfarm 2.2.5__tar.gz → 2.2.7__tar.gz

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 2.2.5
+Version: 2.2.7
 Summary: Exploit Farm client
-Home-page: https://github.com/pwnzer0tt1/exploitfarm
-Author: Pwnzer0tt1
-Author-email: pwnzer0tt1@poliba.it
+Author-email: Pwnzer0tt1 <pwnzer0tt1@poliba.it>
+License-Expression: GPL-3.0-or-later
+Project-URL: Homepage, https://github.com/pwnzer0tt1/exploitfarm
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -25,15 +24,6 @@ Requires-Dist: aiohttp>=3.14.3
 Requires-Dist: textual>=8.2.8
 Requires-Dist: typer>=0.27.2
 Requires-Dist: platformdirs>=4.11.7
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # ExploitFarm Python Library and CLI
 

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm/__init__.py

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

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm/local_executor.py

@@ -538,7 +538,7 @@ class LocalExecutor(BaseExecutor):
             
             try:
                 handle = msvcrt.get_osfhandle(proc.stdout.fileno())
-                avail = wintypes.DWORD()
+                avail = wintypes.DWORD()  # pylint: disable=no-value-for-parameter  # stub omits the default
                 res = ctypes.windll.kernel32.PeekNamedPipe(handle, None, 0, None, ctypes.byref(avail), None)
                 if res and avail.value > 0:
                     chunk = os.read(proc.stdout.fileno(), min(avail.value, 4096))

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm/tui/config.py

@@ -268,7 +268,7 @@ def inital_config_setup(config: ClientConfig, interactive: bool = True) -> bool:
     ):
         if not interactive:
             print(
-                "[bold red]Missing configuration, set it with 'xfarm config' command[/]"
+                "[bold red]Missing configuration, set it with 'xfarm config edit'[/]"
             )
             exit(1)
         if not _run_setup_config(config):

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm/xfarm.py

@@ -118,13 +118,13 @@ def handle_service_not_found(exploit_config: ExploitConfig):
         close_cli()
     print(
         f"[bold red]Service {escape(str(exploit_config.service))} not found "
-        "use 'xfarm init --edit'[/]"
+        "use 'xfarm edit'[/]"
     )
     decision = typer.confirm(
-        "Do you want to continue run 'xfarm init --edit' ?", default=True
+        "Do you want to run 'xfarm edit' now?", default=True
     )
     if decision:
-        init(edit=True)
+        _exploit_setup(True)
         restart_program()
 
 
@@ -230,8 +230,8 @@ def initial_setup(login=True, require_running=False):
     return connection
 
 
-@config.command(help="Edit the client settings")
-def edit(
+@config.command(name="edit", help="Edit the client settings")
+def config_edit(
     address: str = typer.Option(None, help="The address of the server"),
     port: int = typer.Option(None, help="The port of the server"),
     nickname: str = typer.Option(None, help="The nickname of this client"),
@@ -347,7 +347,7 @@ def start(
     if not initial_setup(require_running=True):
         print(
             "[bold red]Can't connect to the server! "
-            "The server is needed to start the exploit! Configure with 'xfarm config'[/]"
+            "The server is needed to start the exploit! Configure with 'xfarm config edit'[/]"
         )
         close_cli()
 
@@ -967,14 +967,14 @@ def template_edit(
 
 
 @app.command(help="Edit the exploit config")
-def edit(  # noqa: F811
+def edit(
     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"
     ),
 ):
-    init(edit=True, name=name, service=service, language=language)
+    _exploit_setup(True, name, service, language)
 
 
 @app.command(help="Commit and push the current version of the exploit to the server")
@@ -1313,6 +1313,15 @@ def init(
     language: Optional[Language] = typer.Option(
         None, help="The language of the exploit"
     ),
+):
+    _exploit_setup(False, name, service, language)
+
+
+def _exploit_setup(
+    edit: bool,
+    name: Optional[str] = None,
+    service: Optional[UUID] = None,
+    language: Optional[Language] = None,
 ):
     connection = initial_setup(login=False)
     templates = []
@@ -1352,7 +1361,7 @@ def init(
         if final_status == 0:
             print(
                 f"[bold green]Exploit configuration {'created' if not edit else 'edited'} locally![/]\n"
-                "[bold yellow]Use 'xfarm exploit push' or 'start' to upload it to the backend.[/]"
+                "[bold yellow]Use 'xfarm push' or 'xfarm start' to upload it to the backend.[/]"
             )
         elif final_status == 99:
             print(
@@ -1401,7 +1410,7 @@ def init(
         expl_conf.write()
         print(
             f"[bold green]Exploit configuration {'created' if not edit else 'edited'} locally![/]\n"
-            "[bold yellow]Use 'xfarm exploit push' or 'start' to upload it to the backend.[/]"
+            "[bold yellow]Use 'xfarm push' or 'xfarm start' to upload it to the backend.[/]"
         )
 
 

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 2.2.5
+Version: 2.2.7
 Summary: Exploit Farm client
-Home-page: https://github.com/pwnzer0tt1/exploitfarm
-Author: Pwnzer0tt1
-Author-email: pwnzer0tt1@poliba.it
+Author-email: Pwnzer0tt1 <pwnzer0tt1@poliba.it>
+License-Expression: GPL-3.0-or-later
+Project-URL: Homepage, https://github.com/pwnzer0tt1/exploitfarm
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -25,15 +24,6 @@ Requires-Dist: aiohttp>=3.14.3
 Requires-Dist: textual>=8.2.8
 Requires-Dist: typer>=0.27.2
 Requires-Dist: platformdirs>=4.11.7
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # ExploitFarm Python Library and CLI
 

{exploitfarm-2.2.5 → exploitfarm-2.2.7}/exploitfarm.egg-info/SOURCES.txt

@@ -1,8 +1,5 @@
-MANIFEST.in
 README.md
-requirements.txt
-setup.py
-xfarm
+pyproject.toml
 exploitfarm/__init__.py
 exploitfarm/__main__.py
 exploitfarm/_init_exposed.py
@@ -17,6 +14,7 @@ exploitfarm/xploit.py
 exploitfarm.egg-info/PKG-INFO
 exploitfarm.egg-info/SOURCES.txt
 exploitfarm.egg-info/dependency_links.txt
+exploitfarm.egg-info/entry_points.txt
 exploitfarm.egg-info/requires.txt
 exploitfarm.egg-info/top_level.txt
 exploitfarm/models/__init__.py

exploitfarm-2.2.7/exploitfarm.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+xfarm = exploitfarm.xfarm:run

exploitfarm-2.2.7/pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["setuptools>=77"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "exploitfarm"
+# Replaced with the release tag by CI (.github/workflows/release.yml)
+version = "2.2.7"
+description = "Exploit Farm client"
+readme = "README.md"
+authors = [{ name = "Pwnzer0tt1", email = "pwnzer0tt1@poliba.it" }]
+license = "GPL-3.0-or-later"
+requires-python = ">=3.10"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "requests>=2.34.2",
+    "urllib3>=2.7.0",
+    "python-dateutil>=2.9.0.post0",
+    "pydantic>=2",
+    "typing-extensions>=4.16.0",
+    "fasteners>=0.20",
+    "toml>=0.10.2",
+    "psutil>=7.2.2",
+    "dirhash>=0.5.0",
+    "requests-toolbelt>=1.0.0",
+    "python-socketio[asyncio_client]>=5.16.4",
+    "aiohttp>=3.14.3",
+    "textual>=8.2.8",
+    "typer>=0.27.2",
+    "platformdirs>=4.11.7",
+]
+
+[project.urls]
+Homepage = "https://github.com/pwnzer0tt1/exploitfarm"
+
+[project.scripts]
+xfarm = "exploitfarm.xfarm:run"
+
+[tool.setuptools.packages.find]
+include = ["exploitfarm*"]

exploitfarm-2.2.5/MANIFEST.in

@@ -1 +0,0 @@
-include requirements.txt

exploitfarm-2.2.5/requirements.txt

@@ -1,16 +0,0 @@
-requests>=2.34.2
-urllib3>=2.7.0
-python-dateutil>=2.9.0.post0
-pydantic>=2
-typing-extensions>=4.16.0
-fasteners>=0.20
-toml>=0.10.2
-psutil>=7.2.2
-dirhash>=0.5.0
-requests-toolbelt>=1.0.0
-python-socketio[asyncio_client]>=5.16.4
-aiohttp>=3.14.3
-textual>=8.2.8
-typer>=0.27.2
-platformdirs>=4.11.7
-

exploitfarm-2.2.5/setup.py

@@ -1,37 +0,0 @@
-import setuptools
-
-with open("README.md", "r", encoding="utf-8") as fh:
-    long_description = fh.read()
-
-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 = "2.2.5"
-
-setuptools.setup(
-    name="exploitfarm",
-    version=VERSION
-    if "{" not in VERSION
-    else "0.0.0",  # uv pip install -U . --no-cache-dir for testing
-    author="Pwnzer0tt1",
-    author_email="pwnzer0tt1@poliba.it",
-    scripts=["xfarm"],
-    py_modules=["exploitfarm"],
-    install_requires=required,
-    include_package_data=True,
-    description="Exploit Farm client",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/pwnzer0tt1/exploitfarm",
-    packages=setuptools.find_packages(),
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.10",
-)

exploitfarm-2.2.5/xfarm

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-from exploitfarm.xfarm import run
-
-if __name__ == "__main__":
-    run()