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

rename existing cross_segment_issue to island_cross_segment_issue

This commit is contained in:
Itay Mizeretz 2018-02-27 14:05:23 +02:00
parent cacb60b132
commit aae2a3a8de
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ class ReportService:
CONFICKER = 5 CONFICKER = 5
class WARNINGS_DICT(Enum): class WARNINGS_DICT(Enum):
CROSS_SEGMENT = 0 ISLAND_CROSS_SEGMENT = 0
TUNNEL = 1 TUNNEL = 1
@staticmethod @staticmethod
@ -253,7 +253,7 @@ class ReportService:
] ]
@staticmethod @staticmethod
def get_cross_segment_issues(): def get_island_cross_segment_issues():
issues = [] issues = []
island_ips = local_ip_addresses() island_ips = local_ip_addresses()
for monkey in mongo.db.monkey.find({'tunnel': {'$exists': False}}, {'tunnel': 1, 'guid': 1, 'hostname': 1}): for monkey in mongo.db.monkey.find({'tunnel': {'$exists': False}}, {'tunnel': 1, 'guid': 1, 'hostname': 1}):
@ -268,7 +268,7 @@ class ReportService:
break break
if not found_good_ip: if not found_good_ip:
issues.append( issues.append(
{'type': 'cross_segment', 'machine': monkey['hostname'], {'type': 'island_cross_segment', 'machine': monkey['hostname'],
'networks': [str(subnet) for subnet in monkey_subnets], 'networks': [str(subnet) for subnet in monkey_subnets],
'server_networks': [str(subnet) for subnet in get_subnets()]} 'server_networks': [str(subnet) for subnet in get_subnets()]}
) )
@ -277,7 +277,8 @@ class ReportService:
@staticmethod @staticmethod
def get_issues(): def get_issues():
issues = ReportService.get_exploits() + ReportService.get_tunnels() + ReportService.get_cross_segment_issues() issues = ReportService.get_exploits() + ReportService.get_tunnels() \
+ ReportService.get_island_cross_segment_issues()
issues_dict = {} issues_dict = {}
for issue in issues: for issue in issues:
machine = issue['machine'] machine = issue['machine']
@ -349,8 +350,8 @@ class ReportService:
for machine in issues: for machine in issues:
for issue in issues[machine]: for issue in issues[machine]:
if issue['type'] == 'cross_segment': if issue['type'] == 'island_cross_segment':
warnings_byte_array[ReportService.WARNINGS_DICT.CROSS_SEGMENT.value] = True warnings_byte_array[ReportService.WARNINGS_DICT.ISLAND_CROSS_SEGMENT.value] = True
elif issue['type'] == 'tunnel': elif issue['type'] == 'tunnel':
warnings_byte_array[ReportService.WARNINGS_DICT.TUNNEL.value] = True warnings_byte_array[ReportService.WARNINGS_DICT.TUNNEL.value] = True

6
monkey_island/cc/ui/src/components/pages/ReportPage.js
View File

@ -26,7 +26,7 @@ class ReportPageComponent extends AuthComponent {
Warning = Warning =
{ {
CROSS_SEGMENT: 0, ISLAND_CROSS_SEGMENT: 0,
TUNNEL: 1 TUNNEL: 1
}; };
@ -333,7 +333,7 @@ class ReportPageComponent extends AuthComponent {
<div> <div>
The Monkey uncovered the following possible set of issues: The Monkey uncovered the following possible set of issues:
<ul> <ul>
{this.state.report.overview.warnings[this.Warning.CROSS_SEGMENT] ? {this.state.report.overview.warnings[this.Warning.ISLAND_CROSS_SEGMENT] ?
<li>Weak segmentation - Machines from different segments are able to <li>Weak segmentation - Machines from different segments are able to
communicate.</li> : null} communicate.</li> : null}
{this.state.report.overview.warnings[this.Warning.TUNNEL] ? {this.state.report.overview.warnings[this.Warning.TUNNEL] ?
@ -664,7 +664,7 @@ class ReportPageComponent extends AuthComponent {
case 'conficker': case 'conficker':
data = this.generateConfickerIssue(issue); data = this.generateConfickerIssue(issue);
break; break;
case 'cross_segment': case 'island_cross_segment':
data = this.generateCrossSegmentIssue(issue); data = this.generateCrossSegmentIssue(issue);
break; break;
case 'tunnel': case 'tunnel':