From 4af4178344d64031c47506630d02af7fa5d7898b Mon Sep 17 00:00:00 2001
From: Daniel Goldberg <danielg@guardicore.com>
Date: Sun, 31 Dec 2017 13:46:07 +0200
Subject: [PATCH] Add logging, turn mimikatz into modern class.

---
 chaos_monkey/system_info/__init__.py               | 12 +++++++++---
 chaos_monkey/system_info/linux_info_collector.py   | 10 ++++++++++
 chaos_monkey/system_info/mimikatz_collector.py     |  7 ++++---
 chaos_monkey/system_info/windows_info_collector.py | 14 +++++++++++++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/chaos_monkey/system_info/__init__.py b/chaos_monkey/system_info/__init__.py
index 0a5bf8e31..126854b8e 100644
--- a/chaos_monkey/system_info/__init__.py
+++ b/chaos_monkey/system_info/__init__.py
@@ -1,3 +1,4 @@
+import logging
 import socket
 import sys
 
@@ -6,6 +7,8 @@ from enum import IntEnum
 
 from network.info import get_host_subnets
 
+LOG = logging.getLogger(__name__)
+
 # Linux doesn't have WindowsError
 try:
     WindowsError
@@ -56,8 +59,9 @@ class InfoCollector(object):
     def get_hostname(self):
         """
         Adds the fully qualified computer hostname to the system information.
-        :return: Nothing
+        :return: None. Updates class information
         """
+        LOG.debug("Reading hostname")
         self.info['hostname'] = socket.getfqdn()
 
     def get_process_list(self):
@@ -65,8 +69,9 @@ class InfoCollector(object):
         Adds process information from the host to the system information.
         Currently lists process name, ID, parent ID, command line
         and the full image path of each process.
-        :return: Nothing
+        :return: None. Updates class information
         """
+        LOG.debug("Reading process list")
         processes = {}
         for process in psutil.process_iter():
             try:
@@ -95,6 +100,7 @@ class InfoCollector(object):
         Adds network information from the host to the system information.
         Currently updates with a list of networks accessible from host,
         containing host ip and the subnet range.
-        :return: None
+        :return: None. Updates class information
         """
+        LOG.debug("Reading subnets")
         self.info['network_info'] = {'networks': get_host_subnets()}
diff --git a/chaos_monkey/system_info/linux_info_collector.py b/chaos_monkey/system_info/linux_info_collector.py
index 6c7570fc0..906173421 100644
--- a/chaos_monkey/system_info/linux_info_collector.py
+++ b/chaos_monkey/system_info/linux_info_collector.py
@@ -1,7 +1,11 @@
+import logging
+
 from . import InfoCollector
 
 __author__ = 'uri'
 
+LOG = logging.getLogger(__name__)
+
 
 class LinuxInfoCollector(InfoCollector):
     """
@@ -12,6 +16,12 @@ class LinuxInfoCollector(InfoCollector):
         super(LinuxInfoCollector, self).__init__()
 
     def get_info(self):
+        """
+        Collect Linux system information
+        Hostname, process list and network subnets
+        :return: Dict of system information
+        """
+        LOG.debug("Running Linux collector")
         self.get_hostname()
         self.get_process_list()
         self.get_network_info()
diff --git a/chaos_monkey/system_info/mimikatz_collector.py b/chaos_monkey/system_info/mimikatz_collector.py
index 53f42ad4c..e69bcd73e 100644
--- a/chaos_monkey/system_info/mimikatz_collector.py
+++ b/chaos_monkey/system_info/mimikatz_collector.py
@@ -1,5 +1,5 @@
-import ctypes
 import binascii
+import ctypes
 import logging
 import socket
 
@@ -8,13 +8,14 @@ __author__ = 'itay.mizeretz'
 LOG = logging.getLogger(__name__)
 
 
-class MimikatzCollector:
+class MimikatzCollector(object):
     """
     Password collection module for Windows using Mimikatz.
     """
 
     def __init__(self):
         try:
+
             self._isInit = False
             self._config = __import__('config').WormConfiguration
             self._dll = ctypes.WinDLL(self._config.mimikatz_dll_name)
@@ -31,9 +32,9 @@ class MimikatzCollector:
         Gets the logon info from mimikatz.
         Returns a dictionary of users with their known credentials.
         """
-
         if not self._isInit:
             return {}
+        LOG.debug("Running mimikatz collector")
 
         try:
             entry_count = self._collect()
diff --git a/chaos_monkey/system_info/windows_info_collector.py b/chaos_monkey/system_info/windows_info_collector.py
index 2ba26fd34..72e189f81 100644
--- a/chaos_monkey/system_info/windows_info_collector.py
+++ b/chaos_monkey/system_info/windows_info_collector.py
@@ -1,5 +1,10 @@
-from . import InfoCollector
+import logging
+
 from mimikatz_collector import MimikatzCollector
+from . import InfoCollector
+
+LOG = logging.getLogger(__name__)
+
 __author__ = 'uri'
 
 
@@ -12,6 +17,13 @@ class WindowsInfoCollector(InfoCollector):
         super(WindowsInfoCollector, self).__init__()
 
     def get_info(self):
+        """
+        Collect Windows system information
+        Hostname, process list and network subnets
+        Tries to read credential secrets using mimikatz
+        :return: Dict of system information
+        """
+        LOG.debug("Running Windows collector")
         self.get_hostname()
         self.get_process_list()
         self.get_network_info()