Merge branch 'master' into referencelong

This commit is contained in:
Toni de la Fuente
2017-08-22 10:39:41 +02:00
committed by GitHub

16
prowler
View File

@@ -335,6 +335,7 @@ prowlerBanner() {
echo -e " | |_) | | | (_) \ V V /| | __/ |" echo -e " | |_) | | | (_) \ V V /| | __/ |"
echo -e " | .__/|_| \___/ \_/\_/ |_|\___|_|" echo -e " | .__/|_| \___/ \_/\_/ |_|\___|_|"
echo -e " |_|$NORMAL$BLUE CIS based AWS Account Hardening Tool$NORMAL\n" echo -e " |_|$NORMAL$BLUE CIS based AWS Account Hardening Tool$NORMAL\n"
echo -e "$YELLOW Date: $(date)"
} }
# Get whoami in AWS, who is the user running this shell script # Get whoami in AWS, who is the user running this shell script
@@ -381,10 +382,6 @@ getWhoami(){
fi fi
} }
printCurrentDate(){
textNotice "Date: $(date)"
}
printColorsCode(){ printColorsCode(){
if [[ $MONOCHROME -eq 0 ]]; then if [[ $MONOCHROME -eq 0 ]]; then
echo -e "\nColors Code for results: $NOTICE INFORMATIVE$NORMAL,$OK OK (RECOMMENDED VALUE)$NORMAL, $BAD WARNING (FIX REQUIRED)$NORMAL \n" echo -e "\nColors Code for results: $NOTICE INFORMATIVE$NORMAL,$OK OK (RECOMMENDED VALUE)$NORMAL, $BAD WARNING (FIX REQUIRED)$NORMAL \n"
@@ -437,12 +434,6 @@ infoReferenceLong(){
} }
infoReferenceShort(){
# Report review note:
textNotice "http://bit.ly/2g3PEf7"
}
check11(){ check11(){
ID11="1.1" ID11="1.1"
TITLE11="Avoid the use of the root account (Scored)." TITLE11="Avoid the use of the root account (Scored)."
@@ -718,7 +709,6 @@ check117(){
textTitle "$ID117" "$TITLE117" "SCORED" "LEVEL1" textTitle "$ID117" "$TITLE117" "SCORED" "LEVEL1"
textNotice "No command available for check 1.17 " textNotice "No command available for check 1.17 "
textNotice "See section 1.17 on the CIS Benchmark guide for details " textNotice "See section 1.17 on the CIS Benchmark guide for details "
infoReferenceShort
} }
check118(){ check118(){
@@ -754,7 +744,6 @@ check119(){
textTitle "$ID119" "$TITLE119" "SCORED" "LEVEL1" textTitle "$ID119" "$TITLE119" "SCORED" "LEVEL1"
textNotice "No command available for check 1.19 " textNotice "No command available for check 1.19 "
textNotice "See section 1.19 on the CIS Benchmark guide for details " textNotice "See section 1.19 on the CIS Benchmark guide for details "
infoReferenceShort
} }
check120(){ check120(){
@@ -764,7 +753,6 @@ check120(){
textTitle "$ID120" "$TITLE120" "SCORED" "LEVEL1" textTitle "$ID120" "$TITLE120" "SCORED" "LEVEL1"
textNotice "No command available for check 1.20 " textNotice "No command available for check 1.20 "
textNotice "See section 1.20 on the CIS Benchmark guide for details " textNotice "See section 1.20 on the CIS Benchmark guide for details "
infoReferenceShort
} }
check121(){ check121(){
@@ -773,7 +761,6 @@ check121(){
textTitle "$ID121" "$TITLE121" "NOT_SCORED" "LEVEL2" textTitle "$ID121" "$TITLE121" "NOT_SCORED" "LEVEL2"
textNotice "No command available for check 1.21 " textNotice "No command available for check 1.21 "
textNotice "See section 1.21 on the CIS Benchmark guide for details " textNotice "See section 1.21 on the CIS Benchmark guide for details "
infoReferenceShort
} }
check122(){ check122(){
@@ -1585,7 +1572,6 @@ callCheck(){
if [[ $MODE != "csv" ]]; then if [[ $MODE != "csv" ]]; then
prowlerBanner prowlerBanner
printCurrentDate printCurrentDate
infoReferenceLong
printColorsCode printColorsCode
fi fi
getWhoami getWhoami