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

Return default behaviour to previous, remove distinction between strict & non-strict matching

Browse Source
This commit is contained in:
Quinn Stevens
2020-07-31 11:39:20 +01:00
parent 28b3604b1c
commit 801be49523
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/outputs
View File

@@ -114,13 +114,8 @@ textFail(){
while read -r i; do
ignore_check_name="${i%%:*}" # Check name is everything up to the first :
ignore_value="${i#*${CHECK_NAME}:}" # Ignore value is everything after the first :
if [[ ${ignore_value} =~ .*:f ]]; then
# Fuzzy search - if this pattern appears anywhere in the line, it matches.
resource_value=".*${ignore_value%:*}.*"
else
# Strict search - pattern has to be its own word.
resource_value="[[:space:]^]${ignore_value}[[:space:]$]"
fi
# Check to see if ignore value appears anywhere within log message.
resource_value=".*${ignore_value}.*"
if [[ ${ignore_check_name} != "${CHECK_NAME}" ]]; then
# not for this check
continue

10
whitelist_sample.txt
View File

@@ -3,12 +3,10 @@
# Example: Will not consider a myignoredbucket failures as full failure. (Still printed as a warning)
check26:myignoredbucket
# By default, whitelisting something (e.g. "ci-logs") will only whitelist resources specifically called
# "ci-logs". However, if you put ":f" at the end of the line, it will do a fuzzy match, and will
# whitelist all resources with "ci-logs" in their name.
# Note that by default, this searches for the string appearing *anywhere* in the resource name.
# For example:
# extra718:ci-logs # Will block bucket "ci-logs" but not bucket "ci-logs-replica"
# extra718:ci-logs:f # Will block any bucket containing the term "ci-logs"
# extra718:ci-logs # Will block bucket "ci-logs" AND ALSO bucket "ci-logs-replica"
# extra718:logs # Will block EVERY BUCKET containing the string "logs"
# line starting with # are ignored as comments
# add a line per resource as here:
@@ -20,4 +18,4 @@ check26:myignoredbucket
# REGEXES
# This whitelist works with regexes (ERE, the same style of regex as grep -E and bash's =~ use)
# therefore:
# extra718:[[:alnum:]]+-logs:f # will ignore all buckets containing the terms ci-logs, qa-logs, etc.
# extra718:[[:alnum:]]+-logs # will ignore all buckets containing the terms ci-logs, qa-logs, etc.