From 3e3987b3be70b40ca86c3c7c607c8a8a232577d8 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 18 Sep 2023 08:45:51 +0100 Subject: [PATCH 1/4] script improvement Signed-off-by: Mark Bolwell --- run_audit.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/run_audit.sh b/run_audit.sh index 4acb74b..33e32d6 100755 --- a/run_audit.sh +++ b/run_audit.sh @@ -147,16 +147,14 @@ export FAILURE=0 if [ -s "${AUDIT_BIN}" ]; then echo "OK - Audit binary $AUDIT_BIN is available" goss_installed_version="$($AUDIT_BIN -v | awk '{print $NF}' | cut -dv -f2)" - newer_version=$(echo -e "$goss_installed_version\n$AUDIT_BIN_MIN_VER" | sort -V | tail -n 1) - if [ "$goss_installed_version" = "$newer_version" ] || [ "$goss_installed_version" = "$AUDIT_BIN_MIN_VER" ]; then - echo "OK - Goss is installed and version is ok ($goss_installed_version >= $AUDIT_BIN_MIN_VER)" + ver_calc=$(awk 'BEGIN{print $goss_installed_version < $AUDIT_BIN_MIN_VER}') + if [ $AUDIT_BIN_MIN_VER = "$goss_installed_version" ] || [ "$ver_calc" = 1 ] ; then + echo "OK - Goss is installed and Version is ok"; else - echo "WARNING - Goss installed = ${goss_installed_version}, does not met minimum of ${AUDIT_BIN_MIN_VER}" - export FAILURE=2 + echo "WARNING - Goss installed = ${goss_installed_version}, does not met minimum of ${AUDIT_BIN_MIN_VER}"; export FAILURE=2 fi else - echo "WARNING - The audit binary is not available at $AUDIT_BIN " - export FAILURE=1 + echo "WARNING - The audit binary is not available at $AUDIT_BIN "; export FAILURE=1 fi if [ -f "${audit_content_dir}/${AUDIT_FILE}" ]; then From f0317e65df51d9c978c5f4a2f098511e296872c4 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 18 Sep 2023 08:46:08 +0100 Subject: [PATCH 2/4] updated Signed-off-by: Mark Bolwell --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 65dcd20..996248f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changes to RHEL9-CIS-Audit -## 1.0.4 updates and script +## 1.0.4 updates and script - based on CIS v1.0.0 - multiple tests updates - linting on spaces From eaf5059ae5915e5b4178a8414457ca9bae9bbc8d Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 18 Sep 2023 12:09:05 +0100 Subject: [PATCH 3/4] reverted copy and paste error Signed-off-by: Mark Bolwell --- run_audit.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/run_audit.sh b/run_audit.sh index 33e32d6..2cb1904 100755 --- a/run_audit.sh +++ b/run_audit.sh @@ -147,20 +147,16 @@ export FAILURE=0 if [ -s "${AUDIT_BIN}" ]; then echo "OK - Audit binary $AUDIT_BIN is available" goss_installed_version="$($AUDIT_BIN -v | awk '{print $NF}' | cut -dv -f2)" - ver_calc=$(awk 'BEGIN{print $goss_installed_version < $AUDIT_BIN_MIN_VER}') - if [ $AUDIT_BIN_MIN_VER = "$goss_installed_version" ] || [ "$ver_calc" = 1 ] ; then - echo "OK - Goss is installed and Version is ok"; + newer_version=$(echo -e "$goss_installed_version\n$AUDIT_BIN_MIN_VER" | sort -V | tail -n 1) + if [ "$goss_installed_version" = "$newer_version" ] || [ "$goss_installed_version" = "$AUDIT_BIN_MIN_VER" ]; then + echo "OK - Goss is installed and version is ok ($goss_installed_version >= $AUDIT_BIN_MIN_VER)" else - echo "WARNING - Goss installed = ${goss_installed_version}, does not met minimum of ${AUDIT_BIN_MIN_VER}"; export FAILURE=2 + echo "WARNING - Goss installed = ${goss_installed_version}, does not met minimum of ${AUDIT_BIN_MIN_VER}" + export FAILURE=2 fi else - echo "WARNING - The audit binary is not available at $AUDIT_BIN "; export FAILURE=1 -fi - -if [ -f "${audit_content_dir}/${AUDIT_FILE}" ]; then - echo "OK - ${audit_content_dir}/${AUDIT_FILE} is available" -else - echo "WARNING - the $audit_content_dir/$AUDIT_FILE is not available"; export FAILURE=3 + echo "WARNING - The audit binary is not available at $AUDIT_BIN " + export FAILURE=1 fi if [ "${FAILURE}" != 0 ]; then From 2a96bb6f6f39b977265dc01d6ddee20cb0d84f1d Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 18 Sep 2023 12:10:38 +0100 Subject: [PATCH 4/4] tidy Signed-off-by: Mark Bolwell --- run_audit.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run_audit.sh b/run_audit.sh index 2cb1904..4acb74b 100755 --- a/run_audit.sh +++ b/run_audit.sh @@ -159,6 +159,12 @@ else export FAILURE=1 fi +if [ -f "${audit_content_dir}/${AUDIT_FILE}" ]; then + echo "OK - ${audit_content_dir}/${AUDIT_FILE} is available" +else + echo "WARNING - the $audit_content_dir/$AUDIT_FILE is not available"; export FAILURE=3 +fi + if [ "${FAILURE}" != 0 ]; then echo "## Pre-checks failed please see output" exit 1