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

Island: Use AWSService in RemoteRun resource

This commit is contained in:
Mike Salvatore 2022-05-09 15:52:01 -04:00
parent 144506c32d
commit 528ca76c32
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
monkey/monkey_island/cc/resources/remote_run.py
View File

@ -5,8 +5,7 @@ from botocore.exceptions import ClientError, NoCredentialsError
from flask import jsonify, make_response, request from flask import jsonify, make_response, request
from monkey_island.cc.resources.auth.auth import jwt_required from monkey_island.cc.resources.auth.auth import jwt_required
from monkey_island.cc.services import aws_service from monkey_island.cc.services import AWSService
from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
CLIENT_ERROR_FORMAT = ( CLIENT_ERROR_FORMAT = (
"ClientError, error message: '{}'. Probably, the IAM role that has been associated with the " "ClientError, error message: '{}'. Probably, the IAM role that has been associated with the "
@ -19,20 +18,24 @@ NO_CREDS_ERROR_FORMAT = (
class RemoteRun(flask_restful.Resource): class RemoteRun(flask_restful.Resource):
def __init__(self, aws_service: AWSService):
self._aws_service = aws_service
def run_aws_monkeys(self, request_body): def run_aws_monkeys(self, request_body):
instances = request_body.get("instances") instances = request_body.get("instances")
island_ip = request_body.get("island_ip") island_ip = request_body.get("island_ip")
return RemoteRunAwsService.run_aws_monkeys(instances, island_ip)
return self._aws_service.run_agents_on_managed_instances(instances, island_ip)
@jwt_required @jwt_required
def get(self): def get(self):
action = request.args.get("action") action = request.args.get("action")
if action == "list_aws": if action == "list_aws":
is_aws = aws_service.is_on_aws() is_aws = self._aws_service.island_is_running_on_aws()
resp = {"is_aws": is_aws} resp = {"is_aws": is_aws}
if is_aws: if is_aws:
try: try:
resp["instances"] = aws_service.get_instances() resp["instances"] = self._aws_service.get_managed_instances()
except NoCredentialsError as e: except NoCredentialsError as e:
resp["error"] = NO_CREDS_ERROR_FORMAT.format(e) resp["error"] = NO_CREDS_ERROR_FORMAT.format(e)
return jsonify(resp) return jsonify(resp)