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

Island: Fix broken AWS queries in aws_command_runner

This commit is contained in:
Mike Salvatore 2022-05-10 08:47:40 -04:00
parent c655aaffe9
commit bfeea19c88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,13 +69,13 @@ def _run_command_async(
doc_name = "AWS-RunShellScript" if target_os == "linux" else "AWS-RunPowerShellScript" doc_name = "AWS-RunShellScript" if target_os == "linux" else "AWS-RunPowerShellScript"
logger.debug(f'Running command on {target_instance_id} -- {doc_name}: "{command}"') logger.debug(f'Running command on {target_instance_id} -- {doc_name}: "{command}"')
command_response = aws_client.ssm.send_command( command_response = aws_client.send_command(
DocumentName=doc_name, DocumentName=doc_name,
Parameters={"commands": [command]}, Parameters={"commands": [command]},
InstanceIds=[target_instance_id], InstanceIds=[target_instance_id],
) )
command_id = command_response["CommandId"] command_id = command_response["Command"]["CommandId"]
logger.debug( logger.debug(
f"Started command on AWS instance {target_instance_id} with command ID {command_id}" f"Started command on AWS instance {target_instance_id} with command ID {command_id}"
) )
@ -93,7 +93,7 @@ def _wait_for_command_to_complete(
sleep_time = min((timer.time_remaining - STATUS_CHECK_SLEEP_TIME), STATUS_CHECK_SLEEP_TIME) sleep_time = min((timer.time_remaining - STATUS_CHECK_SLEEP_TIME), STATUS_CHECK_SLEEP_TIME)
time.sleep(sleep_time) time.sleep(sleep_time)
command_status = aws_client.ssm.get_command_invocation( command_status = aws_client.get_command_invocation(
CommandId=command_id, InstanceId=target_instance_id CommandId=command_id, InstanceId=target_instance_id
)["Status"] )["Status"]
logger.debug(f"Command {command_id} status: {command_status}") logger.debug(f"Command {command_id} status: {command_status}")