elie/debian-cis
1
0
Fork 0
mirror of https://github.com/ovh/debian-cis.git synced 2024-11-22 13:37:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX(13.15): fix code that did not show duplicated group

Browse Source 
Add tests
Apply shellcheck recommendations
This commit is contained in:
Charles Herlin 2019-03-28 17:51:02 +01:00
parent 8f87d75293
commit 1ec77dbb56
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/hardening/13.15_check_duplicate_gid.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# run-shellcheck
# #
# CIS Debian Hardening # CIS Debian Hardening
# #
@ -11,28 +11,30 @@
set -e # One error, it's over set -e # One error, it's over
set -u # One variable unset, it's over set -u # One variable unset, it's over
# shellcheck disable=2034
HARDENING_LEVEL=2 HARDENING_LEVEL=2
# shellcheck disable=2034
DESCRIPTION="There is no duplicate GIDs." DESCRIPTION="There is no duplicate GIDs."
ERRORS=0 ERRORS=0
# This function will be called if the script status is on enabled / audit mode # This function will be called if the script status is on enabled / audit mode
audit () { audit () {
RESULT=$(cat /etc/group | cut -f3 -d":" | sort -n | uniq -c | awk {'print $1":"$2'} ) RESULT=$(cut -f3 -d":" /etc/group | sort -n | uniq -c | awk '{print $1":"$2}' )
for LINE in $RESULT; do for LINE in $RESULT; do
debug "Working on line $LINE" debug "Working on line $LINE"
OCC_NUMBER=$(awk -F: {'print $1'} <<< $LINE) OCC_NUMBER=$(awk -F: '{print $1}' <<< "$LINE")
GROUPID=$(awk -F: {'print $2'} <<< $LINE) GROUPID=$(awk -F: '{print $2}' <<< "$LINE")
if [ $OCC_NUMBER -gt 1 ]; then if [ "$OCC_NUMBER" -gt 1 ]; then
USERS=$(awk -F: '($3 == n) { print $1 }' n=$GROUPID /etc/passwd | xargs) GROUP=$(awk -F: '($3 == n) { print $1 }' n="$GROUPID" /etc/group | xargs)
ERRORS=$((ERRORS+1)) ERRORS=$((ERRORS+1))
crit "Duplicate GID ($GROUPID): ${USERS}" crit "Duplicate GID ($GROUPID): ${GROUP}"
fi fi
done done
if [ $ERRORS = 0 ]; then if [ $ERRORS = 0 ]; then
ok "No duplicate GIDs" ok "No duplicate GIDs"
fi fi
} }
# This function will be called if the script status is on enabled mode # This function will be called if the script status is on enabled mode
@ -56,8 +58,9 @@ if [ -z "$CIS_ROOT_DIR" ]; then
fi fi
# Main function, will call the proper functions given the configuration (audit, enabled, disabled) # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then if [ -r "$CIS_ROOT_DIR"/lib/main.sh ]; then
. $CIS_ROOT_DIR/lib/main.sh # shellcheck source=/opt/debian-cis/lib/main.sh
. "$CIS_ROOT_DIR"/lib/main.sh
else else
echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening" echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
exit 128 exit 128

17
tests/hardening/13.15_check_duplicate_gid.sh
View File

@ -6,5 +6,20 @@ test_audit() {
# shellcheck disable=2154 # shellcheck disable=2154
run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
# TODO fill comprehensive tests
groupadd -f -g 120 grouptest
groupadd -fo -g 120 grouptest2
describe Duplicated groups
register_test retvalshouldbe 1
run duplicated /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
# Cleanup
groupdel grouptest
groupdel grouptest2
describe Compliant state
register_test retvalshouldbe 0
run resolved /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
} }