From 3f90a33a130976c964fd0711b87fe5fd054297f9 Mon Sep 17 00:00:00 2001
From: Keith Rhea <keithr@mindpointggroup.com>
Date: Fri, 10 Aug 2018 15:19:20 -0600
Subject: [PATCH 1/3] Updated check115 variable
 CHECK_SCORED_check115=NOT_SCORED

---
 checks/check115 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checks/check115 b/checks/check115
index 3fd9229c2d..848bd44072 100644
--- a/checks/check115
+++ b/checks/check115
@@ -10,7 +10,7 @@
 
 CHECK_ID_check115="1.15"
 CHECK_TITLE_check115="[check115] Ensure security questions are registered in the AWS account (Not Scored)"
-CHECK_SCORED_check115="SCORED"
+CHECK_SCORED_check115="NOT_SCORED"
 CHECK_TYPE_check115="LEVEL1"
 CHECK_ALTERNATE_check115="check115"
 

From b98d3374783ee9eada5ebff813ce07deaeedd8c0 Mon Sep 17 00:00:00 2001
From: Keith Rhea <keithr@mindpointggroup.com>
Date: Fri, 10 Aug 2018 15:20:03 -0600
Subject: [PATCH 2/3] Updated check315 variable
 CHECK_SCORED_check315=NOT_SCORED

---
 checks/check315 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checks/check315 b/checks/check315
index 5672b27f08..679125beb3 100644
--- a/checks/check315
+++ b/checks/check315
@@ -10,7 +10,7 @@
 
 CHECK_ID_check315="3.15"
 CHECK_TITLE_check315="[check315] Ensure appropriate subscribers to each SNS topic (Not Scored)"
-CHECK_SCORED_check315="SCORED"
+CHECK_SCORED_check315="NOT_SCORED"
 CHECK_TYPE_check315="LEVEL1"
 CHECK_ALTERNATE_check315="check315"
 

From 3ef5a42b73d453dbba3edeb7267217a5b1392525 Mon Sep 17 00:00:00 2001
From: Keith Rhea <keithr@mindpointggroup.com>
Date: Fri, 10 Aug 2018 15:21:39 -0600
Subject: [PATCH 3/3] Updated check13 to only check users that have console
 password enabled

---
 checks/check13 | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/checks/check13 b/checks/check13
index 64733cff40..b6d4392f61 100644
--- a/checks/check13
+++ b/checks/check13
@@ -17,25 +17,17 @@ CHECK_ALTERNATE_check103="check13"
 check13(){
   # "Ensure credentials unused for 90 days or greater are disabled (Scored)"
   COMMAND12_LIST_USERS_WITH_PASSWORD_ENABLED=$(cat $TEMP_REPORT_FILE|awk -F, '{ print $1,$4 }' |grep true | awk '{ print $1 }')
+  # Only check Password last used for users with password enabled 
   if [[ $COMMAND12_LIST_USERS_WITH_PASSWORD_ENABLED ]]; then
-    COMMAND13=$(
     for i in $COMMAND12_LIST_USERS_WITH_PASSWORD_ENABLED; do
-      cat $TEMP_REPORT_FILE|awk -F, '{ print $1,$5 }' |grep $i| awk '{ print $1 }'|tr '\n' ' ';
-    done)
-    # list of users that have used password
-    USERS_PASSWORD_USED=$($AWSCLI iam list-users --query "Users[?PasswordLastUsed].UserName" --output text $PROFILE_OPT --region $REGION)
-    if [[ $USERS_PASSWORD_USED ]]; then
-      # look for users with a password last used more or equal to 90 days
-      for i in $USERS_PASSWORD_USED; do
-        DATEUSED=$($AWSCLI iam list-users --query "Users[?UserName=='$i'].PasswordLastUsed" --output text $PROFILE_OPT --region $REGION | cut -d'T' -f1)
-        HOWOLDER=$(how_older_from_today $DATEUSED)
-        if [ $HOWOLDER -gt "90" ];then
-          textFail "User \"$i\" has not logged in during the last 90 days "
-        else
-          textPass "User \"$i\" found with credentials used in the last 90 days"
-        fi
-      done
-    fi
+      DATEUSED=$($AWSCLI iam list-users --query "Users[?UserName=='$i'].PasswordLastUsed" --output text $PROFILE_OPT --region $REGION | cut -d'T' -f1)
+      HOWOLDER=$(how_older_from_today $DATEUSED)
+      if [ $HOWOLDER -gt "90" ];then
+        textFail "User \"$i\" has not logged in during the last 90 days "
+      else
+        textPass "User \"$i\" found with credentials used in the last 90 days"
+      fi
+    done
   else
       textPass "No users found with password enabled"
   fi