p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Small style fixes and improvements

This commit is contained in:
VakarisZ 2021-04-02 11:59:28 +03:00
parent 54f1d0e49c
commit 72a97e6465
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
from dataclasses import dataclass from dataclasses import dataclass
from enum import Enum from enum import Enum
from typing import Type from typing import Type, Dict
from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.cred_exploit import \ from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.cred_exploit import \
CredExploitProcessor CredExploitProcessor
@ -34,3 +34,10 @@ class ExploiterDescriptorEnum(Enum):
VSFTPD = ExploiterDescriptor('VSFTPDExploiter', 'VSFTPD Backdoor Exploiter', CredExploitProcessor) VSFTPD = ExploiterDescriptor('VSFTPDExploiter', 'VSFTPD Backdoor Exploiter', CredExploitProcessor)
DRUPAL = ExploiterDescriptor('DrupalExploiter', 'Drupal Server Exploiter', ExploitProcessor) DRUPAL = ExploiterDescriptor('DrupalExploiter', 'Drupal Server Exploiter', ExploitProcessor)
ZEROLOGON = ExploiterDescriptor('ZerologonExploiter', 'ZeroLogon Exploiter', ZerologonExploitProcessor) 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

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

@ -2,7 +2,7 @@ import functools
import ipaddress import ipaddress
import itertools import itertools
import logging import logging
from typing import Dict, List from typing import List
from bson import json_util from bson import json_util
@ -17,8 +17,7 @@ from common.config_value_paths import (EXPLOITER_CLASSES_PATH, LOCAL_NETWORK_SCA
USER_LIST_PATH) USER_LIST_PATH)
from monkey_island.cc.services.configuration.utils import get_config_network_segments_as_subnet_groups from monkey_island.cc.services.configuration.utils import get_config_network_segments_as_subnet_groups
from monkey_island.cc.services.node import NodeService from monkey_island.cc.services.node import NodeService
from monkey_island.cc.services.reporting.issue_processing.exploit_processing.exploiter_descriptor_enum import ExploiterDescriptorEnum, \ from monkey_island.cc.services.reporting.issue_processing.exploit_processing.exploiter_descriptor_enum import ExploiterDescriptorEnum
ExploiterDescriptor
from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.cred_exploit import \ from monkey_island.cc.services.reporting.issue_processing.exploit_processing.processors.cred_exploit import \
CredentialType 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 \
@ -32,15 +31,8 @@ __author__ = "itay.mizeretz"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def build_exploiter_descriptor_dict() -> Dict[str, ExploiterDescriptor]:
descriptor_dict = {}
for descriptor in ExploiterDescriptorEnum:
descriptor_dict[descriptor.value.class_name] = descriptor
return descriptor_dict
class ReportService: class ReportService:
exploiter_descriptors = build_exploiter_descriptor_dict() exploiter_descriptors = ExploiterDescriptorEnum.__dict__
class DerivedIssueEnum: class DerivedIssueEnum:
WEAK_PASSWORD = "weak_password" WEAK_PASSWORD = "weak_password"