Simplified file permission test

This commit is contained in:
Michael Boelen 2016-05-02 15:44:52 +02:00
parent cd93b3a6ef
commit 4bc0225efd

13
lynis
View File

@ -862,14 +862,12 @@ ${NORMAL}
# Include available tests # Include available tests
for INCLUDE_TEST in ${INCLUDE_TESTS}; do for INCLUDE_TEST in ${INCLUDE_TESTS}; do
INCLUDE_FILE="${INCLUDEDIR}/tests_${INCLUDE_TEST}"
# Test if file exists, then if permissions are correct if [ -f ${INCLUDE_FILE} ]; then
if [ -f ${INCLUDEDIR}/tests_${INCLUDE_TEST} ]; then if SafePerms ${INCLUDE_FILE}; then
FIND=`ls -l ${INCLUDEDIR}/tests_${INCLUDE_TEST} | cut -c 2-10` . ${INCLUDE_FILE}
if [ "${FIND}" = "rw-r--r--" -o "${FIND}" = "rw-r-----" -o "${FIND}" = "rw-------" -o "${FIND}" = "r--------" ]; then
. ${INCLUDEDIR}/tests_${INCLUDE_TEST}
else else
LogText "Exception: skipping test category ${INCLUDE_TEST}, file ${INCLUDEDIR}/tests_${INCLUDE_TEST} has bad permissions (should be 640, 600 or 400)" LogText "Exception: skipping test category ${INCLUDE_TEST}, file ${INCLUDE_FILE} has bad permissions (should be 640, 600 or 400)"
ReportWarning "NONE" "H" "Invalid permissions on tests file tests_${INCLUDE_TEST}" ReportWarning "NONE" "H" "Invalid permissions on tests file tests_${INCLUDE_TEST}"
# Insert a section and warn user also on screen # Insert a section and warn user also on screen
InsertSection "General" InsertSection "General"
@ -878,7 +876,6 @@ ${NORMAL}
else else
echo "Error: Can't find file (category: ${INCLUDE_TEST})" echo "Error: Can't find file (category: ${INCLUDE_TEST})"
fi fi
done done
fi fi
# #