Merge pull request #188 from thorinaboenke/feature_186_webserver_keeps_serving

add keep_serving option to webserv command

Author: whotwagner

docs/source/playbook/commands/webserv.rst

@@ -3,8 +3,8 @@ webserv
 =======
 
 Start a http-server and share a file. This command
-will return after the first HTTP-request.
-
+will return after the first HTTP-request. To keep serving the file instead set keep_serving to True.
+The webserv command has to be run in background mode, otherwise the playbook execution will halt until a request is received.
 .. code-block:: yaml
 
    ###
@@ -35,3 +35,10 @@ will return after the first HTTP-request.
 
    :type: str
    :default: ``0.0.0.0``
+
+.. confval:: keep_servng
+
+   Keep serving even after a request has been processed
+
+   :type: bool
+   :default: False

src/attackmate/executors/http/webservexecutor.py

@@ -61,7 +61,14 @@ def _exec_cmd(self, command: WebServCommand) -> Result:
         address = (command.address, CmdVars.variable_to_int('Port', command.port))
         try:
             server = WebServe(address, WebRequestHandler, local_path=command.local_path)
-            server.handle_request()
+            if command.keep_serving:
+                self.logger.info('Keeping server alive to serve multiple requests')
+                try:
+                    server.serve_forever()
+                except KeyboardInterrupt:
+                    server.server_close()
+            else:
+                server.handle_request()
         except Exception as e:
             raise ExecException(e)
 

src/attackmate/schemas/http.py

@@ -10,6 +10,7 @@ class WebServCommand(BaseCommand):
     local_path: str
     port: StringNumber = '8000'
     address: str = '0.0.0.0'  # nosec
+    keep_serving: bool = False
 
 
 @CommandRegistry.register('http-client')

test/units/test_browserexecutor.py

@@ -176,7 +176,7 @@ def test_browser_executor_named_session(browser_executor):
     reuse_cmd = BrowserCommand(
         type='browser',
         cmd='click',
-        selector='a[href="https://www.iana.org/domains/example"]',
+        selector='a[href="http://www.iana.org/domains/example"]',
         session='my_session'
     )
     result2 = browser_executor._exec_cmd(reuse_cmd)