mirror of
https://github.com/ovh/debian-cis.git
synced 2024-11-22 13:37:02 +01:00
Accept lower values (#95)
* IMP(5.2.23): accept lower value as valid * IMP(5.2.7): accept lower value as valid
This commit is contained in:
parent
1cade2e375
commit
9e6c9a0d8a
@ -36,7 +36,17 @@ audit() {
|
|||||||
if [ "$FNRET" = 0 ]; then
|
if [ "$FNRET" = 0 ]; then
|
||||||
ok "$PATTERN is present in $FILE"
|
ok "$PATTERN is present in $FILE"
|
||||||
else
|
else
|
||||||
|
does_pattern_exist_in_file_nocase "$FILE" "^${SSH_PARAM}"
|
||||||
|
if [ "$FNRET" != 0 ]; then
|
||||||
crit "$PATTERN is not present in $FILE"
|
crit "$PATTERN is not present in $FILE"
|
||||||
|
else
|
||||||
|
VALUE=$($SUDO_CMD grep -i "^${SSH_PARAM}" "$FILE" | tr -s ' ' | cut -d' ' -f2)
|
||||||
|
if [ "$VALUE" -gt "$SSH_VALUE" ]; then
|
||||||
|
crit "$VALUE is higher than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
else
|
||||||
|
ok "$VALUE is lower than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@ -64,8 +74,13 @@ apply() {
|
|||||||
if [ "$FNRET" != 0 ]; then
|
if [ "$FNRET" != 0 ]; then
|
||||||
add_end_of_file "$FILE" "$SSH_PARAM $SSH_VALUE"
|
add_end_of_file "$FILE" "$SSH_PARAM $SSH_VALUE"
|
||||||
else
|
else
|
||||||
info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
|
VALUE=$(grep -i "^${SSH_PARAM}" "$FILE" | tr -s ' ' | cut -d' ' -f2)
|
||||||
|
if [ "$VALUE" -gt "$SSH_VALUE" ]; then
|
||||||
|
warn "$VALUE is higher than recommended $SSH_VALUE for $SSH_PARAM, replacing it"
|
||||||
replace_in_file "$FILE" "^${SSH_PARAM}[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
|
replace_in_file "$FILE" "^${SSH_PARAM}[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
|
||||||
|
else
|
||||||
|
ok "$VALUE is lower than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
/etc/init.d/ssh reload
|
/etc/init.d/ssh reload
|
||||||
fi
|
fi
|
||||||
|
@ -36,7 +36,17 @@ audit() {
|
|||||||
if [ "$FNRET" = 0 ]; then
|
if [ "$FNRET" = 0 ]; then
|
||||||
ok "$PATTERN is present in $FILE"
|
ok "$PATTERN is present in $FILE"
|
||||||
else
|
else
|
||||||
|
does_pattern_exist_in_file_nocase "$FILE" "^${SSH_PARAM}"
|
||||||
|
if [ "$FNRET" != 0 ]; then
|
||||||
crit "$PATTERN is not present in $FILE"
|
crit "$PATTERN is not present in $FILE"
|
||||||
|
else
|
||||||
|
VALUE=$($SUDO_CMD grep -i "^${SSH_PARAM}" "$FILE" | tr -s ' ' | cut -d' ' -f2)
|
||||||
|
if [ "$VALUE" -gt "$SSH_VALUE" ]; then
|
||||||
|
crit "$VALUE is higher than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
else
|
||||||
|
ok "$VALUE is lower than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@ -59,13 +69,18 @@ apply() {
|
|||||||
if [ "$FNRET" = 0 ]; then
|
if [ "$FNRET" = 0 ]; then
|
||||||
ok "$PATTERN is present in $FILE"
|
ok "$PATTERN is present in $FILE"
|
||||||
else
|
else
|
||||||
warn "$PATTERN is not present in $FILE, adding it"
|
warn "$PATTERN is not present in $FILE"
|
||||||
does_pattern_exist_in_file_nocase "$FILE" "^${SSH_PARAM}"
|
does_pattern_exist_in_file_nocase "$FILE" "^${SSH_PARAM}"
|
||||||
if [ "$FNRET" != 0 ]; then
|
if [ "$FNRET" != 0 ]; then
|
||||||
add_end_of_file "$FILE" "$SSH_PARAM $SSH_VALUE"
|
add_end_of_file "$FILE" "$SSH_PARAM $SSH_VALUE"
|
||||||
else
|
else
|
||||||
info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
|
VALUE=$(grep -i "^${SSH_PARAM}" "$FILE" | tr -s ' ' | cut -d' ' -f2)
|
||||||
|
if [ "$VALUE" -gt "$SSH_VALUE" ]; then
|
||||||
|
warn "$VALUE is higher than recommended $SSH_VALUE for $SSH_PARAM, replacing it"
|
||||||
replace_in_file "$FILE" "^${SSH_PARAM}[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
|
replace_in_file "$FILE" "^${SSH_PARAM}[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
|
||||||
|
else
|
||||||
|
ok "$VALUE is lower than recommended $SSH_VALUE for $SSH_PARAM"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
/etc/init.d/ssh reload
|
/etc/init.d/ssh reload
|
||||||
fi
|
fi
|
||||||
|
@ -7,6 +7,22 @@ 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
|
||||||
|
|
||||||
|
echo "maxsessions 1" >>/etc/ssh/sshd_config
|
||||||
|
|
||||||
|
describe Running restrictive
|
||||||
|
register_test retvalshouldbe 0
|
||||||
|
register_test contain "[ OK ] 1 is lower than recommended 10"
|
||||||
|
run restrictive /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||||
|
|
||||||
|
# delete last line
|
||||||
|
sed -i '$ d' /etc/ssh/sshd_config
|
||||||
|
echo "maxsessions 15" >>/etc/ssh/sshd_config
|
||||||
|
|
||||||
|
describe Running too permissive
|
||||||
|
register_test retvalshouldbe 1
|
||||||
|
register_test contain "[ KO ] 15 is higher than recommended 10"
|
||||||
|
run permissive /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||||
|
|
||||||
describe Correcting situation
|
describe Correcting situation
|
||||||
# `apply` performs a service reload after each change in the config file
|
# `apply` performs a service reload after each change in the config file
|
||||||
# the service needs to be started for the reload to succeed
|
# the service needs to be started for the reload to succeed
|
||||||
|
@ -7,6 +7,22 @@ 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
|
||||||
|
|
||||||
|
echo "MaxAuthTries 2" >>/etc/ssh/sshd_config
|
||||||
|
|
||||||
|
describe Running restrictive
|
||||||
|
register_test retvalshouldbe 0
|
||||||
|
register_test contain "[ OK ] 2 is lower than recommended 4"
|
||||||
|
run restrictive /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||||
|
|
||||||
|
# delete last line
|
||||||
|
sed -i '$ d' /etc/ssh/sshd_config
|
||||||
|
echo "MaxAuthTries 6" >>/etc/ssh/sshd_config
|
||||||
|
|
||||||
|
describe Running too permissive
|
||||||
|
register_test retvalshouldbe 1
|
||||||
|
register_test contain "[ KO ] 6 is higher than recommended 4"
|
||||||
|
run permissive /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||||
|
|
||||||
describe Correcting situation
|
describe Correcting situation
|
||||||
# `apply` performs a service reload after each change in the config file
|
# `apply` performs a service reload after each change in the config file
|
||||||
# the service needs to be started for the reload to succeed
|
# the service needs to be started for the reload to succeed
|
||||||
|
Loading…
Reference in New Issue
Block a user