exploitfarm 1.2.2__tar.gz → 1.2.4__tar.gz

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.2.2
+Version: 1.2.4
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -108,7 +108,7 @@ store = Store()
 # Set a value
 store.set("example_key", {"example": "data"})
 
-# Get a value
+# Get a value (if not exists returns None)
 data = store.get("example_key")
 print(data)
 
@@ -393,4 +393,3 @@ Environment variables can simplify configuration:
 1. Use `--test` to verify exploits before running them in production.
 2. Regularly push changes to the server for version control (they are auto-pushed on attack start anyway).
 3. Collaborate using attack groups for efficient resource utilization if the attack is heavy to execute.
-

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/README.md

@@ -71,7 +71,7 @@ store = Store()
 # Set a value
 store.set("example_key", {"example": "data"})
 
-# Get a value
+# Get a value (if not exists returns None)
 data = store.get("example_key")
 print(data)
 
@@ -356,4 +356,3 @@ Environment variables can simplify configuration:
 1. Use `--test` to verify exploits before running them in production.
 2. Regularly push changes to the server for version control (they are auto-pushed on attack start anyway).
 3. Collaborate using attack groups for efficient resource utilization if the attack is heavy to execute.
-

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/exploitfarm/__init__.py

@@ -1,5 +1,5 @@
 
-__version__ = "1.2.2" if "{" not in "1.2.2" else "0.0.0"
+__version__ = "1.2.4" if "{" not in "1.2.4" else "0.0.0"
 
 from exploitfarm.utils import try_tcp_connection
 from exploitfarm.models.enums import AttackMode, SetupStatus, FlagStatus

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/exploitfarm/_init_exposed.py

@@ -17,6 +17,7 @@ from exploitfarm.utils.reqs import (
     check_req,
     get_session,
 )
+from requests import Session
 import re
 
 os_windows = os.name == "nt"
@@ -150,7 +151,7 @@ class Store:
         if not self.exploit_id:
             raise ValueError("this exploit has to be run with xfarm")
         self.login_token = os.getenv("XFARM_LOGIN_TOKEN", None)
-        self.session = get_session(self.login_token)
+        self.session: Session = get_session(self.login_token)
 
     def _keycheck(self, key: str):
         if not isinstance(key, str):
@@ -162,17 +163,24 @@ class Store:
                 "key must only contain alphanumeric characters, dashes, underscores and dots"
             )
 
-    def get_bytes(self, key: str, timeout: int = HTTP_TIMEOUT) -> bytes:
+    def get_bytes(self, key: str, default=None, timeout: int = HTTP_TIMEOUT) -> bytes:
         self._keycheck(key)
-        return check_req(
-            self.session.get(
-                urljoin(self.base_url, f"exploits/{self.exploit_id}/store/key/{key}"),
-                timeout=timeout,
-            )
-        ).content
-
-    def get(self, key: str, timeout: int = HTTP_TIMEOUT) -> bytes:
-        return pickle.loads(self.get_bytes(key, timeout))
+        r = self.session.get(
+            urljoin(self.base_url, f"exploits/{self.exploit_id}/store/key/{key}"),
+            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:
+        class TmpNotFound:
+            pass
+
+        data = self.get_bytes(key, 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):
         self._keycheck(key)

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/exploitfarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exploitfarm
-Version: 1.2.2
+Version: 1.2.4
 Summary: Exploit Farm client
 Home-page: https://github.com/pwnzer0tt1/exploitfarm
 Author: Pwnzer0tt1
@@ -108,7 +108,7 @@ store = Store()
 # Set a value
 store.set("example_key", {"example": "data"})
 
-# Get a value
+# Get a value (if not exists returns None)
 data = store.get("example_key")
 print(data)
 
@@ -393,4 +393,3 @@ Environment variables can simplify configuration:
 1. Use `--test` to verify exploits before running them in production.
 2. Regularly push changes to the server for version control (they are auto-pushed on attack start anyway).
 3. Collaborate using attack groups for efficient resource utilization if the attack is heavy to execute.
-

{exploitfarm-1.2.2 → exploitfarm-1.2.4}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 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 = "1.2.2"
+VERSION = "1.2.4"
 
 setuptools.setup(
     name="exploitfarm",