exploitfarm 2.0.0__tar.gz → 2.1.0__tar.gz

{exploitfarm-2.0.0 → exploitfarm-2.1.0}/PKG-INFO

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

{exploitfarm-2.0.0 → exploitfarm-2.1.0}/exploitfarm/__init__.py

@@ -1,5 +1,5 @@
 def _get_version():
-    v = "2.0.0" if "{" not in "2.0.0" else "0.0.0"
+    v = "2.1.0" if "{" not in "2.1.0" else "0.0.0"
     if v == "0.0.0":
         import os
         env_v = os.getenv("EXPLOITFARM_VERSION")

{exploitfarm-2.0.0 → exploitfarm-2.1.0}/exploitfarm/tui/startxploit.py

@@ -170,7 +170,7 @@ class XploitRun(App[int]):
             width: 100%;
         }
         #status_text{
-            height: 4;
+            height: auto;
         }
         .num_box{
             margin: 0 8;
@@ -369,9 +369,11 @@ class XploitRun(App[int]):
                 [self.table.update_cell(row_key=team_key, column_key=self.column_keys[i], value=cols[i]) for i in range(len(self.column_keys))]
             except CellDoesNotExist:
                 self.table.add_row(*cols, height=3, key=team_key)
-        for key in self.table.rows.keys():
-            if key.value not in used_keys:
-                self.table.remove_row(row_key=key.value)
+        # Collect stale keys before removing them -- removing while iterating
+        # `self.table.rows.keys()` mutates that same dict mid-iteration.
+        stale_keys = [key.value for key in self.table.rows.keys() if key.value not in used_keys]
+        for key in stale_keys:
+            self.table.remove_row(row_key=key)
     
     def update_info_content(self):
         if g.exec.group is None:
@@ -396,22 +398,35 @@ class XploitRun(App[int]):
         queued_attacks.update(f"{g.exec.info.submitter_flags_in_queue}")
         
     
+    def _init_table(self):
+        self.table = self.query_one(DataTable)
+        self.table.clear()
+        self.column_keys = self.table.add_columns(*[Text(text="\n\n"+ele, justify="center") for ele in self.COLUMNS])
+
+    def _refresh_tick(self):
+        self.update_header_info()
+        self.update_table_content()
+        if g.exec.group:
+            self.update_info_content()
+
     def update_data(self):
+        # This whole method runs in a worker thread (see on_ready below), but every one of
+        # these calls mutates live Textual widgets (DataTable rows/cells, Label content, ...).
+        # Textual's compositor renders on the app's event-loop thread, and widget mutation
+        # triggers a refresh/cache-clear as a side effect -- doing that concurrently with a
+        # render in progress races the compositor's styles cache (observed as a spurious
+        # KeyError deep in _styles_cache.py). call_from_thread marshals each mutation onto the
+        # app thread so it can never overlap a render pass.
         try:
-            self.table = self.query_one(DataTable)
-            self.table.rows.clear()
-            self.column_keys = self.table.add_columns(*[Text(text="\n\n"+ele, justify="center") for ele in self.COLUMNS])
+            self.call_from_thread(self._init_table)
             while True:
                 #Wait for configurations
                 if g.exec.config.status is None:
                     if g.exec.exit_event.wait(timeout=0.3):
                         return
                     continue
-                
-                self.update_header_info()
-                self.update_table_content()
-                if g.exec.group:
-                    self.update_info_content()
+
+                self.call_from_thread(self._refresh_tick)
 
                 if g.exec.exit_event.wait(timeout=0.3):
                     return
@@ -420,12 +435,14 @@ class XploitRun(App[int]):
             g.exec.print_queue.put(traceback.format_exc())
     
     def update_log(self):
+        # Same reasoning as update_data: this runs in a worker thread, but Log.write() mutates
+        # a live widget, so it has to be marshaled onto the app thread too.
         logger = self.query_one("#log", Log)
         while True:
             if g.exec.exit_event.is_set():
                 return
             log = g.exec.print_queue.get()
-            logger.write(str(log ), scroll_end=False)
+            self.call_from_thread(logger.write, str(log), scroll_end=False)
     
     def exit_listener(self):
         if g.exec.exit_event.wait():

{exploitfarm-2.0.0 → exploitfarm-2.1.0}/exploitfarm.egg-info/PKG-INFO

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

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