exploitfarm 1.6.7__tar.gz → 1.6.9__tar.gz

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/PKG-INFO

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

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/exploitfarm/__init__.py

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

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/exploitfarm/tui/config.py

@@ -86,33 +86,19 @@ class InitialConfiguration(App[int]):
             "[bold]Welcome to xFarm, please fill the following fields to configure the client",
             classes="error-box",
         )
-        yield Label("[bold]ExploitFarm Server Address:[/]", classes="input-label")
+        yield Label("[bold]ExploitFarm Server URL:[/]", classes="input-label")
         yield Input(
-            placeholder="127.0.0.1",
-            value=self.config.server.address,
+            placeholder="http://127.0.0.1:5050",
+            value=f"{'https' if self.config.server.https else 'http'}://{self.config.server.address}:{self.config.server.port}",
             validators=[Length(minimum=1)],
-            id="address",
+            id="url",
             classes="form-input",
         )
         yield Horizontal(
             Label("[bold]Errors:[/]"),
-            Pretty([], id="address_errors"),
+            Pretty([], id="url_errors"),
             classes="error-box hidden",
-            id="address_errors_box",
-        )
-        yield Label("[bold]ExploitFarm Server port:[/]", classes="input-label")
-        yield Input(
-            placeholder="5050",
-            value=str(self.config.server.port),
-            validators=[Number(minimum=1, maximum=65535)],
-            id="port",
-            classes="form-input",
-        )
-        yield Horizontal(
-            Label("[bold]Errors:[/]"),
-            Pretty([], id="port_errors"),
-            classes="error-box hidden",
-            id="port_errors_box",
+            id="url_errors_box",
         )
         yield Label("[bold]Nickname:[/]", classes="input-label")
         yield Input(
@@ -128,18 +114,7 @@ class InitialConfiguration(App[int]):
             classes="error-box hidden",
             id="nickname_errors_box",
         )
-        yield Checkbox(
-            "Use HTTPS",
-            id="https",
-            value=self.config.server.https,
-            classes="input-label",
-        )
-        yield Checkbox(
-            "Ignore connection failed",
-            id="ign_conn_failed",
-            value=self.ignore_connection_failed,
-            classes="input-label",
-        )
+
         yield Label(
             self.initial_error,
             classes=f"{'' if self.initial_error else 'hidden'}",
@@ -148,6 +123,9 @@ class InitialConfiguration(App[int]):
         yield Horizontal(
             Button("Save", id="save", variant="success"),
             Button("Cancel", id="cancel", variant="error"),
+            Button(
+                "Ignore Connection Failed", id="ignore", variant="warning", classes="float-right"
+            ),
             Button(
                 "Test Connection", id="test", variant="primary", classes="float-right"
             ),
@@ -155,6 +133,35 @@ class InitialConfiguration(App[int]):
         )
         yield Footer()
 
+    def _update_url(self) -> bool:
+        try:
+            import urllib.parse
+            url_val = self.query_one("#url", Input).value.strip()
+            if not url_val:
+                return False
+            if "://" not in url_val:
+                url_val = "http://" + url_val
+            parsed = urllib.parse.urlparse(url_val)
+            hostname = parsed.hostname
+            port = parsed.port
+            if not hostname:
+                return False
+            if port is None:
+                port = 443 if parsed.scheme == "https" else 80
+            if ":" in hostname and not hostname.startswith("["):
+                hostname = f"[{hostname}]"
+            self.config.server.address = hostname
+            self.config.server.port = port
+            self.config.server.https = parsed.scheme == "https"
+            return True
+        except Exception:
+            return False
+
+    @on(Button.Pressed, "#ignore")
+    def ignore_connection_failed_press(self):
+        self.ignore_connection_failed = True
+        self.save()
+
     def action_save(self):
         self.save()
 
@@ -176,12 +183,13 @@ class InitialConfiguration(App[int]):
                     if ele.failure_description
                 ]
             )
-        if self.config.server.address.startswith("http://"):
-            self.config.server.https = False
-            self.config.server.address = self.config.server.address[len("http://") :]
-        if self.config.server.address.startswith("https://"):
-            self.config.server.https = True
-            self.config.server.address = self.config.server.address[len("https://") :]
+
+        if not self._update_url():
+            errors.append("Invalid URL")
+            error_label = self.query_one("#url_errors", Pretty)
+            error_box = self.query_one("#url_errors_box", Horizontal)
+            error_box.remove_class("hidden")
+            error_label.update(["Invalid URL"])
 
         if len(errors) == 0 and (self.ignore_connection_failed or self.test()):
             self.config.write()
