exploitfarm 1.7.0__tar.gz → 1.7.2__tar.gz

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/PKG-INFO

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

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm/__init__.py

@@ -1,5 +1,5 @@
 __version__ = (
-    "1.7.0" if "{" not in "1.7.0" else "0.0.0"
+    "1.7.2" if "{" not in "1.7.2" else "0.0.0"
 )
 
 from exploitfarm.utils import try_tcp_connection

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm/models/exploit.py

@@ -17,7 +17,7 @@ class ExploitDTO(BaseModel):
     last_update: AwareDatetime|None = None
     created_at: AwareDatetime
     service: ServiceID = Field(validation_alias=AliasChoices('service_id'))
-    created_by: ClientID = Field(validation_alias=AliasChoices('created_by_id'))
+    created_by: ClientID|None = Field(default=None, validation_alias=AliasChoices('created_by_id'))
     last_execution_by: ClientID|None = None
     last_execution_group_by: AttackGroupID|None = None
     last_source: ExploitSourceID|None = None

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm/utils/config.py

@@ -3,7 +3,7 @@ import toml
 import string
 import socketio
 import traceback
-from pydantic import BaseModel, Field, validate_call
+from pydantic import BaseModel, Field, validate_call, PrivateAttr
 from uuid import UUID, uuid4
 from exploitfarm.utils import DEFAULT_SERVER_PORT, create_lock
 from typing_extensions import Self
@@ -166,6 +166,44 @@ class ExploitConfig(BaseModel):
     __exploit_lock = None
     __folder = "."
 
+    _remote_fetched: bool = PrivateAttr(default=False)
+    _fetched_name: str | None = PrivateAttr(default=None)
+    _fetched_service: UUID | None = PrivateAttr(default=None)
+    _fetched_language: Language | None = PrivateAttr(default=None)
+
+    def _fetch_remote_data(self):
+        if self._remote_fetched:
+            return
+        self._remote_fetched = True
+        
+        try:
+            from exploitfarm.xfarm import g
+            if getattr(g, "config", None) is None or not getattr(g, "config").status.get("loggined"):
+                return
+            
+            exploit_info = next((e for e in g.config.reqs.exploits() if e["id"] == str(self.uuid)), None)
+            if exploit_info:
+                self._fetched_name = exploit_info["name"]
+                self._fetched_service = UUID(exploit_info["service"])
+                self._fetched_language = Language(exploit_info["language"])
+        except Exception:
+            pass
+
+    def __getattribute__(self, item: str):
+        if item in ("name", "service", "language"):
+            val = super().__getattribute__(item)
+            if val is not None:
+                return val
+                
+            fetched_val = getattr(self, f"_fetched_{item}", None)
+            if fetched_val is not None:
+                return fetched_val
+                
+            self._fetch_remote_data()
+            return getattr(self, f"_fetched_{item}", None)
+            
+        return super().__getattribute__(item)
+
     @classmethod
     @validate_call()
     def new(
@@ -227,25 +265,29 @@ class ExploitConfig(BaseModel):
             f.write(self.model_dump_toml())
 
     def publish_exploit(self, config: ClientConfig):
+        raw_name = self.__dict__.get("name")
+        raw_service = self.__dict__.get("service")
+        raw_language = self.__dict__.get("language")
+        
         data_to_edit = {}
-        if self.name is not None:
-            data_to_edit["name"] = self.name
-        if self.service is not None:
-            data_to_edit["service"] = self.service
-        if self.language is not None:
-            data_to_edit["language"] = self.language.value
+        if raw_name is not None:
+            data_to_edit["name"] = raw_name
+        if raw_service is not None:
+            data_to_edit["service"] = raw_service
+        if raw_language is not None:
+            data_to_edit["language"] = raw_language.value
 
         if not data_to_edit:
             return
 
-        if self.name is not None and self.service is not None:
+        if raw_name is not None and raw_service is not None:
             config.reqs.new_exploit(
                 {
                     "id": self.uuid,
-                    "name": self.name,
-                    "language": self.language.value if self.language else Language.other.value,
+                    "name": raw_name,
+                    "language": raw_language.value if raw_language else Language.other.value,
                     "status": ExploitStatus.disabled.value,
-                    "service": self.service,
+                    "service": raw_service,
                     "created_by": config.client_id,
                 }
             )

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm/xfarm.py

@@ -290,6 +290,13 @@ def start(
         traceback.print_exc()
         print(f"[bold red]Error reading exploit configuration from {path}: {e}[/]")
         close_cli()
+        
+
+
+    if not exploit_config.name or not exploit_config.service:
+        print("[bold red]This exploit has missing configuration and has never been uploaded to the server![/]")
+        print("[bold yellow]Please run 'xfarm exploit edit' to give it a name and associate a service before starting it.[/]")
+        close_cli()
     # Auto push exploit (if not in test mode)
     if not no_auto_push and not test:
         try:
@@ -1232,16 +1239,6 @@ def init(
                 name = expl_conf.name
                 service = expl_conf.service
                 language = expl_conf.language
-                
-                if connection and (not name or not service or not language):
-                    try:
-                        exploit_info = next((e for e in g.config.reqs.exploits() if e["id"] == str(expl_conf.uuid)), None)
-                        if exploit_info:
-                            name = name or exploit_info["name"]
-                            service = service or UUID(exploit_info["service"])
-                            language = language or Language(exploit_info["language"])
-                    except Exception:
-                        pass
             else:
                 print(
                     "[bold red]Exploit configuration not found! | Tip: use 'xfarm exploit init' to inizialize an exploit source project![/]"

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm/xploit.py

@@ -1089,7 +1089,7 @@ def xploit_one(exec_info: AttackStartConfig, team: str, timeout: float = 30):
                             f"Submitted {flags} flags ({dups} duplicates) as manual submissions."
                         )
         except Exception:
-            qprint("Can't submit flags due missing config")
+            qprint("Can't submit flags, can't connect to backend\n")
     except KeyboardInterrupt:
         pass
     finally:

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/exploitfarm.egg-info/PKG-INFO

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

{exploitfarm-1.7.0 → exploitfarm-1.7.2}/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.0"
+VERSION = "1.7.2"
 
 setuptools.setup(
     name="exploitfarm",