fix(check32): filterName base64encoded to avoid space problems in filter names #1020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jfagoagas
approved these changes
Feb 2, 2022
include/check3x
Outdated
| @@ -39,11 +39,12 @@ check3x(){ | |||
| if [ "$CLOUDWATCH_LOGGROUP_ACCOUNT" == "$CURRENT_ACCOUNT_ID" ];then | |||
| # Filter control and whitespace from .metricFilters[*].filterPattern for easier matching later | |||
| METRICFILTER_CACHE=$($AWSCLI logs describe-metric-filters --log-group-name "$CLOUDWATCH_LOGGROUP_NAME" $PROFILE_OPT --region "$CLOUDWATCH_LOGGROUP_REGION"|jq '.metricFilters|=map(.filterPattern|=gsub("[[:space:]]+"; " "))') | |||
| METRICFILTER_SET=$(echo $METRICFILTER_CACHE | jq -r --arg re "$grep_filter" '.metricFilters[]|select(.filterPattern|test($re))|.filterName') | |||
| METRICFILTER_SET=$(echo $METRICFILTER_CACHE | jq -r --arg re "$grep_filter" '.metricFilters[]|select(.filterPattern|test($re))|.filterName|@base64') | |||
There was a problem hiding this comment.
Suggested change
| METRICFILTER_SET=$(echo $METRICFILTER_CACHE | jq -r --arg re "$grep_filter" '.metricFilters[]|select(.filterPattern|test($re))|.filterName|@base64') | |
| METRICFILTER_SET=$(echo "${METRICFILTER_CACHE}" | jq -r --arg re "${grep_filter}" '.metricFilters[]|select(.filterPattern|test("${re}"))|.filterName|@base64') |
include/check3x
Outdated
| fi | ||
| if [[ $METRICFILTER_SET ]];then | ||
| for metric in $METRICFILTER_SET; do | ||
| metric_name=$(echo $METRICFILTER_CACHE | jq -r --arg name $metric '.metricFilters[]|select(.filterName==$name)|.metricTransformations[0].metricName') | ||
| metric_decode=$(echo $metric | base64 -d) |
There was a problem hiding this comment.
Suggested change
| metric_decode=$(echo $metric | base64 -d) | |
| metric_decode=$(base64 -d <<< "${metric}") |
include/check3x
Outdated
| fi | ||
| if [[ $METRICFILTER_SET ]];then | ||
| for metric in $METRICFILTER_SET; do | ||
| metric_name=$(echo $METRICFILTER_CACHE | jq -r --arg name $metric '.metricFilters[]|select(.filterName==$name)|.metricTransformations[0].metricName') | ||
| metric_decode=$(echo $metric | base64 -d) | ||
| metric_name=$(echo $METRICFILTER_CACHE | jq -r --arg name "${metric_decode}" '.metricFilters[]|select(.filterName==$name)|.metricTransformations[0].metricName') |
There was a problem hiding this comment.
Suggested change
| metric_name=$(echo $METRICFILTER_CACHE | jq -r --arg name "${metric_decode}" '.metricFilters[]|select(.filterName==$name)|.metricTransformations[0].metricName') | |
| metric_name=$(echo "${METRICFILTER_CACHE}" | jq -r --arg name "${metric_decode}" '.metricFilters[]|select(.filterName=="${name}")|.metricTransformations[0].metricName') |
include/check3x
Outdated
| @@ -61,15 +62,15 @@ check3x(){ | |||
|
|
|||
| if [[ $CHECK_OK ]]; then | |||
| for group in $CHECK_OK; do | |||
| metric=${group#*:} | |||
| metric=$(echo ${group#*:} | base64 -d) | |||
There was a problem hiding this comment.
Suggested change
| metric=$(echo ${group#*:} | base64 -d) | |
| metric=$(base64 -d <<< "${group#*:}") |
include/check3x
Outdated
| group=${group%:*} | ||
| textPass "$REGION: CloudWatch group $group found with metric filter $metric and alarms set" "$REGION" "$group" | ||
| done | ||
| fi | ||
| if [[ $CHECK_WARN ]]; then | ||
| for group in $CHECK_WARN; do | ||
| case $group in | ||
| *:*) metric=${group#*:} | ||
| *:*) metric=$(echo ${group#*:} | base64 -d) |
There was a problem hiding this comment.
Suggested change
| *:*) metric=$(echo ${group#*:} | base64 -d) | |
| *:*) metric=$(base64 -d <<< "${group#*:}") |
n4ch04
force-pushed
the
PRWLR-26-fix-check-32-fails-when-metric-name-contain-spaces-in-it-745
branch
from
16b22c7
to
9a84dd6
Compare
toniblyx
approved these changes
Feb 2, 2022
toniblyx
deleted the
PRWLR-26-fix-check-32-fails-when-metric-name-contain-spaces-in-it-745
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Prowler fails in check32 when metric filter names include spaces, interpreting each single word of the name as a different metric filter name. This generates false positives from non existing metric filter names - #745
Description
To avoid this metric filter name is base64 encoded in check3x file, decoding it when its needed ( aws api calls and display messages)
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.