From ada8a225ae6385db97a2ae6cc297fe27ea7e5246 Mon Sep 17 00:00:00 2001 From: Toni de la Fuente Date: Mon, 16 Apr 2018 14:09:30 -0400 Subject: [PATCH] fixed and improved aws profile loader --- include/aws_profile_loader | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/include/aws_profile_loader b/include/aws_profile_loader index 3cd21350..842fa155 100644 --- a/include/aws_profile_loader +++ b/include/aws_profile_loader @@ -16,21 +16,19 @@ # check environment variables and if not, it checks and loads credentials from # instance profile (metadata server) if runs in an EC2 instance +INSTANCE_PROFILE=$(curl -s -m 1 http://169.254.169.254/latest/meta-data/iam/security-credentials/) + if [[ $PROFILE ]]; then PROFILE_OPT="--profile $PROFILE" -else - # if Prowler runs insinde an AWS instance with IAM instance profile attached - INSTANCE_PROFILE=$(curl -s -m 1 http://169.254.169.254/latest/meta-data/iam/security-credentials/) - if [[ $INSTANCE_PROFILE ]]; then +elif [[ $AWS_ACCESS_KEY_ID && $AWS_SECRET_ACCESS_KEY || $AWS_SESSION_TOKEN ]];then + PROFILE="ENV" + PROFILE_OPT="" +elif [[ $INSTANCE_PROFILE ]];then + PROFILE="INSTANCE-PROFILE" AWS_ACCESS_KEY_ID=$(curl -s http://169.254.169.254/latest/meta-data/iam/security-credentials/${INSTANCE_PROFILE} | grep AccessKeyId | cut -d':' -f2 | sed 's/[^0-9A-Z]*//g') AWS_SECRET_ACCESS_KEY_ID=$(curl -s http://169.254.169.254/latest/meta-data/iam/security-credentials/${INSTANCE_PROFILE} | grep SecretAccessKey | cut -d':' -f2 | sed 's/[^0-9A-Za-z/+=]*//g') AWS_SESSION_TOKEN=$(curl -s http://169.254.169.254/latest/meta-data/iam/security-credentials/${INSTANCE_PROFILE} grep Token| cut -d':' -f2 | sed 's/[^0-9A-Za-z/+=]*//g') - fi - if [[ $AWS_ACCESS_KEY_ID && $AWS_SECRET_ACCESS_KEY || $AWS_SESSION_TOKEN ]];then - PROFILE="ENV" - PROFILE_OPT="" - else +else PROFILE="default" PROFILE_OPT="--profile $PROFILE" - fi fi