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

* a small fixup

This commit is contained in:
maor.rayzin 2018-11-26 15:04:25 +02:00
parent 4cc85448d7
commit 984a64561e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/resources/telemetry.py
View File

@ -192,7 +192,7 @@ class Telemetry(flask_restful.Resource):
wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets) wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets)
wmi_handler.process_and_handle_wmi_info() wmi_handler.process_and_handle_wmi_info()
if 'aws' in telemetry_json['data']: if 'aws' in telemetry_json['data']:
mongo.db.monkey.insert({'aws_instance_id': telemetry_json['data']['instance-id']}) mongo.db.monkey.update_one({'_id': monkey_id}, {'aws_instance_id': telemetry_json['data']['instance-id']})
@staticmethod @staticmethod
def add_ip_to_ssh_keys(ip, ssh_info): def add_ip_to_ssh_keys(ip, ssh_info):

6
monkey/monkey_island/cc/services/config.py
View File

@ -645,10 +645,10 @@ SCHEMA = {
'type': 'object', 'type': 'object',
'description': 'These credentials will be used in order to export the monkey\'s findings to the AWS Security Hub.', 'description': 'These credentials will be used in order to export the monkey\'s findings to the AWS Security Hub.',
'properties': { 'properties': {
'iam_role_id': { 'aws_account_id': {
'title': 'IAM role ID', 'title': 'AWS account ID',
'type': 'string', 'type': 'string',
'description': '' 'description': 'Your AWS account ID that is subscribed to security hub feeds'
}, },
'aws_access_key_id': { 'aws_access_key_id': {
'title': 'AWS access key ID', 'title': 'AWS access key ID',

4
monkey/monkey_island/cc/services/report.py
View File

@ -553,7 +553,7 @@ class ReportService:
@staticmethod @staticmethod
def get_machine_aws_instance_id(hostname): def get_machine_aws_instance_id(hostname):
return str(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1})) return str(list(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1}))[0]['aws_instance_id'])
@staticmethod @staticmethod
def get_issues(): def get_issues():
@ -754,7 +754,7 @@ class ReportService:
def get_active_exporters(): def get_active_exporters():
# This function should be in another module in charge of building a list of active exporters # This function should be in another module in charge of building a list of active exporters
exporters_list = [] exporters_list = []
if load_env_from_file() == AWS: if str(load_env_from_file()) == 'standard':
exporters_list.append(AWSExporter) exporters_list.append(AWSExporter)
return exporters_list return exporters_list