From 797ae2380a07f0dad85d2926c0d245d6653c8123 Mon Sep 17 00:00:00 2001 From: Patrick Van der Veken Date: Sat, 5 Sep 2020 14:15:50 +0200 Subject: [PATCH] check_*_file_change plugin: fix log_hc call for failed checksum + quote fix --- opt/hc/lib/platform/aix/check_aix_file_change.sh | 13 +++++++------ opt/hc/lib/platform/hp-ux/check_hpux_file_change.sh | 13 +++++++------ .../lib/platform/linux/check_linux_file_change.sh | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/opt/hc/lib/platform/aix/check_aix_file_change.sh b/opt/hc/lib/platform/aix/check_aix_file_change.sh index f75f83e..46040d4 100755 --- a/opt/hc/lib/platform/aix/check_aix_file_change.sh +++ b/opt/hc/lib/platform/aix/check_aix_file_change.sh @@ -29,6 +29,7 @@ # @(#) 2019-01-24: arguments fix [Patrick Van der Veken] # @(#) 2019-03-09: added support for --log-healthy [Patrick Van der Veken] # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] +# @(#) 2020-09-05: fix log_hc call for failed checksum + quote fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -38,7 +39,7 @@ function check_aix_file_change { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-03-16" # YYYY-MM-DD +typeset _VERSION="2020-09-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # ------------------------- CONFIGURATION ends here --------------------------- @@ -275,7 +276,7 @@ do openssl-sha256) if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') _FILE_TYPE="openssl-sha256" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -285,7 +286,7 @@ do cksum-crc32) if (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ') + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ') _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -301,11 +302,11 @@ do # new file if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') _FILE_TYPE="openssl-sha256" elif (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ') + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ') _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum (openssl/cksum) for ${_FILE_TO_CHECK}" @@ -347,7 +348,7 @@ do printf "%s|%s|%s\n" "${_FILE_TO_CHECK}" "${_FILE_TYPE}" "${_FILE_CKSUM}" >>${_TMP2_FILE} # report with curr/exp values - if (( _LOG_HEALTHY > 0 )) + if (( _LOG_HEALTHY > 0 || _STC > 0 )) then log_hc "$0" ${_STC} "${_MSG}" "${_FILE_CKSUM}" "${_STATE_FILE_CKSUM}" continue diff --git a/opt/hc/lib/platform/hp-ux/check_hpux_file_change.sh b/opt/hc/lib/platform/hp-ux/check_hpux_file_change.sh index bbb8e31..79d5773 100755 --- a/opt/hc/lib/platform/hp-ux/check_hpux_file_change.sh +++ b/opt/hc/lib/platform/hp-ux/check_hpux_file_change.sh @@ -29,6 +29,7 @@ # @(#) 2019-01-24: arguments fix [Patrick Van der Veken] # @(#) 2019-03-09: added support for --log-healthy [Patrick Van der Veken] # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] +# @(#) 2020-09-05: fix log_hc call for failed checksum + quote fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -38,7 +39,7 @@ function check_hpux_file_change { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-03-16" # YYYY-MM-DD +typeset _VERSION="2020-05-20" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="HP-UX" # uname -s match # ------------------------- CONFIGURATION ends here --------------------------- @@ -275,7 +276,7 @@ do openssl-sha256) if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') _FILE_TYPE="openssl-sha256" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -285,7 +286,7 @@ do cksum-crc32) if (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ') + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ') _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -301,11 +302,11 @@ do # new file if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' | tr -d ' ') _FILE_TYPE="openssl-sha256" elif (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ') + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ') _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum (openssl/cksum) for ${_FILE_TO_CHECK}" @@ -347,7 +348,7 @@ do printf "%s|%s|%s\n" "${_FILE_TO_CHECK}" "${_FILE_TYPE}" "${_FILE_CKSUM}" >>${_TMP2_FILE} # report with curr/exp values - if (( _LOG_HEALTHY > 0 )) + if (( _LOG_HEALTHY > 0 || _STC > 0 )) then log_hc "$0" ${_STC} "${_MSG}" "${_FILE_CKSUM}" "${_STATE_FILE_CKSUM}" continue diff --git a/opt/hc/lib/platform/linux/check_linux_file_change.sh b/opt/hc/lib/platform/linux/check_linux_file_change.sh index e3172d9..494a284 100755 --- a/opt/hc/lib/platform/linux/check_linux_file_change.sh +++ b/opt/hc/lib/platform/linux/check_linux_file_change.sh @@ -30,6 +30,7 @@ # @(#) 2019-01-24: arguments fix [Patrick Van der Veken] # @(#) 2019-03-09: added support for --log-healthy [Patrick Van der Veken] # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] +# @(#) 2020-09-05: fix log_hc call for failed checksum + quote fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -39,7 +40,7 @@ function check_linux_file_change { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-03-16" # YYYY-MM-DD +typeset _VERSION="2020-09-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # ------------------------- CONFIGURATION ends here --------------------------- @@ -276,7 +277,7 @@ do openssl-sha256) if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' 2>/dev/null | tr -d ' ' 2>/dev/null) + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' 2>/dev/null | tr -d ' ' 2>/dev/null) _FILE_TYPE="openssl-sha256" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -286,7 +287,7 @@ do cksum-crc32) if (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ' 2>/dev/null) + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ' 2>/dev/null) _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum [${_FILE_TYPE}] for ${_FILE_TO_CHECK}" @@ -302,11 +303,11 @@ do # new file if (( _USE_OPENSSL == 1 )) then - _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f2 -d'=' 2>/dev/null | tr -d ' ' 2>/dev/null) + _FILE_CKSUM=$(${_OPENSSL_BIN} dgst -sha256 "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f2 -d'=' 2>/dev/null | tr -d ' ' 2>/dev/null) _FILE_TYPE="openssl-sha256" elif (( _USE_CKSUM == 1 )) then - _FILE_CKSUM=$(${_CKSUM_BIN} ${_FILE_TO_CHECK} 2>>${HC_STDERR_LOG} | cut -f1 -d' ' 2>/dev/null) + _FILE_CKSUM=$(${_CKSUM_BIN} "${_FILE_TO_CHECK}" 2>>${HC_STDERR_LOG} | cut -f1 -d' ' 2>/dev/null) _FILE_TYPE="cksum-crc32" else _MSG="cannot compute checksum (openssl/cksum) for ${_FILE_TO_CHECK}" @@ -348,7 +349,7 @@ do printf "%s|%s|%s\n" "${_FILE_TO_CHECK}" "${_FILE_TYPE}" "${_FILE_CKSUM}" >>${_TMP2_FILE} # report with curr/exp values - if (( _LOG_HEALTHY > 0 )) + if (( _LOG_HEALTHY > 0 || _STC > 0 )) then log_hc "$0" ${_STC} "${_MSG}" "${_FILE_CKSUM}" "${_STATE_FILE_CKSUM}" continue