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

Lowercase all tests when using them in comparisons

Browse Source
This commit is contained in:
mboelen 2016-04-25 15:49:00 +02:00
parent c02ab08b50
commit ba0381a775
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/functions
View File

@ -1486,8 +1486,7 @@
# Name : Register() # Name : Register()
# Description : Register a test and see if it has to be run # Description : Register a test and see if it has to be run
# Returns : SKIPTEST (0 or 1) # Returns : SKIPTEST (0 or 1)
Register() Register() {
{
# Do not insert a log break, if previous test was not logged # Do not insert a log break, if previous test was not logged
if [ ${SKIPLOGTEST} -eq 0 ]; then logtextbreak; fi if [ ${SKIPLOGTEST} -eq 0 ]; then logtextbreak; fi
ROOT_ONLY=0; SKIPTEST=0; SKIPLOGTEST=0; TEST_NEED_OS=""; PREQS_MET="" ROOT_ONLY=0; SKIPTEST=0; SKIPLOGTEST=0; TEST_NEED_OS=""; PREQS_MET=""
@ -1555,14 +1554,15 @@
# Skip test if it's configured in profile (old style) # Skip test if it's configured in profile (old style)
if [ ${SKIPTEST} -eq 0 ]; then if [ ${SKIPTEST} -eq 0 ]; then
FIND=`echo "${TEST_SKIP_ALWAYS}" | grep "${TEST_NO}"` FIND=`echo "${TEST_SKIP_ALWAYS}" | grep "${TEST_NO}" | tr '[:upper:]' '[:lower:]'`
if [ ! "${FIND}" = "" ]; then SKIPTEST=1; SKIPREASON="Skipped by configuration"; fi if [ ! "${FIND}" = "" ]; then SKIPTEST=1; SKIPREASON="Skipped by configuration"; fi
fi fi
# Check if this test is on the list to skip # Check if this test is on the list to skip
if [ ${SKIPTEST} -eq 0 ]; then if [ ${SKIPTEST} -eq 0 ]; then
VALUE=`echo ${TEST_NO} | tr '[:upper:]' '[:lower:]'`
for I in ${SKIP_TESTS}; do for I in ${SKIP_TESTS}; do
if [ "${I}" = "${TEST_NO}" ]; then SKIPTEST=1; SKIPREASON="Skipped by configuration (skip-test)"; fi if [ "${I}" = "${VALUE}" ]; then SKIPTEST=1; SKIPREASON="Skipped by configuration (skip-test)"; fi
done done
fi fi
@ -1604,8 +1604,8 @@
if [ ${SKIPLOGTEST} -eq 0 ]; then LogText "Reason to skip: ${SKIPREASON}"; fi if [ ${SKIPLOGTEST} -eq 0 ]; then LogText "Reason to skip: ${SKIPREASON}"; fi
TESTS_SKIPPED="${TEST_NO}|${TESTS_SKIPPED}" TESTS_SKIPPED="${TEST_NO}|${TESTS_SKIPPED}"
fi fi
}
}
# Remove PID file # Remove PID file
RemovePIDFile() RemovePIDFile()
@ -2106,10 +2106,12 @@
SkipAtomicTest() { SkipAtomicTest() {
RETVAL=255 RETVAL=255
if [ $# -eq 1 ]; then if [ $# -eq 1 ]; then
local STRING=""
RETVAL=1 RETVAL=1
# Check if this test is on the list to skip # Check if this test is on the list to skip
for I in ${SKIP_TESTS}; do for I in ${SKIP_TESTS}; do
if [ "${I}" = "$1" ]; then RETVAL=0; LogText "Atomic test ($1) skipped by configuration (skip-test)"; fi STRING=`echo $1 | tr '[:upper:]' '[:lower:]'`
if [ "${I}" = "${STRING}" ]; then RETVAL=0; LogText "Atomic test ($1) skipped by configuration (skip-test)"; fi
done done
fi fi
return $RETVAL return $RETVAL

3
include/profiles
View File

@ -184,7 +184,8 @@
# Which tests to skip (skip-test=ABCD-1234 or skip-test=ABCD-1234:subtest) # Which tests to skip (skip-test=ABCD-1234 or skip-test=ABCD-1234:subtest)
skip-test) skip-test)
SKIP_TESTS="${SKIP_TESTS} ${VALUE}" STRING=`echo ${VALUE} | tr '[:upper:]' '[:lower:]'`
SKIP_TESTS="${SKIP_TESTS} ${STRING}"
;; ;;
# Tests to always skip (useful for false positives or problematic tests) # Tests to always skip (useful for false positives or problematic tests)