diff --git a/include/outputs b/include/outputs index cbadf8b2..4e61c0c3 100644 --- a/include/outputs +++ b/include/outputs @@ -16,6 +16,7 @@ EXTENSION_CSV="csv" EXTENSION_JSON="json" EXTENSION_ASFF="asff-json" +EXTENSION_TEXT="txt" EXTENSION_HTML="html" # not implemented yet, use ansi2html as in documentation OUTPUT_DATE=$(date -u +"%Y%m%d%H%M%S") OUTPUT_FILE_NAME="prowler-output-${ACCOUNT_NUM}-${OUTPUT_DATE}" @@ -47,7 +48,10 @@ textPass(){ if is_junit_output_enabled; then output_junit_success "$1" fi - if [[ "${MODES[@]}" =~ "text" ]]; then + if [[ "${MODES[@]}" =~ "mono" ]]; then + echo " $OK PASS!$NORMAL $1" | tee -a ${OUTPUT_FILE_NAME}.$EXTENSION_TEXT + fi + if [[ "${MODES[@]}" =~ "text" || "${MODES[@]}" =~ "mono" ]]; then echo " $OK PASS!$NORMAL $1" fi } @@ -71,6 +75,9 @@ textInfo(){ if is_junit_output_enabled; then output_junit_info "$1" fi + if [[ "${MODES[@]}" =~ "mono" ]]; then + echo " $NOTICE INFO! $1 $NORMAL" | tee -a ${OUTPUT_FILE_NAME}.$EXTENSION_TEXT + fi if [[ "${MODES[@]}" =~ "text" ]]; then echo " $NOTICE INFO! $1 $NORMAL" fi @@ -100,6 +107,9 @@ textFail(){ if is_junit_output_enabled; then output_junit_failure "$1" fi + if [[ "${MODES[@]}" =~ "mono" ]]; then + echo " $BAD FAIL! $1 $NORMAL" | tee -a ${OUTPUT_FILE_NAME}.$EXTENSION_TEXT + fi if [[ "${MODES[@]}" =~ "text" ]]; then echo " $BAD FAIL! $1 $NORMAL" fi diff --git a/prowler b/prowler index 42834c8a..2e148724 100755 --- a/prowler +++ b/prowler @@ -195,10 +195,10 @@ trap "{ rm -f /tmp/prowler*.policy.*; }" EXIT . $PROWLER_DIR/include/os_detector . $PROWLER_DIR/include/aws_profile_loader . $PROWLER_DIR/include/awscli_detector +. $PROWLER_DIR/include/whoami . $PROWLER_DIR/include/outputs . $PROWLER_DIR/include/csv_header . $PROWLER_DIR/include/banner -. $PROWLER_DIR/include/whoami . $PROWLER_DIR/include/credentials_report . $PROWLER_DIR/include/scoring . $PROWLER_DIR/include/python_detector