Merge pull request #193 from thorinaboenke/feature_log_actual_sleep_duration

calculate sleep time in computed field

Author: thorinaboenke

src/attackmate/executors/common/sleepexecutor.py

@@ -1,8 +1,6 @@
 import time
-from random import randint
 from attackmate.executors.baseexecutor import BaseExecutor
 from attackmate.result import Result
-from attackmate.executors.features.cmdvars import CmdVars
 from attackmate.variablestore import VariableStore
 from attackmate.processmanager import ProcessManager
 from attackmate.executors.executor_factory import executor_factory
@@ -12,20 +10,10 @@
 class SleepExecutor(BaseExecutor):
     def __init__(self, pm: ProcessManager, cmdconfig=None, *, varstore: VariableStore):
         super().__init__(pm, varstore, cmdconfig)
-        self.sleep_time = None
-
-    def set_sleeptime(self, command):
-        self.sleep_time = CmdVars.variable_to_int('seconds', command.seconds)
-        if command.random:
-            self.sleep_time = randint(
-                CmdVars.variable_to_int('min_sec', command.min_sec),  # nosec
-                CmdVars.variable_to_int('seconds', command.seconds),
-            )  # nosec
 
     def log_command(self, command):
-        self.set_sleeptime(command)
-        self.logger.info(f'Sleeping {self.sleep_time} seconds')
+        self.logger.info(f'Sleeping {command.sleep_time} seconds')
 
     def _exec_cmd(self, command):
-        time.sleep(self.sleep_time)
+        time.sleep(command.sleep_time)
         return Result('Awake O_O', 0)

src/attackmate/schemas/sleep.py

@@ -1,4 +1,7 @@
 from typing import Literal
+from pydantic import computed_field
+from functools import cached_property
+from random import randint
 from attackmate.schemas.base import BaseCommand, StringNumber
 from attackmate.command import CommandRegistry
 
@@ -10,3 +13,11 @@ class SleepCommand(BaseCommand):
     seconds: StringNumber = '1'
     random: bool = False
     cmd: str = 'sleep'
+
+    @computed_field  # type: ignore[misc]
+    @cached_property
+    # calculates the actual sleep time based on whether random is enabled
+    def sleep_time(self) -> int:
+        if not self.random:
+            return int(self.seconds)
+        return randint(int(self.min_sec), int(self.seconds))