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

Improved the error messages of AWS remote run 

So the users will have a better chance of understanding the situation and deal with it
This commit is contained in:
Shay Nehmad 2019-04-23 19:04:39 +03:00
parent e1cd7254fd
commit 2a58e9ddc0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,11 @@ from monkey_island.cc.auth import jwt_required
from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
from common.cloud.aws_service import AwsService from common.cloud.aws_service import AwsService
CLIENT_ERROR_FORMAT = "ClientError, error message: '{}'. Probably, the IAM role that has been associated with the " \
"instance doesn't permit SSM calls. "
NO_CREDS_ERROR_FORMAT = "NoCredentialsError, error message: '{}'. Probably, no IAM role has been associated with the " \
"instance. "
class RemoteRun(flask_restful.Resource): class RemoteRun(flask_restful.Resource):
def __init__(self): def __init__(self):
@ -29,12 +34,10 @@ class RemoteRun(flask_restful.Resource):
try: try:
resp['instances'] = AwsService.get_instances() resp['instances'] = AwsService.get_instances()
except NoCredentialsError as e: except NoCredentialsError as e:
# Probably, role hasn't been defined. resp['error'] = NO_CREDS_ERROR_FORMAT.format(e.message)
resp['error'] = e.message
return jsonify(resp) return jsonify(resp)
except ClientError as e: except ClientError as e:
# Probably, role doesn't allow SSM. resp['error'] = CLIENT_ERROR_FORMAT.format(e.message)
resp['error'] = e.message
return jsonify(resp) return jsonify(resp)
return jsonify(resp) return jsonify(resp)