tyler.durden/lynis
1
0
Fork 0
mirror of https://github.com/CISOfy/lynis.git synced 2025-07-21 21:04:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not show update message when using 'show' helper

Browse Source
This commit is contained in:
Michael Boelen 2016-08-23 20:21:26 +02:00
parent 8ac9721f43
commit c11f7fc1ce
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/consts
View File

@ -178,6 +178,7 @@ unset LANG
RPMBINARY="" RPMBINARY=""
RUN_HELPERS=0 RUN_HELPERS=0
RUN_TESTS=1 RUN_TESTS=1
RUN_UPDATE_CHECK=1
SAMHAINBINARY="" SAMHAINBINARY=""
SCAN_TEST_HEAVY=""; SCAN_TEST_MEDIUM=""; SCAN_TEST_LOW="" SCAN_TEST_HEAVY=""; SCAN_TEST_MEDIUM=""; SCAN_TEST_LOW=""
SEARCH_PROFILES="" SEARCH_PROFILES=""

36
include/functions
View File

@ -245,26 +245,28 @@
CheckUpdates() { CheckUpdates() {
PROGRAM_LV="0000000000"; DB_MALWARE_LV="0000000000"; DB_FILEPERMS_LV="0000000000" PROGRAM_LV="0000000000"; DB_MALWARE_LV="0000000000"; DB_FILEPERMS_LV="0000000000"
LYNIS_LV_RECORD="lynis-latest-version.cisofy.com." if [ ${RUN_UPDATE_CHECK} -eq 1 ]; then
FIND=`which dig 2> /dev/null` LYNIS_LV_RECORD="lynis-latest-version.cisofy.com."
if [ ! "${FIND}" = "" ]; then FIND=$(which dig 2> /dev/null)
PROGRAM_LV=`dig +short +time=3 -t txt lynis-latest-version.cisofy.com 2> /dev/null | grep -v "connection timed out" | sed 's/[".]//g' | grep "^[1-9][0-9][0-9]$"` if [ ! -z "${FIND}" ]; then
else PROGRAM_LV=$(dig +short +time=3 -t txt lynis-latest-version.cisofy.com 2> /dev/null | grep -v "connection timed out" | sed 's/[".]//g' | grep "^[1-9][0-9][0-9]$")
FIND=`which host 2> /dev/null` else
if [ ! "${FIND}" = "" ]; then FIND=$(which host 2> /dev/null)
PROGRAM_LV=`host -t txt -W 3 lynis-latest-version.cisofy.com 2> /dev/null | grep -v "connection timed out" | awk '{ if ($1=="lynis-latest-version.cisofy.com" && $3=="text") { print $4 }}' | sed 's/"//g' | grep "^[1-9][0-9][0-9]$"` if [ ! -z "${FIND}" ]; then
if [ "${PROGRAM_LV}" = "" ]; then PROGRAM_LV=0; fi PROGRAM_LV=$(host -t txt -W 3 lynis-latest-version.cisofy.com 2> /dev/null | grep -v "connection timed out" | awk '{ if ($1=="lynis-latest-version.cisofy.com" && $3=="text") { print $4 }}' | sed 's/"//g' | grep "^[1-9][0-9][0-9]$")
else
FIND=`which drill 2> /dev/null`
if [ ! "${FIND}" = "" ]; then
PROGRAM_LV=`drill txt ${LYNIS_LV_RECORD} | awk '{ if ($1=="lynis-latest-version.cisofy.com." && $4=="TXT") { print $5 }}' | tr -d '"' | grep "^[1-9][0-9][0-9]$"`
if [ "${PROGRAM_LV}" = "" ]; then PROGRAM_LV=0; fi if [ "${PROGRAM_LV}" = "" ]; then PROGRAM_LV=0; fi
else else
LogText "Result: dig, drill or host not installed, update check skipped" FIND=$(which drill 2> /dev/null)
UPDATE_CHECK_SKIPPED=1 if [ ! -z "${FIND}" ]; then
PROGRAM_LV=$(drill txt ${LYNIS_LV_RECORD} | awk '{ if ($1=="lynis-latest-version.cisofy.com." && $4=="TXT") { print $5 }}' | tr -d '"' | grep "^[1-9][0-9][0-9]$")
if [ -z "${PROGRAM_LV}" ]; then PROGRAM_LV=0; fi
else
LogText "Result: dig, drill or host not installed, update check skipped"
UPDATE_CHECK_SKIPPED=1
fi
fi fi
fi fi
fi fi
} }

5
include/parameters
View File

@ -115,12 +115,13 @@
# Show Lynis details # Show Lynis details
show) show)
CHECK_BINARIES=0 CHECK_BINARIES=0
RUN_HELPERS=1
HELPER="show" HELPER="show"
QUIET=1
RUN_HELPERS=1
RUN_TESTS=0 RUN_TESTS=0
RUN_UPDATE_CHECK=0
SKIP_PLUGINS=1 SKIP_PLUGINS=1
SHOW_TOOL_TIPS=0 SHOW_TOOL_TIPS=0
QUIET=1
SHOW_PROGRAM_DETAILS=0 SHOW_PROGRAM_DETAILS=0
shift; HELPER_PARAMS="$@" shift; HELPER_PARAMS="$@"
break break