Merge remote-tracking branch 'upstream/develop' into attack_file_copy

# Conflicts:
#	monkey/common/utils/attack_utils.py
#	monkey/infection_monkey/dropper.py
#	monkey/infection_monkey/system_info/mimikatz_collector.py
#	monkey/infection_monkey/system_singleton.py
#	monkey/infection_monkey/telemetry/attack/t1106_telem.py

monkey/common/utils/attack_utils.py

@@ -15,6 +15,9 @@ class UsageEnum(Enum):
            ScanStatus.SCANNED.value: "SMB exploiter failed to run the monkey by creating a service via MS-SCMR."}
     MIMIKATZ = {ScanStatus.USED.value: "Windows module loader was used to load Mimikatz DLL.",
                 ScanStatus.SCANNED.value: "Monkey tried to load Mimikatz DLL, but failed."}
+    MIMIKATZ_WINAPI = {ScanStatus.USED.value: "WinAPI was called to load mimikatz.",
+                       ScanStatus.SCANNED.value: "Monkey tried to call WinAPI to load mimikatz."}
+    DROPPER = {ScanStatus.USED.value: "WinAPI was used to mark monkey files for deletion on next boot."}
     MIMIKATZ_FILE_COPY = {ScanStatus.USED.value: "WinAPI was called to load mimikatz.",
                           ScanStatus.SCANNED.value: "Monkey tried to call WinAPI to load mimikatz, but failed."}
     SINGLETON_FILE_COPY = {ScanStatus.USED.value: "WinAPI was called to acquire system singleton for monkey's process.",

monkey/infection_monkey/control.py

@@ -125,6 +125,7 @@ class ControlClient(object):
     @staticmethod
     def send_telemetry(telem_category, data):
         if not WormConfiguration.current_server:
+            LOG.error("Trying to send %s telemetry before current server is established, aborting." % telem_category)
             return
         try:
             telemetry = {'monkey_guid': GUID, 'telem_category': telem_category, 'data': data}

monkey/infection_monkey/telemetry/attack/t1106_telem.py

@@ -4,8 +4,8 @@ from infection_monkey.telemetry.attack.usage_telem import UsageTelem
 class T1106Telem(UsageTelem):
     def __init__(self, status, usage):
         """
-        T1129 telemetry.
+        T1106 telemetry.
         :param status: ScanStatus of technique
-        :param usage: UsageEnum type value
+        :param usage: Enum name of UsageEnum
         """
         super(T1106Telem, self).__init__("T1106", status, usage)

monkey/monkey_island/cc/services/attack/technique_reports/T1035.py

@@ -13,7 +13,5 @@ class T1035(UsageTechnique):
     @staticmethod
     def get_report_data():
         data = T1035.get_tech_base_data()
-        services = list(mongo.db.telemetry.aggregate(T1035.get_usage_query()))
+        data.update({'services': T1035.get_usage_data()})
-        services = list(map(T1035.parse_usages, services))
-        data.update({'services': services})
         return data

monkey/monkey_island/cc/services/attack/technique_reports/T1106.py

@@ -1,10 +1,9 @@
-from monkey_island.cc.database import mongo
+from monkey_island.cc.services.attack.technique_reports import UsageTechnique
-from monkey_island.cc.services.attack.technique_reports import AttackTechnique
 
 __author__ = "VakarisZ"
 
 
-class T1106(AttackTechnique):
+class T1106(UsageTechnique):
     tech_id = "T1106"
     unscanned_msg = "Monkey didn't try to directly use WinAPI."
     scanned_msg = "Monkey tried to use WinAPI, but failed."
@@ -13,5 +12,5 @@ class T1106(AttackTechnique):
     @staticmethod
     def get_report_data():
         data = T1106.get_tech_base_data()
-        data.update({'api_uses': list(mongo.db.telemetry.aggregate(T1106.get_usage_query()))})
+        data.update({'api_uses': T1106.get_usage_data()})
         return data

monkey/monkey_island/cc/services/attack/technique_reports/T1129.py

@@ -13,7 +13,5 @@ class T1129(UsageTechnique):
     @staticmethod
     def get_report_data():
         data = T1129.get_tech_base_data()
-        dlls = list(mongo.db.telemetry.aggregate(T1129.get_usage_query()))
+        data.update({'dlls': T1129.get_usage_data()})
-        dlls = list(map(T1129.parse_usages, dlls))
-        data.update({'dlls': dlls})
         return data

monkey/monkey_island/cc/services/attack/technique_reports/__init__.py

@@ -134,6 +134,11 @@ class UsageTechnique(AttackTechnique):
                          "Check if usage enum field exists and covers all telem. statuses.")
         return usage
 
+    @classmethod
+    def get_usage_data(cls):
+        data = list(mongo.db.telemetry.aggregate(cls.get_usage_query()))
+        return list(map(cls.parse_usages, data))
+
     @classmethod
     def get_usage_query(cls):
         """