From dc330a774e907a4f04527cc245789ada1989d646 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 25 Sep 2020 16:30:16 -0400 Subject: [PATCH] Exit so-zeek-logs if user cancels --- salt/common/tools/sbin/so-zeek-logs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-zeek-logs b/salt/common/tools/sbin/so-zeek-logs index 353eece1e..6d661dc1f 100755 --- a/salt/common/tools/sbin/so-zeek-logs +++ b/salt/common/tools/sbin/so-zeek-logs @@ -5,14 +5,26 @@ zeek_logs_enabled() { echo "zeeklogs:" > $local_salt_dir/pillar/zeeklogs.sls echo " enabled:" >> $local_salt_dir/pillar/zeeklogs.sls - for BLOG in ${BLOGS[@]}; do + for BLOG in "${BLOGS[@]}"; do echo " - $BLOG" | tr -d '"' >> $local_salt_dir/pillar/zeeklogs.sls done } -whiptail_manager_adv_service_zeeklogs() { +whiptail_check_exitstatus() { + case $1 in + 1) + whiptail --title "Security Onion Setup" --msgbox "Cancelling. No changes have been made." 8 75 + exit + ;; + 255) + whiptail --title "Security Onion Setup" --msgbox "Whiptail error occured, exiting. Check log for details." 8 75 + exit + ;; + esac +} +whiptail_manager_adv_service_zeeklogs() { BLOGS=$(whiptail --title "Security Onion Setup" --checklist "Please Select Logs to Send:" 24 78 12 \ "conn" "Connection Logging" ON \ "dce_rpc" "RPC Logs" ON \ @@ -52,6 +64,9 @@ whiptail_manager_adv_service_zeeklogs() { "mysql" "MySQL Logs" ON \ "socks" "SOCKS Logs" ON \ "x509" "x.509 Logs" ON 3>&1 1>&2 2>&3 ) + + local exitstatus=$? + whiptail_check_exitstatus $exitstatus } whiptail_manager_adv_service_zeeklogs