mirror of
https://github.com/ghndrx/prowler.git
synced 2026-02-11 23:35:07 +00:00
add SCORED column to CSV output; handle section tiles properly
This commit is contained in:
24
prowler
24
prowler
@@ -245,7 +245,7 @@ TITLE_TEXT="CALLER ERROR - UNSET TITLE"
|
|||||||
## Output formatting functions
|
## Output formatting functions
|
||||||
textOK(){
|
textOK(){
|
||||||
if [[ $MODE == "csv" ]]; then
|
if [[ $MODE == "csv" ]]; then
|
||||||
echo "$PROFILE|$REGION|$TITLE_ID|PASS|$TITLE_TEXT|$1"
|
echo "$PROFILE|$REGION|$TITLE_ID|PASS|$ITEM_SCORED|$TITLE_TEXT|$1"
|
||||||
else
|
else
|
||||||
echo " $TITLE_ID $OK OK! $NORMAL $@"
|
echo " $TITLE_ID $OK OK! $NORMAL $@"
|
||||||
fi
|
fi
|
||||||
@@ -253,7 +253,7 @@ textOK(){
|
|||||||
|
|
||||||
textNotice(){
|
textNotice(){
|
||||||
if [[ $MODE == "csv" ]]; then
|
if [[ $MODE == "csv" ]]; then
|
||||||
echo "$PROFILE|$REGION|$TITLE_ID|INFO|$TITLE_TEXT|$1"
|
echo "$PROFILE|$REGION|$TITLE_ID|INFO|$ITEM_SCORED|$TITLE_TEXT|$1"
|
||||||
else
|
else
|
||||||
echo " $TITLE_ID $NOTICE INFO! $@ $NORMAL"
|
echo " $TITLE_ID $NOTICE INFO! $@ $NORMAL"
|
||||||
fi
|
fi
|
||||||
@@ -261,7 +261,7 @@ textNotice(){
|
|||||||
|
|
||||||
textWarn(){
|
textWarn(){
|
||||||
if [[ $MODE == "csv" ]]; then
|
if [[ $MODE == "csv" ]]; then
|
||||||
echo "$PROFILE|$REGION|$TITLE_ID|WARNING|$TITLE_TEXT|$1"
|
echo "$PROFILE|$REGION|$TITLE_ID|WARNING|$ITEM_SCORED|$TITLE_TEXT|$1"
|
||||||
else
|
else
|
||||||
echo " $TITLE_ID $BAD WARNING! $@ $NORMAL"
|
echo " $TITLE_ID $BAD WARNING! $@ $NORMAL"
|
||||||
fi
|
fi
|
||||||
@@ -290,7 +290,7 @@ textTitle(){
|
|||||||
|
|
||||||
printCsvHeader() {
|
printCsvHeader() {
|
||||||
>&2 echo "Pipe Delimited report on stdout; Diagnostics on stderr."
|
>&2 echo "Pipe Delimited report on stdout; Diagnostics on stderr."
|
||||||
echo "PROFILE|REGION|TITLE_ID|RESULT|TITLE_TEXT|NOTES"
|
echo "PROFILE|REGION|TITLE_ID|RESULT|SCORED|TITLE_TEXT|NOTES"
|
||||||
}
|
}
|
||||||
|
|
||||||
prowlerBanner() {
|
prowlerBanner() {
|
||||||
@@ -1388,8 +1388,8 @@ saveReport
|
|||||||
|
|
||||||
callCheck
|
callCheck
|
||||||
|
|
||||||
TITLE1="$BLUE 1 Identity and Access Management *********************************$NORMAL"
|
TITLE1="Identity and Access Management ****************************************"
|
||||||
echo -e "\n\n$TITLE1"
|
textTitle "1" "$TITLE1"
|
||||||
check11
|
check11
|
||||||
check12
|
check12
|
||||||
check13
|
check13
|
||||||
@@ -1415,8 +1415,8 @@ check122
|
|||||||
check123
|
check123
|
||||||
check124
|
check124
|
||||||
|
|
||||||
TITLE2="$BLUE 2 Logging ********************************************************$NORMAL"
|
TITLE2="Logging ***************************************************************"
|
||||||
echo -e "\n\n$TITLE2"
|
textTitle "2" "$TITLE2"
|
||||||
check21
|
check21
|
||||||
check22
|
check22
|
||||||
check23
|
check23
|
||||||
@@ -1426,8 +1426,8 @@ check26
|
|||||||
check27
|
check27
|
||||||
check28
|
check28
|
||||||
|
|
||||||
TITLE3="$BLUE 3 Monitoring *****************************************************"
|
TITLE3="Monitoring ************************************************************"
|
||||||
echo -e "\n\n$TITLE3"
|
textTitle "3" "$TITLE3"
|
||||||
# 3 Monitoring check commands / Mostly covered by SecurityMonkey
|
# 3 Monitoring check commands / Mostly covered by SecurityMonkey
|
||||||
check31
|
check31
|
||||||
check32
|
check32
|
||||||
@@ -1445,8 +1445,8 @@ check313
|
|||||||
check314
|
check314
|
||||||
check315
|
check315
|
||||||
|
|
||||||
TITLE4="$BLUE 4 Networking **************************************************$NORMAL"
|
TITLE4="Networking ************************************************************"
|
||||||
echo -e "\n\n$TITLE4"
|
textTitle "4" "$TITLE4"
|
||||||
check41
|
check41
|
||||||
check42
|
check42
|
||||||
check43
|
check43
|
||||||
|
|||||||
Reference in New Issue
Block a user