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

Improved swap detection and added UUID check

Browse Source
This commit is contained in:
mboelen 2015-05-26 11:12:36 +02:00
parent 3c3bb2d0db
commit a1095ef941
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/tests_filesystems
View File

@ -209,23 +209,46 @@
FOUND=0 FOUND=0
logtext "Test: query swap partitions from /etc/fstab file" logtext "Test: query swap partitions from /etc/fstab file"
# Check if third field contains 'swap' # Check if third field contains 'swap'
FIND=`awk '{ if ($3=="swap") print $1 }' /etc/fstab` FIND=`awk '{ if ($2=="swap" || $3=="swap") { print $1 }}' /etc/fstab | grep -v "^#"`
for I in ${FIND}; do for I in ${FIND}; do
FOUND=1 FOUND=1
REAL=""
UUID=""
logtext "Swap partition found: ${I}" logtext "Swap partition found: ${I}"
# YYY Add a test if partition is not a normal partition (e.g. UUID=) # YYY Add a test if partition is not a normal partition (e.g. UUID=)
# Can be ^/dev/mapper/vg-name_lv-name # Can be ^/dev/mapper/vg-name_lv-name
# Can be ^/dev/partition # Can be ^/dev/partition
# Can be ^UUID=uuid --> /dev/disk/by-uuid/<uuid> # Can be ^UUID=uuid --> /dev/disk/by-uuid/<uuid>
# if [ ! "${BLKIDBINARY}" = "" ]; then HAS_UUID=`echo ${I} | grep "^UUID="`
# FIND2=`${BLKIDBINARY} | awk '{ if ($2=="UUID=\"${UUID}\"") print $1 }' | sed 's/:$//'` if [ ! "${HAS_UUID}" = "" ]; then
# else UUID=`echo ${HAS_UUID} | awk -F= '{ print $2 }'`
# logtext "Result: blkid binary not found, trying by checking device listing" logtext "Result: Using ${UUID} as UUID"
# if [ -f /dev/disk/by-uuid/${UUID} ]; then if [ ! "${BLKIDBINARYx}" = "" ]; then
# logtext "Result: found disk via /dev/disk/by-uuid listing" FIND2=`${BLKIDBINARY} | awk '{ if ($2=="UUID=\"${UUID}\"") print $1 }' | sed 's/:$//'`
# fi if [ ! "${FIND2}" = "" ]; then
# fi REAL="${FIND2}"
report "swap_partition[]=${I}" fi
else
logtext "Result: blkid binary not found, trying by checking device listing"
sFILE=""
if [ -L /dev/disk/by-uuid/${UUID} ]; then
logtext "Result: found disk via /dev/disk/by-uuid listing"
ShowSymlinkPath /dev/disk/by-uuid/${UUID}
if [ ! "${sFILE}" = "" ]; then
REAL="${sFILE}"
logtext "Result: disk is ${REAL}"
fi
else
logtext "Result: no symlink found to /dev/disk/by-uuid/${UUID}"
fi
fi
fi
# Set real device
if [ "${REAL}" = "" ]; then
REAL="${I}"
fi
report "swap_partition[]=${I},${REAL},"
done done
if [ ${FOUND} -eq 1 ]; then if [ ${FOUND} -eq 1 ]; then
Display --indent 2 --text "- Query swap partitions (fstab)" --result OK --color GREEN Display --indent 2 --text "- Query swap partitions (fstab)" --result OK --color GREEN