exploitfarm 1.7.5__tar.gz → 1.7.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.7.5
+Version: 1.7.7
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -98,15 +98,18 @@ submit_flags(flags)
 #### **Store Class**
 
 The `Store` class provides a key-value storage system for exploits, allowing you to save and retrieve centralized data during execution.
-The key value store is different for each exploit id. You can use it to store some data you need to save and change for every exploit execution.
+The key value store is by default isolated per exploit id.
+If you need data shared between exploits you should use a custom context_id that allows to access the same data from different exploits. The context_id can be set also in the constructor of the Store class, and will be used as default context_id for all the calls with that store instance.
 
 ```python
 from exploitfarm import Store
 
-store = Store()
+# Initialize with an optional default context
+store = Store(default_context_id="my_global_context_id")
 
-# Set a value
+# Set a value (context_id can be overridden per call)
 store.set("example_key", {"example": "data"})
+store.set("other_key", "value", context_id="explicit_ctx")
 
 # Get a value (if not exists returns None)
 data = store.get("example_key")
@@ -115,17 +118,28 @@ print(data)
 # Delete a key
 store.delete("example_key")
 
-# List all keys
+# List all keys in the current context
 keys = store.keys()
 print(keys)
+
+# List all available contexts
+contexts = store.contexts()
+print(contexts)
+
+# Delete an entire context
+store.delete_context(context_id="explicit_ctx")
 ```
 
 **Methods**:
 
