exploitfarm 2.1.0__tar.gz → 2.2.0__tar.gz

{exploitfarm-2.1.0 → exploitfarm-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 2.1.0
+Version: 2.2.0
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -10,21 +10,21 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.32.5
-Requires-Dist: urllib3>=2.5.0
+Requires-Dist: requests>=2.34.2
+Requires-Dist: urllib3>=2.7.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: pydantic>=2
-Requires-Dist: typing-extensions>=4.7.1
+Requires-Dist: typing-extensions>=4.16.0
 Requires-Dist: fasteners>=0.20
 Requires-Dist: toml>=0.10.2
 Requires-Dist: psutil>=7.2.2
 Requires-Dist: dirhash>=0.5.0
 Requires-Dist: requests-toolbelt>=1.0.0
-Requires-Dist: python-socketio[asyncio_client]>=5.14.1
-Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: textual>=3.0.0
-Requires-Dist: typer>=0.16
-Requires-Dist: platformdirs>=4.0
+Requires-Dist: python-socketio[asyncio_client]>=5.16.4
+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

{exploitfarm-2.1.0 → exploitfarm-2.2.0}/exploitfarm/__init__.py

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

{exploitfarm-2.1.0 → exploitfarm-2.2.0}/exploitfarm/models/enums.py

@@ -60,6 +60,16 @@ class AttackMode(Enum):
     LOOP_DELAY = "loop-delay"
     RND_TICK = "rnd-tick"
 
+class SubmitterEnvStatus(Enum):
+    """State of a submitter's isolated dependency environment (see backend/utils/submitter_env.py)."""
+    not_required = "not-required"   # the submitter declares no requirements
+    absent = "absent"               # requirements are declared but nothing was installed yet
+    installing = "installing"       # an installation is currently running
+    stale = "stale"                 # installed, but the requirements changed since
+    ready = "ready"                 # installed and matching the declared requirements
+    failed = "failed"               # the last installation attempt failed
+    cancelled = "cancelled"         # the last installation was stopped by the user
+
 class SetupStatus(Enum):
     SETUP = "setup"
     RUNNING = "running"

exploitfarm-2.2.0/exploitfarm/models/submitter.py

@@ -0,0 +1,66 @@
+from typing import Any, Dict, List
+from pydantic import BaseModel, Field, AwareDatetime
+from exploitfarm.models.dbtypes import SubmitterID
+from exploitfarm.models.enums import SubmitterEnvStatus
+
+###-- Submitter Models --###
+
+SubmitterKargs = Dict[str, Dict[str, Any]]
+
+class SubmitterDTO(BaseModel):
+    id: SubmitterID
+    name: str
+    code: str
+    kargs: SubmitterKargs = {}
+    # requirements.txt-style block installed in the submitter's isolated environment
+    requirements: str = ""
+    created_at: AwareDatetime
+
+class SubmitterAddForm(BaseModel):
+    name: str = Field("", min_length=1)
+    code: str
+    kargs: Dict[str, Any]|None = None
+    requirements: str|None = None
+
+class SubmitterInfoForm(BaseModel):
+    code: str
+
+class SubmitterEditForm(BaseModel):
+    code: str|None = None
+    name: str|None = Field(None, min_length=1)
+    kargs: Dict[str, Any]|None = None
+    requirements: str|None = None
+
+class SubmitterCodeInfo(BaseModel):
+    """Result of the static analysis of a submitter's code (see POST /submitters/check)."""
+    kargs: SubmitterKargs = {}
+    # Requirements declared inside the code itself (PEP 723 block or __requirements__)
+    inline_requirements: List[str] = []
+
+###-- Submitter Environment Models --###
+
+class SubmitterEnvPackage(BaseModel):
+    name: str
+    version: str
+
+class SubmitterEnvDTO(BaseModel):
+    """State of the isolated dependency environment of a submitter."""
+    submitter_id: SubmitterID
+    status: SubmitterEnvStatus
+    # Requirements the environment *should* contain (explicit + inline, merged)
+    requirements: List[str] = []
+    # Requirements the last installation actually ran with
+    installed_requirements: List[str] = []
+    hash: str
+    installed_hash: str|None = None
+    installed_at: str|None = None
+    started_at: str|None = None
+    duration: float|None = None
+    error: str|None = None
+    packages: List[SubmitterEnvPackage] = []
+    path: str
+    log: str = ""
+
+class SubmitterEnvInstallForm(BaseModel):
+    # Rebuild the environment even if it already matches the declared requirements
+    force: bool = False

{exploitfarm-2.1.0 → exploitfarm-2.2.0}/exploitfarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 2.1.0
+Version: 2.2.0
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -10,21 +10,21 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.32.5
-Requires-Dist: urllib3>=2.5.0
+Requires-Dist: requests>=2.34.2
+Requires-Dist: urllib3>=2.7.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: pydantic>=2
-Requires-Dist: typing-extensions>=4.7.1
+Requires-Dist: typing-extensions>=4.16.0
 Requires-Dist: fasteners>=0.20
 Requires-Dist: toml>=0.10.2
 Requires-Dist: psutil>=7.2.2
 Requires-Dist: dirhash>=0.5.0
 Requires-Dist: requests-toolbelt>=1.0.0
-Requires-Dist: python-socketio[asyncio_client]>=5.14.1
-Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: textual>=3.0.0
-Requires-Dist: typer>=0.16
-Requires-Dist: platformdirs>=4.0
+Requires-Dist: python-socketio[asyncio_client]>=5.16.4
+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

exploitfarm-2.2.0/exploitfarm.egg-info/requires.txt

@@ -0,0 +1,15 @@
+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.0/requirements.txt

@@ -0,0 +1,16 @@
+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.1.0 → exploitfarm-2.2.0}/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 = "2.1.0"
+VERSION = "2.2.0"
 
 setuptools.setup(
     name="exploitfarm",

exploitfarm-2.1.0/exploitfarm/models/submitter.py

@@ -1,27 +0,0 @@
-from typing import Any, Dict
-from pydantic import BaseModel, Field, AwareDatetime
-from exploitfarm.models.dbtypes import SubmitterID
-
-###-- Submitter Models --###
-
-SubmitterKargs = Dict[str, Dict[str, Any]]    
-
-class SubmitterDTO(BaseModel):
-    id: SubmitterID
-    name: str
-    code: str
-    kargs: SubmitterKargs = {}
-    created_at: AwareDatetime
-
-class SubmitterAddForm(BaseModel):
-    name: str = Field("", min_length=1)
-    code: str
-    kargs: Dict[str, Any]|None = None
-
-class SubmitterInfoForm(BaseModel):
-    code: str
-
-class SubmitterEditForm(BaseModel):
-    code: str|None = None
-    name: str|None = Field(None, min_length=1)
-    kargs: Dict[str, Any]|None = None

exploitfarm-2.1.0/exploitfarm.egg-info/requires.txt

@@ -1,15 +0,0 @@
-requests>=2.32.5
-urllib3>=2.5.0
-python-dateutil>=2.9.0.post0
-pydantic>=2
-typing-extensions>=4.7.1
-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.14.1
-aiohttp>=3.9.0
-textual>=3.0.0
-typer>=0.16
-platformdirs>=4.0

exploitfarm-2.1.0/requirements.txt

@@ -1,16 +0,0 @@
-requests>=2.32.5
-urllib3>=2.5.0
-python-dateutil>=2.9.0.post0
-pydantic>=2
-typing-extensions>=4.7.1
-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.14.1
-aiohttp>=3.9.0
-textual>=3.0.0
-typer>=0.16
-platformdirs>=4.0
-