exploitfarm 1.7.4__tar.gz → 1.7.6__tar.gz

{exploitfarm-1.7.4 → exploitfarm-1.7.6}/PKG-INFO

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

{exploitfarm-1.7.4 → exploitfarm-1.7.6}/exploitfarm/__init__.py

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

{exploitfarm-1.7.4 → exploitfarm-1.7.6}/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.4 → exploitfarm-1.7.6}/exploitfarm.egg-info/PKG-INFO

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

{exploitfarm-1.7.4 → exploitfarm-1.7.6}/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.4"
+VERSION = "1.7.6"
 
 setuptools.setup(
     name="exploitfarm",