-- `get(key: str, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a value by key.
-- `set(key: str, value: bytes, timeout: int = HTTP_TIMEOUT)`: Store a value by key.
-- `delete(key: str, timeout: int = HTTP_TIMEOUT)`: Delete a key.
-- `keys(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all stored keys.
+- `get(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> any`: Retrieve and deserialize a value by key.
+- `get_bytes(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a raw byte value.
+- `set(key: str, value: any, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Serialize and store a value by key.
+- `set_bytes(key: str, value: bytes, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Store a raw byte value.
+- `delete(key: str, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete a key.
+- `keys(timeout: int = HTTP_TIMEOUT, context_id: str | None = None) -> list[str]`: List all stored keys in a context.
+- `contexts(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all available contexts.
+- `delete_context(context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete an entire context and its keys.
 
 **Environment Variables Required**:
 

{exploitfarm-1.7.5 → exploitfarm-1.7.7}/README.md

@@ -61,15 +61,18 @@ submit_flags(flags)
 #### **Store Class**
 
 The `Store` class provides a key-value storage system for exploits, allowing you to save and retrieve centralized data during execution.
-The key value store is different for each exploit id. You can use it to store some data you need to save and change for every exploit execution.
+The key value store is by default isolated per exploit id.
+If you need data shared between exploits you should use a custom context_id that allows to access the same data from different exploits. The context_id can be set also in the constructor of the Store class, and will be used as default context_id for all the calls with that store instance.
 
 ```python
 from exploitfarm import Store
 
-store = Store()
+# Initialize with an optional default context
+store = Store(default_context_id="my_global_context_id")
 
-# Set a value
+# Set a value (context_id can be overridden per call)
 store.set("example_key", {"example": "data"})
+store.set("other_key", "value", context_id="explicit_ctx")
 
 # Get a value (if not exists returns None)
 data = store.get("example_key")
@@ -78,17 +81,28 @@ print(data)
 # Delete a key
 store.delete("example_key")
 
-# List all keys
+# List all keys in the current context
 keys = store.keys()
 print(keys)
+
+# List all available contexts
+contexts = store.contexts()
+print(contexts)
+
+# Delete an entire context
+store.delete_context(context_id="explicit_ctx")
 ```
 
 **Methods**:
 
-- `get(key: str, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a value by key.
-- `set(key: str, value: bytes, timeout: int = HTTP_TIMEOUT)`: Store a value by key.
-- `delete(key: str, timeout: int = HTTP_TIMEOUT)`: Delete a key.
-- `keys(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all stored keys.
+- `get(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> any`: Retrieve and deserialize a value by key.
+- `get_bytes(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a raw byte value.
+- `set(key: str, value: any, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Serialize and store a value by key.
+- `set_bytes(key: str, value: bytes, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Store a raw byte value.
+- `delete(key: str, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete a key.
+- `keys(timeout: int = HTTP_TIMEOUT, context_id: str | None = None) -> list[str]`: List all stored keys in a context.
+- `contexts(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all available contexts.
+- `delete_context(context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete an entire context and its keys.
 
 **Environment Variables Required**:
 

exploitfarm-1.7.7/exploitfarm/__init__.py

@@ -0,0 +1,91 @@
+def _get_version():
+    v = "1.7.7" if "{" not in "1.7.7" else "0.0.0"
+    if v == "0.0.0":
+        import os
+        env_v = os.getenv("EXPLOITFARM_VERSION")
+        if env_v:
+            return env_v
+        import re
+
+        def parse_version(ver):
+            ver = ver.lstrip("v")
+            parts = re.split(r'[^0-9]+', ver)
+            return tuple(int(p) if p.isdigit() else 0 for p in parts if p)
+
+        def find_git_dir(start_path):
+            current = start_path
+            while current and current != "/" and current != "":
+                gd = os.path.join(current, ".git")
+                if os.path.isdir(gd):
+                    return gd
+                parent = os.path.dirname(current)
+                if parent == current:
+                    break
+                current = parent
+            return None
+
+        try:
+            git_dir = find_git_dir(os.path.abspath(os.path.dirname(__file__)))
+            if not git_dir:
+                return v
+                
+            branch = None
+            with open(os.path.join(git_dir, "HEAD"), "r") as f:
+                head = f.read().strip()
+                if head.startswith("ref: refs/heads/"):
+                    branch = head.split("ref: refs/heads/")[1]
+                    
+            if branch != "main":
+                return v
+                
+            tags = []
+            try:
+                with open(os.path.join(git_dir, "packed-refs"), "r") as f:
+                    for line in f:
+                        if " refs/tags/" in line:
+                            tags.append(line.strip().split(" refs/tags/")[1])
+            except Exception:
+                pass
+                
+            tags_dir = os.path.join(git_dir, "refs", "tags")
+            try:
+                for root, _, files in os.walk(tags_dir):
+                    for file in files:
+                        tags.append(os.path.relpath(os.path.join(root, file), tags_dir).replace(os.path.sep, "/"))
+            except Exception:
+                pass
+                
+            version_tags = [t for t in set(tags) if any(c.isdigit() for c in t)]
+            if version_tags:
+                return max(version_tags, key=parse_version)
+        except Exception:
+            pass
+    return v
+
+__version__ = _get_version()
+
+from exploitfarm.utils import try_tcp_connection
+from exploitfarm.models.enums import AttackMode, SetupStatus, FlagStatus
+from exploitfarm.utils import DEV_MODE
+from exploitfarm._init_exposed import get_host, Prio
+from exploitfarm._init_exposed import nicenessify, get_config, random_str, print, Store
+from exploitfarm._init_exposed import os_unix, os_windows, session
+
+# Exported functions
+__all__ = [
+    "try_tcp_connection",
+    "AttackMode",
+    "SetupStatus",
+    "get_host",
+    "get_config",
+    "random_str",
+    "session",
+    "print",
+    "nicenessify",
+    "Prio",
+    "FlagStatus",
+    "Store",
+    "DEV_MODE",
+    "os_unix",
+    "os_windows",
+]

{exploitfarm-1.7.5 → exploitfarm-1.7.7}/exploitfarm/_init_exposed.py

@@ -147,7 +147,7 @@ print = functools.partial(print, flush=True)
 
 
 class Store:
-    def __init__(self):
+    def __init__(self, default_context_id: str | None = None):
         self.base_url = os.getenv("XFARM_REMOTE_URL", None)
         if not self.base_url:
             raise ValueError("this exploit has to be run with xfarm")
@@ -156,62 +156,100 @@ class Store:
             raise ValueError("this exploit has to be run with xfarm")
         self.login_token = os.getenv("XFARM_LOGIN_TOKEN", None)
         self.session: Session = get_session(self.login_token)
-
-    def _keycheck(self, key: str):
+        if default_context_id is not None:
+            self._keycheck(default_context_id, "default_context_id")
+        self.default_context_id = default_context_id
+
+    def _get_context_id(self, context_id: str | None = None) -> str | None:
+        if context_id is not None:
+            self._keycheck(context_id, "context_id")
+            return context_id
+        if self.default_context_id is not None:
+            return self.default_context_id
+        return None
+
+    def _keycheck(self, key: str, what: str = "key"):
         if not isinstance(key, str):
-            raise ValueError("key must be a string")
+            raise ValueError(f"{what} must be a string")
         if len(key) > 255:
-            raise ValueError("key must be less than 255 characters")
+            raise ValueError(f"{what} must be less than 255 characters")
         if not re.match(r"^[A-Za-z0-9\-\._~()'!*:@,;]+$", key):
-            raise ValueError(r"key must match this regex: ^[A-Za-z0-9\-\._~()'!*:@,;]+$")
+            raise ValueError(rf"{what} must match this regex: ^[A-Za-z0-9\-\._~()'!*:@,;$]+$")
 
-    def get_bytes(self, key: str, default=None, timeout: int = HTTP_TIMEOUT) -> bytes:
+    def get_bytes(self, key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> bytes:
+        context_id = self._get_context_id(context_id)
         self._keycheck(key)
         r = self.session.get(
             urljoin(self.base_url, f"exploits/{self.exploit_id}/store/key/{key}"),
+            params={"context_id": context_id} if context_id else None,
             timeout=timeout,
         )
         if r.status_code == 404:
             return default
         return check_req(r).content
 
-    def get(self, key: str, default=None, timeout: int = HTTP_TIMEOUT) -> bytes:
+    def get(self, key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> bytes:
         class TmpNotFound:
             pass
-
-        data = self.get_bytes(key, default=TmpNotFound, timeout=timeout)
+        data = self.get_bytes(key, context_id=context_id, default=TmpNotFound, timeout=timeout)
         if data == TmpNotFound:
             return default
         return pickle.loads(data)
 
-    def set_bytes(self, key: str, value: bytes, timeout: int = HTTP_TIMEOUT):
+    def set_bytes(self, key: str, value: bytes, context_id: str | None = None, timeout: int = HTTP_TIMEOUT):
         self._keycheck(key)
+        context_id = self._get_context_id(context_id)
         return requests_check_json(
             self.session.put(
                 urljoin(self.base_url, f"exploits/{self.exploit_id}/store/key/{key}"),
                 data=value,
                 timeout=timeout,
                 headers={"Content-Type": "application/octet-stream"},
+                params={"context_id": context_id} if context_id else None,
             )
         )
 
-    def set(self, key: str, value, timeout: int = HTTP_TIMEOUT):
+    def set(self, key: str, value, context_id: str | None = None, timeout: int = HTTP_TIMEOUT):
         value = pickle.dumps(value)
-        return self.set_bytes(key, value, timeout)
+        return self.set_bytes(key, value, context_id=context_id, timeout=timeout)
 
-    def delete(self, key: str, timeout: int = HTTP_TIMEOUT):
+    def delete(self, key: str, context_id: str | None = None, timeout: int = HTTP_TIMEOUT):
         self._keycheck(key)
+        context_id = self._get_context_id(context_id)
         return requests_check_json(
             self.session.delete(
                 urljoin(self.base_url, f"exploits/{self.exploit_id}/store/key/{key}"),
+                params={"context_id": context_id} if context_id else None,
                 timeout=timeout,
             )
         )
 
-    def keys(self, timeout: int = HTTP_TIMEOUT) -> list[str]:
+    def keys(self, timeout: int = HTTP_TIMEOUT, context_id: str | None = None) -> list[str]:
+        context_id = self._get_context_id(context_id)
         return requests_check_json(
             self.session.get(
                 urljoin(self.base_url, f"exploits/{self.exploit_id}/store/keys"),
+                params={ "context_id": context_id } if context_id else None,
+                timeout=timeout,
+            )
+        )
+
+    def contexts(self, timeout: int = HTTP_TIMEOUT) -> list[str]:
+        return requests_check_json(
+            self.session.get(
+                urljoin(self.base_url, f"exploits/{self.exploit_id}/store/contexts"),
+                timeout=timeout,
+            )
+        )
+
+    def delete_context(self, context_id: str | None = None, timeout: int = HTTP_TIMEOUT):
+        context_id = self._get_context_id(context_id)
+        if not context_id:
+            raise ValueError("context_id must be provided to delete it")
+        self._keycheck(context_id, "context_id")
+        return requests_check_json(
+            self.session.delete(
+                urljoin(self.base_url, f"exploits/{self.exploit_id}/store/context/{context_id}"),
                 timeout=timeout,
             )
         )

{exploitfarm-1.7.5 → exploitfarm-1.7.7}/exploitfarm/models/flags.py

@@ -21,6 +21,7 @@ class AttackExecutionDTO(BaseModel):
     executed_by: ClientID|None = Field(None, validation_alias=AliasChoices('executed_by_id'))
     executed_by_group: AttackGroupID|None = Field(None, validation_alias=AliasChoices('executed_by_group_id'))
     flags: list[FlagDTOSmall]
+    duplicate_flags: list[str] = []
     exploit_source: ExploitSourceID|None = Field(None, validation_alias=AliasChoices('exploit_source_id'))
     
 class FlagDTOAttackDetails(BaseModel):

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

@@ -123,28 +123,29 @@ def fast_check_exploit_conf_service(exploit_config: ExploitConfig) -> ExploitCon
 
 
 def auto_push_is_safe(exploit_config: ExploitConfig):
-    no_latest_groups = (
-        len(
-            [
-                g
-                for g in g.config.reqs.groups()
-                if g["exploit"] == str(exploit_config.uuid) and g["commit"] == "latest"
-            ]
-        )
-        == 0
-    )
-    if no_latest_groups:
+    # Since groups always use the latest version, check if there are ANY groups using this exploit
+    active_groups = [
+        gr
+        for gr in g.config.reqs.groups()
+        if gr.get("exploit") == str(exploit_config.uuid)
+    ]
+    
+    if len(active_groups) == 0:
         return True
     else:
         current_hash = exploit_config.hash()
-        if current_hash in [
-            ele["hash"] for ele in g.config.reqs.exploit_source_log(exploit_config.uuid)
-        ]:  # If the current commit is pushed
-            return True
+        try:
+            # If the exact source version is already pushed, it's safe
+            pushed_hashes = [ele["hash"] for ele in g.config.reqs.exploit_source_log(exploit_config.uuid)]
+            if current_hash in pushed_hashes:
+                return True
+        except Exception:
+            pass
+            
         if g.interactive:
             return typer.confirm(
-                "There are attack groups that are using the latest commit, "
-                "this command is trying to push a new version of the exploit. "
+                "There are active attack groups using this exploit. "
+                "Pushing a new version will update them to the new code. "
                 "Do you want to continue?",
                 default=False,
             )

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

@@ -55,7 +55,6 @@ class g:
     server_id = None
     thread_pool: ThreadPoolExecutor = None
     tot_teams: int = 0
-    flag_cache: set = set()
     attack_round_deadline = dt_now()
     exploit_hash: str | None = None
     virtual_time_available = 0
@@ -198,8 +197,6 @@ class AttackStorage:
         stats: bool = True,
     ):
         with self._lock:
-            flags = [flag for flag in flags if flag not in g.flag_cache]
-            g.flag_cache.update(flags)
             execution_submit = {
                 "start_time": start_time,
                 "end_time": end_time,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.7.5
+Version: 1.7.7
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -98,15 +98,18 @@ submit_flags(flags)
 #### **Store Class**
 
 The `Store` class provides a key-value storage system for exploits, allowing you to save and retrieve centralized data during execution.
-The key value store is different for each exploit id. You can use it to store some data you need to save and change for every exploit execution.
+The key value store is by default isolated per exploit id.
+If you need data shared between exploits you should use a custom context_id that allows to access the same data from different exploits. The context_id can be set also in the constructor of the Store class, and will be used as default context_id for all the calls with that store instance.
 
 ```python
 from exploitfarm import Store
 
-store = Store()
+# Initialize with an optional default context
+store = Store(default_context_id="my_global_context_id")
 
-# Set a value
+# Set a value (context_id can be overridden per call)
 store.set("example_key", {"example": "data"})
+store.set("other_key", "value", context_id="explicit_ctx")
 
 # Get a value (if not exists returns None)
 data = store.get("example_key")
@@ -115,17 +118,28 @@ print(data)
 # Delete a key
 store.delete("example_key")
 
-# List all keys
+# List all keys in the current context
 keys = store.keys()
 print(keys)
+
+# List all available contexts
+contexts = store.contexts()
+print(contexts)
+
+# Delete an entire context
+store.delete_context(context_id="explicit_ctx")
 ```
 
 **Methods**:
 
-- `get(key: str, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a value by key.
-- `set(key: str, value: bytes, timeout: int = HTTP_TIMEOUT)`: Store a value by key.
-- `delete(key: str, timeout: int = HTTP_TIMEOUT)`: Delete a key.
-- `keys(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all stored keys.
+- `get(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> any`: Retrieve and deserialize a value by key.
+- `get_bytes(key: str, default=None, context_id: str | None = None, timeout: int = HTTP_TIMEOUT) -> bytes`: Retrieve a raw byte value.
+- `set(key: str, value: any, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Serialize and store a value by key.
+- `set_bytes(key: str, value: bytes, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Store a raw byte value.
+- `delete(key: str, context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete a key.
+- `keys(timeout: int = HTTP_TIMEOUT, context_id: str | None = None) -> list[str]`: List all stored keys in a context.
+- `contexts(timeout: int = HTTP_TIMEOUT) -> list[str]`: List all available contexts.
+- `delete_context(context_id: str | None = None, timeout: int = HTTP_TIMEOUT)`: Delete an entire context and its keys.
 
 **Environment Variables Required**:
 

{exploitfarm-1.7.5 → exploitfarm-1.7.7}/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.5"
+VERSION = "1.7.7"
 
 setuptools.setup(
     name="exploitfarm",

exploitfarm-1.7.5/exploitfarm/__init__.py

@@ -1,29 +0,0 @@
-__version__ = (
-    "1.7.5" if "{" not in "1.7.5" else "0.0.0"
-)
-
-from exploitfarm.utils import try_tcp_connection
-from exploitfarm.models.enums import AttackMode, SetupStatus, FlagStatus
-from exploitfarm.utils import DEV_MODE
-from exploitfarm._init_exposed import get_host, Prio
-from exploitfarm._init_exposed import nicenessify, get_config, random_str, print, Store
-from exploitfarm._init_exposed import os_unix, os_windows, session
-
-# Exported functions
-__all__ = [
-    "try_tcp_connection",
-    "AttackMode",
-    "SetupStatus",
-    "get_host",
-    "get_config",
-    "random_str",
-    "session",
-    "print",
-    "nicenessify",
-    "Prio",
-    "FlagStatus",
-    "Store",
-    "DEV_MODE",
-    "os_unix",
-    "os_windows",
-]