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

small fixes to make everything work

This commit is contained in:
Itay Mizeretz 2018-08-21 17:17:21 +03:00
parent a18061d45d
commit 369795e375
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monkey_island/cc/services/report.py
View File

@ -488,14 +488,14 @@ class ReportService:
return cross_segment_issues return cross_segment_issues
@staticmethod @staticmethod
def get_cross_segement_issues(): def get_cross_segment_issues():
scans = mongo.db.telemetry.find({'telem_type': 'scan'}, scans = mongo.db.telemetry.find({'telem_type': 'scan'},
{'monkey_guid': 1, 'data.machine.ip_addr': 1, 'data.machine.services': 1}) {'monkey_guid': 1, 'data.machine.ip_addr': 1, 'data.machine.services': 1})
cross_segment_issues = [] cross_segment_issues = []
subnet_groups = ConfigService.get_config_value( # For now the feature is limited to 1 group.
['basic_network', 'network_analysis', 'inaccessible_subnets']) subnet_groups = [ConfigService.get_config_value(['basic_network', 'network_analysis', 'inaccessible_subnets'])]
for subnet_group in subnet_groups: for subnet_group in subnet_groups:
cross_segment_issues += ReportService.get_cross_segment_issues_per_subnet_group(scans, subnet_group) cross_segment_issues += ReportService.get_cross_segment_issues_per_subnet_group(scans, subnet_group)
@ -504,11 +504,10 @@ class ReportService:
@staticmethod @staticmethod
def get_issues(): def get_issues():
issues = ReportService.get_exploits() + ReportService.get_tunnels() +\
ISSUE_GENERATORS = [ ISSUE_GENERATORS = [
ReportService.get_exploits, ReportService.get_exploits,
ReportService.get_tunnels, ReportService.get_tunnels,
ReportService.get_cross_segment_issues, ReportService.get_island_cross_segment_issues,
ReportService.get_azure_issues ReportService.get_azure_issues
] ]
@ -622,7 +621,7 @@ class ReportService:
issues = ReportService.get_issues() issues = ReportService.get_issues()
config_users = ReportService.get_config_users() config_users = ReportService.get_config_users()
config_passwords = ReportService.get_config_passwords() config_passwords = ReportService.get_config_passwords()
cross_segment_issues = ReportService.get_cross_segement_issues() cross_segment_issues = ReportService.get_cross_segment_issues()
report = \ report = \
{ {