@@ -193,6 +201,12 @@ class InitialConfiguration(App[int]):
 
     @on(Button.Pressed, "#test")
     def test(self):
+        if not self._update_url():
+            error_label = self.query_one("#error", Label)
+            error_label.remove_class("hidden")
+            error_label.update("[bold red]Invalid URL[/]")
+            return False
+            
         error_label = self.query_one("#error", Label)
         error_label.remove_class("hidden")
         try:
@@ -208,37 +222,15 @@ class InitialConfiguration(App[int]):
             )
             return False
 
-    @on(Checkbox.Changed, "#https")
-    def https_change(self, event: Checkbox.Changed):
-        self.config.server.https = event.value
-
-    @on(Checkbox.Changed, "#ign_conn_failed")
-    def ignore_connection_failed_change(self, event: Checkbox.Changed):
-        self.ignore_connection_failed = event.value
-
-    @on(Input.Changed, "#address")
-    def address_check(self, event: Input.Changed) -> None:
-        # Updating the UI to show the reasons why validation failed
-        error_label = self.query_one("#address_errors", Pretty)
-        error_box = self.query_one("#address_errors_box", Horizontal)
-        if not event.validation_result.is_valid:
-            error_box.remove_class("hidden")
-            error_label.update(event.validation_result.failure_descriptions)
-        else:
-            error_box.add_class("hidden")
-            self.config.server.address = event.input.value
-
-    @on(Input.Changed, "#port")
-    def port_check(self, event: Input.Changed) -> None:
-        # Updating the UI to show the reasons why validation failed
-        error_label = self.query_one("#port_errors", Pretty)
-        error_box = self.query_one("#port_errors_box", Horizontal)
+    @on(Input.Changed, "#url")
+    def url_check(self, event: Input.Changed) -> None:
+        error_label = self.query_one("#url_errors", Pretty)
+        error_box = self.query_one("#url_errors_box", Horizontal)
         if not event.validation_result.is_valid:
             error_box.remove_class("hidden")
             error_label.update(event.validation_result.failure_descriptions)
         else:
             error_box.add_class("hidden")
-            self.config.server.port = int(event.input.value)
 
     @on(Input.Changed, "#nickname")
     def nickname_check(self, event: Input.Changed) -> None:

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/exploitfarm/xploit.py

@@ -361,7 +361,12 @@ def update_server_config(event):
 
 def post_attacks(attacks, exploit_id):
     try:
-        g.exec.config.reqs.submit_flags(attacks, exploit=exploit_id)
+        res = g.exec.config.reqs.submit_flags(attacks, exploit=exploit_id)
+        if isinstance(res, dict):
+            flags = res.get("flags", 0)
+            dups = res.get("duplicates", 0)
+            if flags > 0 or dups > 0:
+                qprint(f"Submitted {flags} flags ({dups} duplicates) to the server")
         g.attack_storage.mark_as_sent(len(attacks))
         g.exec.info.submitter_status = True
         return True
@@ -1075,11 +1080,13 @@ def xploit_one(exec_info: AttackStartConfig, team: str, timeout: float = 30):
                     break
                 for attack in attacks:
                     if len(attack["flags"]) > 0:
-                        g.exec.config.reqs.submit_flags({"flags": attack["flags"]})
+                        res = g.exec.config.reqs.submit_flags({"flags": attack["flags"]})
+                        flags = res.get("flags", 0) if isinstance(res, dict) else len(attack["flags"])
+                        dups = res.get("duplicates", 0) if isinstance(res, dict) else 0
                     g.attack_storage.mark_as_sent(1)
                     if len(attack["flags"]) > 0:
                         qprint(
-                            f"Submitted {len(attack['flags'])} flags as manual submissions."
+                            f"Submitted {flags} flags ({dups} duplicates) as manual submissions."
                         )
         except Exception:
             qprint("Can't submit flags due missing config")

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/exploitfarm.egg-info/PKG-INFO

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

{exploitfarm-1.6.7 → exploitfarm-1.6.9}/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.6.7"
+VERSION = "1.6.9"
 
 setuptools.setup(
     name="exploitfarm",