Merge in tweaks to keep the credential report, when requested, and fix a notice

README.md

@@ -113,6 +113,7 @@ USAGE:
       -f <filterregion>   specify an AWS region to run checks against (i.e.: us-west-1)
       -m <maxitems>       specify the maximum number of items to return for long-running requests (default: 100)
       -M <mode>           output mode: text (defalut), mono, csv (separator is "|"; data is on stdout; progress on stderr)
+      -k                  keep the credential report
       -h                  this help
 
 ```

prowler

@@ -37,6 +37,7 @@ MAXITEMS=100
 MONOCHROME=0
 MODE="text"
 SEP=','
+KEEPCREDREPORT=0
 
 
 # Command usage menu
@@ -51,17 +52,21 @@ USAGE:
       -f <filterregion>   specify an AWS region to run checks against (i.e.: us-west-1)
       -m <maxitems>       specify the maximum number of items to return for long-running requests (default: 100)
       -M <mode>           output mode: text (defalut), mono, csv (separator is \"${SEP}\"; data is on stdout; progress on stderr)
+      -k                  keep the credential report
       -h                  this help
   "
   exit
 }
 
-while getopts ":hp:r:c:f:m:M:" OPTION; do
+while getopts ":hkp:r:c:f:m:M:" OPTION; do
    case $OPTION in
      h )
         usage
         exit 1
         ;;
+     k )
+        KEEPCREDREPORT=1
+        ;;
      p )
         PROFILE=$OPTARG
         ;;
@@ -384,17 +389,23 @@ genCredReport() {
 
 # Save report to a file, decode it, deletion at finish and after every single check, acb stands for AWS CIS Benchmark
 saveReport(){
-  TEMP_REPORT_FILE=$(mktemp -t prowler-XXXXX.cred_report )
+  TEMP_REPORT_FILE=$(mktemp -t prowler-${ACCOUNT_NUM}-XXXXX.cred_report )
   $AWSCLI iam get-credential-report --query 'Content' --output text --profile $PROFILE --region $REGION | decode_report > $TEMP_REPORT_FILE
+  if [[ $KEEPCREDREPORT -eq 1 ]]; then
+    textTitle "0.2" "Saving IAM Credential Report ..."
+    textNotice "IAM Credential Report saved in $TEMP_REPORT_FILE"
+  fi
 }
 
 # Delete temporary report file
 cleanTemp(){
-  rm -fr $TEMP_REPORT_FILE
+  if [[ $KEEPCREDREPORT -ne 1 ]]; then
+    rm -fr $TEMP_REPORT_FILE
+  fi
 }
 
 # Delete the temporary report file if we get interrupted/terminated
-trap cleanTemp SIGHUP SIGINT SIGTERM
+trap cleanTemp EXIT
 
 # Get a list of all available AWS Regions
 REGIONS=$($AWSCLI ec2 describe-regions --query 'Regions[].RegionName' \
@@ -714,7 +725,7 @@ check118(){
       # find attached policies in found roles
       ATTACHEDPOLICIES=$($AWSCLI iam list-attached-role-policies --role-name $role --profile $PROFILE --region $REGION --query "AttachedPolicies[*]" --output text)
       for policy in $ATTACHEDPOLICIES;do
-        text-notice "$AWSCLI iam get-role-policy --role-name $role --policy-name $policy --profile $PROFILE --region $REGION"
+        textNotice "$AWSCLI iam get-role-policy --role-name $role --policy-name $policy --profile $PROFILE --region $REGION"
       done
     done
   else