diff --git a/monkey/monkey_island/cc/resources/remote_run.py b/monkey/monkey_island/cc/resources/remote_run.py index eb21bcadd..64dcb9fbf 100644 --- a/monkey/monkey_island/cc/resources/remote_run.py +++ b/monkey/monkey_island/cc/resources/remote_run.py @@ -45,14 +45,15 @@ class RemoteRun(flask_restful.Resource): body = json.loads(request.data) resp = {} if body.get('type') == 'aws': - is_auth = RemoteRunAwsService.update_aws_auth_params() - resp['auth'] = is_auth - if is_auth: - result = self.run_aws_monkeys(body) - resp['result'] = result - else: - result = self.run_aws_monkeys(body) - resp['result'] = result + #is_auth = RemoteRunAwsService.update_aws_auth_params() + #resp['auth'] = is_auth + #if is_auth: + # result = self.run_aws_monkeys(body) + # resp['result'] = result + #else: + RemoteRunAwsService.update_aws_region_authless() + result = self.run_aws_monkeys(body) + resp['result'] = result return jsonify(resp) # default action diff --git a/monkey/monkey_island/cc/services/remote_run_aws.py b/monkey/monkey_island/cc/services/remote_run_aws.py index 7cc26008d..6d206e6e4 100644 --- a/monkey/monkey_island/cc/services/remote_run_aws.py +++ b/monkey/monkey_island/cc/services/remote_run_aws.py @@ -62,6 +62,13 @@ class RemoteRunAwsService: return RemoteRunAwsService.is_auth + @staticmethod + def update_aws_region_authless(): + """ + Updates the AWS region without auth params (via IAM role) + """ + AwsService.set_region(RemoteRunAwsService.aws_instance.region) + @staticmethod def get_bitness(instances): """