ghndrx/prowler
1
0
Fork 0
mirror of https://github.com/ghndrx/prowler.git synced 2026-02-10 06:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that checks are sorted numerically when listing checks

Browse Source 
Sort first by section, then by check within each section
Fix group IDs in documentation

Relates to #545 and #561
This commit is contained in:
Marc Jay
2020-09-01 00:11:35 +01:00
parent 7f03ef0e7e
commit e3ecee83af
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -263,7 +263,7 @@ This script has been written in bash using AWS-CLI and it works in Linux and OSX
-c <check_id> specify one or multiple check ids separated by commas, to see all available checks use -l option -c <check_id> specify one or multiple check ids separated by commas, to see all available checks use -l option
(i.e.: check11 for check 1.1 or extra71,extra72 for extra check 71 and extra check 72) (i.e.: check11 for check 1.1 or extra71,extra72 for extra check 71 and extra check 72)
-g <group_id> specify a group of checks by id, to see all available group of checks use -L -g <group_id> specify a group of checks by id, to see all available group of checks use -L
(i.e.: check3 for entire section 3, level1 for CIS Level 1 Profile Definitions or forensics-ready) (i.e.: group3 for entire section 3, cislevel1 for CIS Level 1 Profile Definitions or forensics-ready)
-f <filterregion> specify an AWS region to run checks against -f <filterregion> specify an AWS region to run checks against
(i.e.: us-west-1) (i.e.: us-west-1)
-m <maxitems> specify the maximum number of items to return for long-running requests (default: 100) -m <maxitems> specify the maximum number of items to return for long-running requests (default: 100)

8
prowler
View File

@@ -63,7 +63,7 @@ USAGE:
-c <check_id> specify one or multiple check ids separated by commas, to see all available checks use "-l" option -c <check_id> specify one or multiple check ids separated by commas, to see all available checks use "-l" option
(i.e.: "check11" for check 1.1 or "extra71,extra72" for extra check 71 and extra check 72) (i.e.: "check11" for check 1.1 or "extra71,extra72" for extra check 71 and extra check 72)
-g <group_id> specify a group of checks by id, to see all available group of checks use "-L" -g <group_id> specify a group of checks by id, to see all available group of checks use "-L"
(i.e.: "check3" for entire section 3, "level1" for CIS Level 1 Profile Definitions or "forensics-ready") (i.e.: "group3" for entire section 3, "cislevel1" for CIS Level 1 Profile Definitions or "forensics-ready")
-f <filterregion> specify an AWS region to run checks against -f <filterregion> specify an AWS region to run checks against
(i.e.: us-west-1) (i.e.: us-west-1)
-m <maxitems> specify the maximum number of items to return for long-running requests (default: 100) -m <maxitems> specify the maximum number of items to return for long-running requests (default: 100)
@@ -271,8 +271,10 @@ for i in "${!GROUP_TITLE[@]}"; do
TOTAL_CHECKS+=("$CHECK_ID_$j") TOTAL_CHECKS+=("$CHECK_ID_$j")
done done
done done
# Remove duplicates whilst preserving the order of checks, and store the result as an array # Remove duplicates, sort checks numerically, and store the result as an array
TOTAL_CHECKS=($(echo "${TOTAL_CHECKS[*]}" | tr ' ' '\n' | awk '!seen[$0]++')) # Note: the sort mechanism relies on the fact that the check ID prefixes 'check' and 'extra' are both 5 characters long.
# 6th character is the section number, 7th character onwards is the individual ID (e.g. check110 = check 1 10)
TOTAL_CHECKS=($(echo "${TOTAL_CHECKS[*]}" | tr ' ' '\n' | awk '!seen[$0]++' | sort -k 1.6,1.6n -k 1.7n))
# Function to show the title of the check, and optionally which group(s) it belongs to # Function to show the title of the check, and optionally which group(s) it belongs to
# using this way instead of arrays to keep bash3 (osx) and bash4(linux) compatibility # using this way instead of arrays to keep bash3 (osx) and bash4(linux) compatibility