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

Island: Add custom error and sketch out AWS command results

This commit is contained in:
vakarisz 2022-05-10 16:57:36 +03:00
parent 109ea87196
commit e5285f2f78
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
monkey/monkey_island/cc/services/aws/aws_command_runner.py
View File

@ -85,6 +85,10 @@ def _run_command_async(
return command_id return command_id
class AWSCommandError(Exception):
pass
def _wait_for_command_to_complete( def _wait_for_command_to_complete(
aws_client: botocore.client.BaseClient, target_instance_id: str, command_id: str aws_client: botocore.client.BaseClient, target_instance_id: str, command_id: str
): ):
@ -94,9 +98,11 @@ def _wait_for_command_to_complete(
while not timer.is_expired(): while not timer.is_expired():
time.sleep(STATUS_CHECK_SLEEP_TIME) time.sleep(STATUS_CHECK_SLEEP_TIME)
command_status = aws_client.get_command_invocation( command_result = aws_client.get_command_invocation(
CommandId=command_id, InstanceId=target_instance_id CommandId=command_id, InstanceId=target_instance_id
)["Status"] )
command_status = command_result["Status"]
logger.debug(f"Command {command_id} status: {command_status}") logger.debug(f"Command {command_id} status: {command_status}")
if command_status == "Success": if command_status == "Success":
@ -104,4 +110,19 @@ def _wait_for_command_to_complete(
if command_status != "InProgress": if command_status != "InProgress":
# TODO: Create an exception for this occasion and raise it with useful information. # TODO: Create an exception for this occasion and raise it with useful information.
raise Exception("COMMAND FAILED") raise AWSCommandError(
f"AWS command failed." f" Command invocation contents: {command_result}"
)
def _fetch_command_results(
aws_client: botocore.client.BaseClient, target_instance_id: str, command_id: str
):
command_results = aws_client.ssm.get_command_invocation(
CommandId=command_id, InstanceId=target_instance_id
)
# TODO: put these into a dataclass and return
# self.is_successful(command_info, True)
# command_results["ResponseCode"]
# command_results["StandardOutputContent"]
# command_results["StandardErrorContent"]