From 11c182c5fe6479fd5c2660e5995904de738b94c5 Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Tue, 14 Apr 2020 16:45:37 +0200
Subject: [PATCH] Fixed issue with regions on check21

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

diff --git a/checks/check21 b/checks/check21
index d1a23103..ffb6cc59 100644
--- a/checks/check21
+++ b/checks/check21
@@ -19,30 +19,22 @@ CHECK_ALTERNATE_check201="check21"
 check21(){
   trail_count=0
   # "Ensure CloudTrail is enabled in all regions (Scored)"
-    REGIONS=$($AWSCLI cloudtrail describe-trails $PROFILE_OPT --query 'trailList[*].HomeRegion' --output text)
-    result='False'
 	for regx in $REGIONS; do
-		LIST_OF_TRAILS=$($AWSCLI cloudtrail describe-trails $PROFILE_OPT --region $regx --query 'trailList[*].Name' --output text)
+		LIST_OF_TRAILS=$($AWSCLI cloudtrail describe-trails $PROFILE_OPT --region $regx --query 'trailList[*].Name' --output text --no-include-shadow-trails)
 		if [[ $LIST_OF_TRAILS ]];then
 			for trail in $LIST_OF_TRAILS;do
 				trail_count=$((trail_count + 1))
 				MULTIREGION_TRAIL_STATUS=$($AWSCLI cloudtrail describe-trails $PROFILE_OPT --region $regx --query 'trailList[*].IsMultiRegionTrail' --output text --trail-name-list $trail)
-				ISLOGGING_STATUS=$($AWSCLI cloudtrail get-trail-status $PROFILE_OPT --region $regx --name $trail --query ['IsLogging'] --output text)
-				INCLUDEMANAGEMENTEVENTS_STATUS=$($AWSCLI cloudtrail  get-event-selectors $PROFILE_OPT --region $regx --trail-name $trail --query EventSelectors[*].IncludeManagementEvents --output text)
-				READWRITETYPE_STATUS=$($AWSCLI cloudtrail  get-event-selectors $PROFILE_OPT --region $regx --trail-name $trail --query EventSelectors[*].ReadWriteType --output text)
-				if [[ "$MULTIREGION_TRAIL_STATUS" == "True" ]] && [[ "$ISLOGGING_STATUS" == "True" ]] && [[ "$INCLUDEMANAGEMENTEVENTS_STATUS" == *"True"* ]] && [[ "$READWRITETYPE_STATUS" == *"All"* ]];then
-				    textPass "$trail trail in $regx is enabled for all regions"
-				    result='True'
-				    break
+				if [[ "$MULTIREGION_TRAIL_STATUS" == 'False' ]];then
+					textFail "$trail trail in $regx is not enabled in multi region mode"
+				else
+					textPass "$trail trail in $regx is enabled for all regions"
 				fi
 			done
 		fi
 	done
-    if [[ $result == 'False' ]]; then
-      textFail "trail exist but it is not enabled in multi region mode"
-    fi
-    if [[ $trail_count == 0 ]]; then
-      textFail "No CloudTrail trails were found in the account"
-    fi
-}
 
+	if [[ $trail_count == 0 ]]; then
+    textFail "No CloudTrail trails were found in the account"
+  fi
+}
\ No newline at end of file