p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Improved exploiter descriptors and usage of them in report.py

This commit is contained in:
VakarisZ 2021-04-06 11:35:41 +03:00
parent 6685b24da4
commit 0b34d30fd6
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py
View File

@ -36,14 +36,7 @@ class ExploiterDescriptorEnum(Enum):
ZEROLOGON = ExploiterDescriptor('ZerologonExploiter', 'Zerologon Exploiter', ZerologonExploitProcessor)
@staticmethod
def __dict__() -> Dict[str, ExploiterDescriptor]:
descriptor_dict = {}
for descriptor in ExploiterDescriptorEnum:
descriptor_dict[descriptor.value.class_name] = descriptor
return descriptor_dict
@staticmethod
def get_display_name_by_class_name(class_name: str) -> str:
return [descriptor.display_name.value
def get_by_class_name(class_name: str) -> ExploiterDescriptor:
return [descriptor.value
for descriptor in ExploiterDescriptorEnum
if descriptor.class_name.value == class_name][0]
if descriptor.value.class_name == class_name][0]

9
monkey/monkey_island/cc/services/reporting/report.py
View File

@ -32,7 +32,6 @@ logger = logging.getLogger(__name__)
class ReportService:
exploiter_descriptors = ExploiterDescriptorEnum.__dict__
class DerivedIssueEnum:
WEAK_PASSWORD = "weak_password"
@ -145,7 +144,7 @@ class ReportService:
@staticmethod
def get_exploits_used_on_node(node: dict) -> List[str]:
return list(set([ExploiterDescriptorEnum.get_display_name_by_class_name(exploit['exploiter'])
return list(set([ExploiterDescriptorEnum.get_by_class_name(exploit['exploiter']).display_name
for exploit in node['exploits']
if exploit['result']]))
@ -253,9 +252,9 @@ class ReportService:
@staticmethod
def process_exploit(exploit) -> ExploiterReportInfo:
exploiter_type = exploit['data']['exploiter']
exploiter_descriptor = ReportService.exploiter_descriptors[exploiter_type].value
exploiter_descriptor = ExploiterDescriptorEnum.get_by_class_name(exploiter_type)
processor = exploiter_descriptor.processor()
exploiter_info = processor.get_exploit_info_by_dict(exploiter_descriptor.class_name, exploit)
exploiter_info = processor.get_exploit_info_by_dict(exploiter_type, exploit)
return exploiter_info
@staticmethod
@ -485,7 +484,7 @@ class ReportService:
if exploits == default_exploits:
return ['default']
return [ExploiterDescriptorEnum.get_display_name_by_class_name(exploit)
return [ExploiterDescriptorEnum.get_by_class_name(exploit).display_name
for exploit in exploits]
@staticmethod