Merge pull request #10 from Alfresco/master

get all changes from main repo
This commit is contained in:
Toni de la Fuente
2017-08-22 10:42:15 +02:00
committed by GitHub

31
prowler
View File

@@ -335,6 +335,7 @@ prowlerBanner() {
echo -e " | |_) | | | (_) \ V V /| | __/ |"
echo -e " | .__/|_| \___/ \_/\_/ |_|\___|_|"
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
@@ -381,10 +382,6 @@ getWhoami(){
fi
}
printCurrentDate(){
textNotice "Date: $(date)"
}
printColorsCode(){
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"
@@ -428,16 +425,13 @@ REGIONS=$($AWSCLI ec2 describe-regions --query 'Regions[].RegionName' \
infoReferenceLong(){
# Report review note:
textNotice "For more information:"
textNotice "https://benchmarks.cisecurity.org/tools2/amazon/CIS_Amazon_Web_Services_Foundations_Benchmark_v1.1.0.pdf"
textNotice "For bugs or feedback:"
textNotice "https://github.com/Alfresco/aws-cis-security-benchmark/issues"
}
echo -e ""
echo -e "For more information on the Prowler, feedback and issue reporting:"
echo -e "https://github.com/Alfresco/prowler"
echo -e ""
echo -e "For more information on the CIS benchmark:"
echo -e "https://benchmarks.cisecurity.org/tools2/amazon/CIS_Amazon_Web_Services_Foundations_Benchmark_v1.1.0.pdf"
infoReferenceShort(){
# Report review note:
textNotice "http://bit.ly/2g3PEf7"
}
check11(){
@@ -715,7 +709,6 @@ check117(){
textTitle "$ID117" "$TITLE117" "SCORED" "LEVEL1"
textNotice "No command available for check 1.17 "
textNotice "See section 1.17 on the CIS Benchmark guide for details "
infoReferenceShort
}
check118(){
@@ -751,7 +744,6 @@ check119(){
textTitle "$ID119" "$TITLE119" "SCORED" "LEVEL1"
textNotice "No command available for check 1.19 "
textNotice "See section 1.19 on the CIS Benchmark guide for details "
infoReferenceShort
}
check120(){
@@ -761,7 +753,6 @@ check120(){
textTitle "$ID120" "$TITLE120" "SCORED" "LEVEL1"
textNotice "No command available for check 1.20 "
textNotice "See section 1.20 on the CIS Benchmark guide for details "
infoReferenceShort
}
check121(){
@@ -769,8 +760,7 @@ check121(){
TITLE121="Ensure IAM instance roles are used for AWS resource access from instances (Not Scored)"
textTitle "$ID121" "$TITLE121" "NOT_SCORED" "LEVEL2"
textNotice "No command available for check 1.21 "
textNotice "See section 1.21 on the CIS Benchmark guide for details "
infoReferenceShort
textNotice "See section 1.21 on the CIS Benchmark guide for details "
}
check122(){
@@ -1581,7 +1571,7 @@ callCheck(){
if [[ $MODE != "csv" ]]; then
prowlerBanner
printCurrentDate
printCurrentDate
printColorsCode
fi
getWhoami
@@ -1662,7 +1652,4 @@ extra71
extra72
extra73
if [[ $MODE != "csv" ]]; then
infoReferenceLong
fi
cleanTemp