Merge pull request #171 from thorinaboenke/feature_delay

add command_delay to config

Author: thorinaboenke

docs/source/configuration/command_config.rst

@@ -2,13 +2,15 @@
 cmd_config
 ==========
 
-Stores global variables for command options. These are settings for **all** commands.
+Stores global variables for command options.
+These are settings for **all** commands.
 
 .. code-block:: yaml
 
    ###
    cmd_config:
      loop_sleep: 5
+     command_delay: 0
 
 .. confval:: loop_sleep
 
@@ -19,3 +21,11 @@ Stores global variables for command options. These are settings for **all** comm
 
    :type: int
    :default: 5
+
+.. confval:: command_delay
+
+   This delay in seconds is applied to all commands in the playbook.
+   It is not applied to debug, setvar and sleep commands.
+
+   :type: float
+   :default: 0

docs/source/configuration/index.rst

@@ -25,6 +25,7 @@ sliver and metasploit:
    ###
    cmd_config:
      loop_sleep: 5
+     command_delay: 0
 
    msf_config:
      password: securepassword

src/attackmate/attackmate.py

@@ -8,6 +8,7 @@
 configuration.
 """
 
+import time
 from typing import Dict, Optional
 import logging
 from attackmate.result import Result
@@ -21,7 +22,6 @@
 import asyncio
 
 
-
 class AttackMate:
     def __init__(
         self,
@@ -89,10 +89,14 @@ def _get_executor(self, command_type: str) -> BaseExecutor:
         return self.executors[command_type]
 
     def _run_commands(self, commands: Commands):
+        delay = self.pyconfig.cmd_config.command_delay or 0
+        self.logger.info(f'Delay before commands: {delay} seconds')
         for command in commands:
             command_type = 'ssh' if command.type == 'sftp' else command.type
             executor = self._get_executor(command_type)
             if executor:
+                if command.type not in ('sleep', 'debug', 'setvar'):
+                    time.sleep(delay)
                 executor.run(command)
 
     def run_command(self, command: Command) -> Result:
@@ -101,28 +105,25 @@ def run_command(self, command: Command) -> Result:
         if executor:
             result = executor.run(command)
         return result if result else Result(None, None)
-    
+
     def clean_session_stores(self):
         self.logger.warning('Cleaning up session stores')
         # msf
-        if (msf_module_executor := self.executors.get("msf-module")):
+        if (msf_module_executor := self.executors.get('msf-module')):
             msf_module_executor.cleanup()
-        if (msf_session_executor := self.executors.get("msf-session")):
+        if (msf_session_executor := self.executors.get('msf-session')):
             msf_session_executor.cleanup()
         # ssh
-        if (ssh_executor := self.executors.get("ssh")):
+        if (ssh_executor := self.executors.get('ssh')):
             ssh_executor.cleanup()
         # vnc
-        if (vnc_executor := self.executors.get("vnc")):
+        if (vnc_executor := self.executors.get('vnc')):
             vnc_executor.cleanup()
         # sliver
-        if (sliver_executor := self.executors.get("sliver-session")):
+        if (sliver_executor := self.executors.get('sliver-session')):
             loop = asyncio.get_event_loop()
             loop.run_until_complete(sliver_executor.cleanup())
 
-
-
-
     def main(self):
         """The main function
 

src/attackmate/schemas/config.py

@@ -16,9 +16,10 @@ class MsfConfig(BaseModel):
 
 class CommandConfig(BaseModel):
     loop_sleep: int = 5
+    command_delay: float = 0
 
 
 class Config(BaseModel):
     sliver_config: SliverConfig = SliverConfig(config_file=None)
     msf_config: MsfConfig = MsfConfig(password=None)
-    cmd_config: CommandConfig = CommandConfig(loop_sleep=5)
+    cmd_config: CommandConfig = CommandConfig(loop_sleep=5, command_delay=0)