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

Island: Change method order in RemoteRun

This commit is contained in:
Mike Salvatore 2022-05-11 10:00:35 -04:00
parent ae0e8ddb8e
commit f83832dc3c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,6 @@ class RemoteRun(flask_restful.Resource):
def __init__(self, aws_service: AWSService): def __init__(self, aws_service: AWSService):
self._aws_service = aws_service self._aws_service = aws_service
def run_aws_monkeys(self, request_body) -> Sequence[AWSCommandResults]:
instances = request_body.get("instances")
island_ip = request_body.get("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")
@ -58,6 +52,12 @@ class RemoteRun(flask_restful.Resource):
# default action # default action
return make_response({"error": "Invalid action"}, 500) return make_response({"error": "Invalid action"}, 500)
def run_aws_monkeys(self, request_body) -> Sequence[AWSCommandResults]:
instances = request_body.get("instances")
island_ip = request_body.get("island_ip")
return self._aws_service.run_agents_on_managed_instances(instances, island_ip)
@staticmethod @staticmethod
def _encode_results(results: Sequence[AWSCommandResults]): def _encode_results(results: Sequence[AWSCommandResults]):
result = list(map(RemoteRun._aws_command_results_to_encodable_dict, results)) result = list(map(RemoteRun._aws_command_results_to_encodable_dict, results))