Add Audit support in CLI

Author: rosehgal

DockerENT/controller.py

@@ -28,13 +28,19 @@ def main(docker_containers,
 
     process_pool = pool.Pool(process_count)
     output_q = multiprocessing.Manager().Queue()
+    audit_q = None
+
+    if audit:
+        audit_q = multiprocessing.Manager().Queue()
 
     if docker_containers is not None:
         scanner_workers.docker_scan_worker(
             containers=docker_containers,
             plugins=docker_plugins,
             process_pool=process_pool,
-            output_queue=output_q
+            output_queue=output_q,
+            audit=audit,
+            audit_queue=audit_q
         )
 
     if docker_nws is not None:
@@ -51,3 +57,10 @@ def main(docker_containers,
     output_worker.output_handler(
         queue=output_q,
         target=output)
+
+    if audit:
+        output_worker.output_handler(
+            queue=audit_q,
+            target=output,
+            filename='audit.json'
+        )

DockerENT/output_worker.py

@@ -5,7 +5,7 @@
 _log = logging.getLogger(__name__)
 
 
-def output_handler(queue, target):
+def output_handler(queue, target, filename='out.json'):
     """Worker function passes the queue to target.
 
     :param queue: This queue holds the output from each plugin executed.
@@ -17,4 +17,4 @@ def output_handler(queue, target):
     :return: None
     """
     output_plugin = importlib.import_module('DockerENT.output_plugins.'+target)
-    output_plugin.write(queue)
+    output_plugin.write(queue, filename)

DockerENT/scanner_workers.py

@@ -58,7 +58,8 @@ def executor(target,
     module.scan(target, output_queue, audit, audit_queue)
 
 
-def docker_scan_worker(containers, plugins, process_pool, output_queue):
+def docker_scan_worker(containers, plugins, process_pool, output_queue,
+                       audit, audit_queue):
     """Docker scan worker.
 
     :param containers: Containers to scan.
@@ -98,7 +99,8 @@ def docker_scan_worker(containers, plugins, process_pool, output_queue):
     executor_args = []
     for container in containers:
         for plugin in plugins:
-            executor_args.append((container.id, plugin, output_queue, True,))
+            executor_args.append(
+                (container.id, plugin, output_queue, True, audit, audit_queue))
 
     _log.debug(executor_args)