Extended exploiter report info class to have all possible values that exploit processors could add

monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_report_info.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass
+from enum import Enum
+from typing import Union, List
+
+
+class CredentialType(Enum):
+    PASSWORD = 'password'
+    HASH = 'hash'
+    KEY = 'key'
+
+
+@dataclass
+class ExploiterReportInfo:
+    machine: str
+    ip_address: str
+    type: str
+    username: Union[str, None] = None
+    credential_type: Union[CredentialType, None] = None
+    ssh_key: Union[str, None] = None
+    password: Union[str, None] = None
+    port: Union[str, None] = None
+    paths: Union[List[str], None] = None
+    password_restored: Union[bool, None] = None

monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/processors/cred_exploit.py

@@ -1,15 +1,8 @@
 from __future__ import annotations
 
-from enum import Enum
+from monkey_island.cc.services.reporting.issue_processing.exploit_processing.exploiter_report_info import \
-
+    ExploiterReportInfo, CredentialType
-from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.exploit import \
+from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.exploit import ExploitProcessor
-    ExploiterReportInfo, ExploitProcessor
-
-
-class CredentialType(Enum):
-    PASSWORD = 'password'
-    HASH = 'hash'
-    KEY = 'key'
 
 
 class CredExploitProcessor:

monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/processors/exploit.py

@@ -1,15 +1,8 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from monkey_island.cc.services.node import NodeService
-
+from monkey_island.cc.services.reporting.issue_processing.exploit_processing.exploiter_report_info import \
-
+    ExploiterReportInfo
-@dataclass
-class ExploiterReportInfo:
-    machine: str
-    ip_address: str
-    type: str
 
 
 class ExploitProcessor: