Fix Docker process plugin; Fix Network plugin

Author: rosehgal

DockerENT/__init__.py

@@ -1,3 +1,3 @@
 """DockerENT - Runtime Docker scanning framework."""
 
-__version__ = '0.1.12'
+__version__ = '0.1.14'

DockerENT/__main__.py

@@ -4,14 +4,16 @@
 """
 from DockerENT import config_parser
 from DockerENT import controller
-import DockerENT
+from rich import print as rich_print
+
 
 import argparse
 import logging.config
 import os
 import signal
 import subprocess
 import sys
+import DockerENT
 
 
 def start():
@@ -115,21 +117,21 @@ def start():
 
     def sigterm_handler(_signo, _stack_frame):
         """Signal handler."""
-        _log.info("Thanks for using DockerENT")
+        rich_print("[bold green]Thanks for using DockerENT[/bold green]")
         sys.exit(0)
 
     signal.signal(signal.SIGINT, sigterm_handler)
 
     # Start DockerENT
     # If webapp, start Streamlit else cli application.
     if webapp:
-        _log.info('Starting web application ...')
+        rich_print('[bold green]Starting web application ...[/bold green]')
 
         web_app_file_name = os.path.dirname(DockerENT.__file__) + '/web_app.py'
         web_app_cmd = "streamlit run " + web_app_file_name
 
         with subprocess.Popen(web_app_cmd.split(" ")) as web_process:
-            _log.info(web_process.stdout.read())
+            rich_print(web_process.stdout.read())
 
     else:
         controller.main(docker_containers=docker_containers,

DockerENT/docker_plugins/docker_process_info.py

@@ -32,8 +32,8 @@ def scan(container, output_queue, audit=False, audit_queue=None):
     _log.info('Staring {} Plugin ...'.format(_plugin_name_))
 
     api_client = docker.APIClient()
-    container_obj = api_client.containers(container.short_id)
-    top_result = api_client.top(container_obj[0])
+
+    top_result = api_client.top(container.short_id)
 
     running_processes = {
         "Running_Processes": {
@@ -44,9 +44,8 @@ def scan(container, output_queue, audit=False, audit_queue=None):
     }
 
     for option in running_processes.keys():
-        top_result['Processes'].insert(0, top_result['Titles'])
         for result in top_result['Processes']:
-            running_processes[option]['results'].append(result)
+            running_processes[option]['results'].append(" ".join(result))
 
     res[container.short_id] = {
         _plugin_name_: running_processes

DockerENT/web_app.py

@@ -1,7 +1,4 @@
 """Web App for DockerENT."""
-from DockerENT import scanner_workers
-from DockerENT.utils import utils
-
 import base64
 import docker
 import DockerENT
@@ -10,6 +7,10 @@
 import pkgutil
 import streamlit as ui
 
+import DockerENT
+import DockerENT.scanner_workers
+import DockerENT.utils
+
 ui_sidebar = ui.sidebar
 
 
@@ -216,6 +217,7 @@ def docker_scan_executor(self,
                              plugin,
                              output_queue,
                              audit_queue):
+
         scanner_workers.executor(
             target=target,
             plugin=plugin,
@@ -287,6 +289,7 @@ def scan_dockers():
     with ui.spinner('**Scanning** dockers ..'):
         for i in AutoUpdateProgressBar(range(len(target_plugin)),
                                        docker_scan_progress_bar):
+
             executor.docker_scan_executor(
                 target=target_plugin[i][0].short_id,
                 plugin=target_plugin[i][1],

requirements.txt

@@ -21,4 +21,5 @@ six==1.15.0
 snowballstemmer==2.0.0
 typing-extensions==3.7.4.2
 urllib3==1.25.9
-websocket-client==0.57.0
+websocket-client==0.57.0
+DockerENT