Add service patch and fix other bugs

src/primaite/simulator/file_system/folder.py

@@ -102,6 +102,11 @@ class Folder(FileSystemItemABC):
             name="delete",
             request_type=RequestType(func=lambda request, context: self.remove_file_by_id(file_uuid=request[0])),
         )
+        self._file_request_manager = RequestManager()
+        rm.add_request(
+            name="file",
+            request_type=RequestType(func=lambda request, context: self._file_request_manager),
+        )
         return rm
 
     def describe_state(self) -> Dict:
@@ -254,6 +259,7 @@ class Folder(FileSystemItemABC):
         # add to list
         self.files[file.uuid] = file
         self._files_by_name[file.name] = file
+        self._file_request_manager.add_request(file.uuid, RequestType(func=file._request_manager))
         file.folder = self
 
     def remove_file(self, file: Optional[File]):
@@ -273,6 +279,7 @@ class Folder(FileSystemItemABC):
             self.deleted_files[file.uuid] = file
             file.delete()
             self.sys_log.info(f"Removed file {file.name} (id: {file.uuid})")
+            self._file_request_manager.remove_request(file.uuid)
         else:
             _LOGGER.debug(f"File with UUID {file.uuid} was not found.")
 

src/primaite/simulator/sim_container.py

@@ -55,3 +55,9 @@ class Simulation(SimComponent):
             }
         )
         return state
+
+    def apply_timestep(self, timestep: int) -> None:
+        """Apply a timestep to the simulation."""
+        super().apply_timestep(timestep)
+        self.network.apply_timestep(timestep)
+        # self.domain.apply_timestep(timestep)

src/primaite/simulator/system/software.py

@@ -89,6 +89,10 @@ class Software(SimComponent):
     "The FileSystem of the Node the Software is installed on."
     folder: Optional[Folder] = None
     "The folder on the file system the Software uses."
+    patching_duration: int = 2
+    "The number of ticks it takes to patch the software."
+    _patching_countdown: Optional[int] = None
+    "Current number of ticks left to patch the software."
 
     def set_original_state(self):
         """Sets the original state."""
@@ -111,6 +115,12 @@ class Software(SimComponent):
                 func=lambda request, context: self.set_health_state(SoftwareHealthState.COMPROMISED),
             ),
         )
+        rm.add_request(
+            "patch",
+            RequestType(
+                func=lambda request, context: self.patch(),
+            ),
+        )
         rm.add_request("scan", RequestType(func=lambda request, context: self.scan()))
         return rm
 
@@ -181,10 +191,33 @@ class Software(SimComponent):
         """Update the observed health status to match the actual health status."""
         self.health_state_visible = self.health_state_actual
 
+    def patch(self) -> None:
+        """Perform a patch on the software."""
+        self._patching_countdown = self.patching_duration
+        self.set_health_state(SoftwareHealthState.PATCHING)
+
+    def _update_patch_status(self) -> None:
+        """Update the patch status of the software."""
+        self._patching_countdown -= 1
+        if self._patching_countdown <= 0:
+            self.set_health_state(SoftwareHealthState.GOOD)
+            self._patching_countdown = None
+            self.patching_count += 1
+
     def reveal_to_red(self) -> None:
         """Reveals the software to the red agent."""
         self.revealed_to_red = True
 
+    def apply_timestep(self, timestep: int) -> None:
+        """
+        Apply a single timestep to the software.
+
+        :param timestep: The current timestep of the simulation.
+        """
+        super().apply_timestep(timestep)
+        if self.health_state_actual == SoftwareHealthState.PATCHING:
+            self._update_patch_status()
+
 
 class IOSoftware(Software):
     """