From 3694b364d3a48ad013ae9b9a870302c2a52f36fd Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 25 Apr 2022 09:55:12 +0200 Subject: [PATCH 01/18] IS_EVOBACKUP_EXCLUDE_MOUNT : skip if --one-file-system is used --- CHANGELOG | 2 ++ evocheck.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 689a7d8..e26acc7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed +* IS_EVOBACKUP_EXCLUDE_MOUNT : skip if --one-file-system is used + ### Deprecated ### Removed diff --git a/evocheck.sh b/evocheck.sh index c705038..3556897 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -601,7 +601,11 @@ check_evobackup_exclude_mount() { # shellcheck disable=SC2044 for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do - grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}" + # If rsync is not limited by "one-file-system" + # then we verify that every mount is excluded + grep -q -- "^\s*--one-file-system" "${evobackup_file}" \ + || grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' \ + > "${excludes_file}" not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") for mount in ${not_excluded}; do failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" From e1bafc2a0a0726ee172732bb0e67bb3dffbee5de Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 25 Apr 2022 09:57:09 +0200 Subject: [PATCH 02/18] Release 22.04 --- CHANGELOG | 25 +++++++++++++++++-------- evocheck.sh | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e26acc7..f9fe1f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,32 +7,40 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed -* IS_EVOBACKUP_EXCLUDE_MOUNT : skip if --one-file-system is used - ### Deprecated ### Removed ### Fixed -check_versions: "IS_CHECK_VERSIONS" was checked but "IS_VERSIONS_CHECK" was echoed, now "IS_CHECK_VERSIONS" everywhere +### Security + +## [22.04] 2022-04-25 + +### Changed + +* IS_EVOBACKUP_EXCLUDE_MOUNT : skip if --one-file-system is used + +### Fixed + +* check_versions: "IS_CHECK_VERSIONS" was checked but "IS_VERSIONS_CHECK" was echoed, now "IS_CHECK_VERSIONS" everywhere ### Security -check_debiansecurity: Consider both https://deb\.debian\.org/debian-security/ and https://security\.debian\.org/debian-security/ as valid since both are documented as such. +* check_debiansecurity: Consider both https://deb\.debian\.org/debian-security/ and https://security\.debian\.org/debian-security/ as valid since both are documented as such. ## [22.03.1] 2022-03-22 ### Changed -check_autoif : Ignore lxcbr interfaces, new since bullseye +* check_autoif : Ignore lxcbr interfaces, new since bullseye ## [22.03] 2022-03-15 ### Added -check_mysqlmunin : Complain if munin plugin mysql_commands returns an error -check_versions : track minifirewall version +* check_mysqlmunin : Complain if munin plugin mysql_commands returns an error +* check_versions : track minifirewall version ## [21.10.4] 2021-10-25 @@ -50,7 +58,8 @@ check_versions : track minifirewall version ## [21.10.2] 2021-10-22 ### Changed -Let's try the --version flag before falling back to grep for the constant + +* Let's try the --version flag before falling back to grep for the constant ## [21.10.1] 2021-10-01 diff --git a/evocheck.sh b/evocheck.sh index 3556897..07ec97f 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -4,7 +4,7 @@ # Script to verify compliance of a Debian/OpenBSD server # powered by Evolix -VERSION="22.03.1" +VERSION="22.04" readonly VERSION # base functions From f5b19ad6562aa7c72a350a2951553966fd317024 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 25 Apr 2022 10:08:14 +0200 Subject: [PATCH 03/18] fix various shellcheck violations --- CHANGELOG | 2 ++ evocheck.sh | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f9fe1f1..57d1f24 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed +* fix various shellcheck violations + ### Deprecated ### Removed diff --git a/evocheck.sh b/evocheck.sh index 07ec97f..f03f7e4 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -596,7 +596,7 @@ check_evobackup() { } # Vérification de l'exclusion des montages (NFS) dans les sauvegardes check_evobackup_exclude_mount() { - excludes_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.evobackup_exclude_mount.XXXXX") + excludes_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.evobackup_exclude_mount.XXXXX") files_to_cleanup="${files_to_cleanup} ${excludes_file}" # shellcheck disable=SC2044 @@ -1074,7 +1074,7 @@ check_duplicate_fs_label() { # Do it only if thereis blkid binary BLKID_BIN=$(command -v blkid) if [ -n "$BLKID_BIN" ]; then - tmpFile=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.duplicate_fs_label.XXXXX") + tmpFile=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.duplicate_fs_label.XXXXX") files_to_cleanup="${files_to_cleanup} ${tmpFile}" parts=$($BLKID_BIN -c /dev/null | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2) @@ -1473,7 +1473,7 @@ add_to_path() { echo "$PATH" | grep -qF "${new_path}" || export PATH="${PATH}:${new_path}" } check_versions() { - versions_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.versions.XXXXX") + versions_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.versions.XXXXX") files_to_cleanup="${files_to_cleanup} ${versions_file}" download_versions "${versions_file}" @@ -1501,7 +1501,7 @@ main() { # Detect operating system name, version and release detect_os - main_output_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.main.XXXXX") + main_output_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.main.XXXXX") files_to_cleanup="${files_to_cleanup} ${main_output_file}" #----------------------------------------------------------- @@ -1733,7 +1733,9 @@ main() { fi if [ -f "${main_output_file}" ]; then - if [ $(cat "${main_output_file}" | wc -l) -gt 0 ]; then + lines_found=$(wc -l < "${main_output_file}") + # shellcheck disable=SC2086 + if [ ${lines_found} -gt 0 ]; then cat "${main_output_file}" 2>&1 fi From bef0eba53917bbbbb84e3e37698244ab1f7c2918 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 25 Apr 2022 10:32:26 +0200 Subject: [PATCH 04/18] IS_EVOBACKUP_EXCLUDE_MOUNT: fix one-file-system restriction --- CHANGELOG | 2 ++ evocheck.sh | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 57d1f24..8d2caa5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Fixed +* IS_EVOBACKUP_EXCLUDE_MOUNT: fix one-file-system restriction + ### Security ## [22.04] 2022-04-25 diff --git a/evocheck.sh b/evocheck.sh index f03f7e4..b6d5ef0 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -603,13 +603,13 @@ check_evobackup_exclude_mount() { for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do # If rsync is not limited by "one-file-system" # then we verify that every mount is excluded - grep -q -- "^\s*--one-file-system" "${evobackup_file}" \ - || grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' \ - > "${excludes_file}" - not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") - for mount in ${not_excluded}; do - failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" - done + if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then + grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}" + not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") + for mount in ${not_excluded}; do + failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" + done + fi done } # Verification de la presence du userlogrotate From 7ff09cd97376c6a78e2c30102724ccce61b9c5ce Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 25 Apr 2022 10:33:11 +0200 Subject: [PATCH 05/18] Release 22.04.1 --- CHANGELOG | 14 ++++++++++---- evocheck.sh | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8d2caa5..bbe8c3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,18 +7,24 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed -* fix various shellcheck violations - ### Deprecated ### Removed ### Fixed -* IS_EVOBACKUP_EXCLUDE_MOUNT: fix one-file-system restriction - ### Security +## [22.04.1] 2022-04-25 + +### Changed + +* fix various shellcheck violations + +### Fixed + +* IS_EVOBACKUP_EXCLUDE_MOUNT: fix one-file-system restriction + ## [22.04] 2022-04-25 ### Changed diff --git a/evocheck.sh b/evocheck.sh index b6d5ef0..4f24ae7 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -4,7 +4,7 @@ # Script to verify compliance of a Debian/OpenBSD server # powered by Evolix -VERSION="22.04" +VERSION="22.04.1" readonly VERSION # base functions From 7a57016da1307e69384e7e95977e21b77a402308 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 12 May 2022 15:43:25 +0200 Subject: [PATCH 06/18] IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command --- CHANGELOG | 2 ++ evocheck.sh | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bbe8c3f..0b50229 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed +IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command + ### Deprecated ### Removed diff --git a/evocheck.sh b/evocheck.sh index 4f24ae7..657447a 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -601,14 +601,17 @@ check_evobackup_exclude_mount() { # shellcheck disable=SC2044 for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do - # If rsync is not limited by "one-file-system" - # then we verify that every mount is excluded - if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then - grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}" - not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") - for mount in ${not_excluded}; do - failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" - done + # if the file seems to be a backup script, with an Rsync invocation + if grep -q "^\s*rsync" "${evobackup_file}"; then + # If rsync is not limited by "one-file-system" + # then we verify that every mount is excluded + if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then + grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}" + not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") + for mount in ${not_excluded}; do + failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" + done + fi fi done } @@ -1429,7 +1432,7 @@ get_version() { grep '^VERSION=' "${command}" | head -1 | cut -d '=' -f 2 ;; minifirewall) - ${command} status | head -1 | cut -d ' ' -f 3 + ${command} version | head -1 | cut -d ' ' -f 3 ;; ## Let's try the --version flag before falling back to grep for the constant kvmstats) From 40687bc294caadef85e190f10400f313ec799004 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 12 May 2022 15:45:54 +0200 Subject: [PATCH 07/18] Release 22.05 --- CHANGELOG | 8 ++++++-- evocheck.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0b50229..c306f7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,8 +7,6 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed -IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command - ### Deprecated ### Removed @@ -17,6 +15,12 @@ IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command ### Security +## [22.05] 2022-05-12 + +### Changed + +IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command + ## [22.04.1] 2022-04-25 ### Changed diff --git a/evocheck.sh b/evocheck.sh index 657447a..cf901bb 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -4,7 +4,7 @@ # Script to verify compliance of a Debian/OpenBSD server # powered by Evolix -VERSION="22.04.1" +VERSION="22.05" readonly VERSION # base functions From 124efe7f380b42727dac4e6ae014c07e788270ca Mon Sep 17 00:00:00 2001 From: "William Hirigoyen (Evolix)" Date: Wed, 25 May 2022 12:22:55 +0200 Subject: [PATCH 08/18] Ajoute le cas /etc/init.d/alert5 pour IS_ALERT5MINIFW et IS_ALERT5BOOT --- evocheck.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index cf901bb..2a07975 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -337,6 +337,8 @@ check_alert5boot() { else if [ -n "$(find /etc/rc2.d/ -name 'S*alert5')" ]; then grep -q "^date" /etc/rc2.d/S*alert5 || failed "IS_ALERT5BOOT" "boot mail is not sent by alert5 init script" + elif [ -n "$(find /etc/init.d/ -name 'alert5')" ]; then + grep -q "^date" /etc/init.d/alert5 || failed "IS_ALERT5BOOT" "boot mail is not sent by alert5 int script" else failed "IS_ALERT5BOOT" "alert5 init script is missing" fi @@ -350,6 +352,9 @@ check_alert5minifw() { if [ -n "$(find /etc/rc2.d/ -name 'S*alert5')" ]; then grep -q "^/etc/init.d/minifirewall" /etc/rc2.d/S*alert5 \ || failed "IS_ALERT5MINIFW" "Minifirewall is not started by alert5 init script" + elif [ -n "$(find /etc/init.d/ -name 'alert5')" ]; then + grep -q "^/etc/init.d/minifirewall" /etc/init.d/alert5 \ + || failed "IS_ALERT5MINIFW" "Minifirewall is not started by alert5 init script" else failed "IS_ALERT5MINIFW" "alert5 init script is missing" fi From 3935bccfabd4b004f3520981c9d161a7852fe4c5 Mon Sep 17 00:00:00 2001 From: Bruno TATU Date: Wed, 25 May 2022 17:02:28 +0200 Subject: [PATCH 09/18] =?UTF-8?q?#65947=20meilleure=20d=C3=A9tection=20de?= =?UTF-8?q?=20dump=20compress=C3=A9=20ou=20non=20pour=20mongo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 2a07975..86372fc 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -960,7 +960,7 @@ check_mongo_backup() { # You could change the default path in /etc/evocheck.cf MONGO_BACKUP_PATH=${MONGO_BACKUP_PATH:-"/home/backup/mongodump"} if [ -d "$MONGO_BACKUP_PATH" ]; then - for file in "${MONGO_BACKUP_PATH}"/*/*.{json,bson}; do + for file in "${MONGO_BACKUP_PATH}"/*/*.{json,bson}.*; do # Skip indexes file. if ! [[ "$file" =~ indexes ]]; then limit=$(date +"%s" -d "now - 2 day") From 294c96b077818ad8f4ec08f6d1daa5a7678313e7 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Tue, 31 May 2022 11:04:35 +0200 Subject: [PATCH 10/18] Fix Debian security repo for Bullseye, cf https://www.debian.org/releases/stable/errata --- evocheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 86372fc..c41da45 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -235,7 +235,7 @@ check_debiansecurity() { if is_debian_bullseye; then # https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.html#security-archive # https://www.debian.org/security/ - pattern="^deb https://(deb|security)\.debian\.org/debian-security/? bullseye-security main" + pattern="^deb http://security\.debian\.org/debian-security/? bullseye-security main" elif is_debian_buster; then pattern="^deb http://security\.debian\.org/debian-security/? buster/updates main" elif is_debian_stretch; then From d94dad77bb48ce7b6ba5b3144c38d351a2967356 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 3 Jun 2022 09:06:17 +0200 Subject: [PATCH 11/18] IS_AUTOIF: Ignore WireGuard interfaces --- CHANGELOG | 2 ++ evocheck.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c306f7a..e6169b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Added +* IS_AUTOIF: Ignore WireGuard interfaces + ### Changed ### Deprecated diff --git a/evocheck.sh b/evocheck.sh index c41da45..d562f4d 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -576,7 +576,7 @@ check_network_interfaces() { # Verify if all if are in auto check_autoif() { if is_debian_stretch || is_debian_buster || is_debian_bullseye; then - interfaces=$(/sbin/ip address show up | grep "^[0-9]*:" | grep -E -v "(lo|vnet|docker|veth|tun|tap|macvtap|vrrp|lxcbr)" | cut -d " " -f 2 | tr -d : | cut -d@ -f1 | tr "\n" " ") + interfaces=$(/sbin/ip address show up | grep "^[0-9]*:" | grep -E -v "(lo|vnet|docker|veth|tun|tap|macvtap|vrrp|lxcbr|wg)" | cut -d " " -f 2 | tr -d : | cut -d@ -f1 | tr "\n" " ") else interfaces=$(/sbin/ifconfig -s | tail -n +2 | grep -E -v "^(lo|vnet|docker|veth|tun|tap|macvtap|vrrp)" | cut -d " " -f 1 |tr "\n" " ") fi From d834e69cf6df2bbb207fa3785c632accbf4e1e40 Mon Sep 17 00:00:00 2001 From: Alexis Ben Miloud--Josselin Date: Mon, 22 Nov 2021 15:51:37 +0100 Subject: [PATCH 12/18] Add IS_NETWORKING_SERVICE check --- evocheck.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/evocheck.sh b/evocheck.sh index d562f4d..8dc63c6 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -594,6 +594,16 @@ check_interfacesgw() { number=$(grep -Ec "^[^#]*gateway [0-9a-fA-F]+:" /etc/network/interfaces) test "$number" -gt 1 && failed "IS_INTERFACESGW" "there is more than 1 IPv6 gateway" } +# Verification de l’état du service networking +check_networking_service() { + if is_debian_stretch || is_debian_buster || is_debian_bullseye; then + if systemctl is-enabled networking.service > /dev/null; then + if ! systemctl is-active networking.service > /dev/null; then + failed "IS_NETWORKING_SERVICE" "networking.service is not active" + fi + fi + fi +} # Verification de la mise en place d'evobackup check_evobackup() { evobackup_found=$(find /etc/cron* -name '*evobackup*' | wc -l) @@ -1582,6 +1592,7 @@ main() { test "${IS_NETWORK_INTERFACES:=1}" = 1 && check_network_interfaces test "${IS_AUTOIF:=1}" = 1 && check_autoif test "${IS_INTERFACESGW:=1}" = 1 && check_interfacesgw + test "${IS_NETWORKING_SERVICE:=1}" = 1 && check_networking_service test "${IS_EVOBACKUP:=1}" = 1 && check_evobackup test "${IS_EVOBACKUP_EXCLUDE_MOUNT:=1}" = 1 && check_evobackup_exclude_mount test "${IS_USERLOGROTATE:=1}" = 1 && check_userlogrotate From 5fa58e83211850e7906201ad468869010f9b2e0a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 3 Jun 2022 09:05:06 +0200 Subject: [PATCH 13/18] Add abenmiloud to authors --- evocheck.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 8dc63c6..30047eb 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -19,7 +19,8 @@ Copyright 2009-2022 Evolix , Gregory Colpart , Jérémy Lecour , Tristan Pilat , - Victor Laborie + Victor Laborie , + Alexis Ben Miloud--Josselin , and others. evocheck comes with ABSOLUTELY NO WARRANTY. This is free software, From 1d75b5fbbf2a61a38a433d2330c9fd9aca3bd34a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 3 Jun 2022 09:07:41 +0200 Subject: [PATCH 14/18] fix CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e6169b3..2749b69 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,7 +21,7 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed -IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command +* IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command ## [22.04.1] 2022-04-25 From 38276b0271f0d20f3e379863f26bfac7733c9093 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 3 Jun 2022 09:10:19 +0200 Subject: [PATCH 15/18] Release 22.06 --- CHANGELOG | 12 ++++++++++-- evocheck.sh | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2749b69..572331e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,8 +5,6 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Added -* IS_AUTOIF: Ignore WireGuard interfaces - ### Changed ### Deprecated @@ -17,6 +15,16 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Security +## [22.06] 2022-06-03 + +### Added + +* IS_AUTOIF: Ignore WireGuard interfaces + +### Changed + +* IS_DEBIANSECURITY: Fix Debian security repo for Bullseye, cf https://www.debian.org/releases/stable/errata + ## [22.05] 2022-05-12 ### Changed diff --git a/evocheck.sh b/evocheck.sh index 30047eb..6bba06c 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -4,7 +4,7 @@ # Script to verify compliance of a Debian/OpenBSD server # powered by Evolix -VERSION="22.05" +VERSION="22.06" readonly VERSION # base functions From 9ad34bd48595782b493c80e44ea0d1bca6e6ca61 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 3 Jun 2022 09:11:54 +0200 Subject: [PATCH 16/18] fix changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 572331e..922b2be 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Added * IS_AUTOIF: Ignore WireGuard interfaces +* IS_NETWORKING_SERVICE: check if networking service is enabled ### Changed From e38aa5636f9da13764078dd4023454f8c2c986f1 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 16 Jun 2021 15:41:12 +0200 Subject: [PATCH 17/18] sshpermitrootno: Use effective configuration. Fixes #129. --- evocheck.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 6bba06c..21672f2 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -1217,14 +1217,20 @@ check_usrsharescripts() { test "$expected" = "$actual" || failed "IS_USRSHARESCRIPTS" "/usr/share/scripts must be $expected" } check_sshpermitrootno() { - if is_debian_stretch || is_debian_buster || is_debian_bullseye; then - if grep -q "^PermitRoot" /etc/ssh/sshd_config; then - grep -E -qi "PermitRoot.*no" /etc/ssh/sshd_config \ - || failed "IS_SSHPERMITROOTNO" "PermitRoot should be set at no" - fi + sshd_args="-C addr=,user=,host=,laddr=,lport=0" + if is_debian_jessie || is_debian_stretch; then + # Noop, we'll use the default $sshd_args + : + elif is_debian_buster; then + sshd_args="${sshd_args},rdomain=" else - grep -E -qi "PermitRoot.*no" /etc/ssh/sshd_config \ - || failed "IS_SSHPERMITROOTNO" "PermitRoot should be set at no" + # NOTE: From Debian Bullseye 11 onward, with OpenSSH 8.1, the argument + # -T doesn't require the additional -C. + sshd_args= + fi + # XXX: We want parameter expension here + if ! (sshd -T $sshd_args | grep -q 'permitrootlogin no'); then + failed "IS_SSHPERMITROOTNO" "PermitRoot should be set to no" fi } check_evomaintenanceusers() { From 1a08da8afa3712f1c5289637671dba5e9b6bcfa9 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 3 Jun 2022 11:18:43 +0200 Subject: [PATCH 18/18] add support for options in sources.list Exemple for such syntax (from the manual): deb [ arch=amd64,armel ] http://deb.debian.org/debian bullseye main --- evocheck.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 21672f2..69e2cf9 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -236,11 +236,11 @@ check_debiansecurity() { if is_debian_bullseye; then # https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.html#security-archive # https://www.debian.org/security/ - pattern="^deb http://security\.debian\.org/debian-security/? bullseye-security main" + pattern="^deb ?(\[.*\])? ?http://security\.debian\.org/debian-security/? bullseye-security main" elif is_debian_buster; then - pattern="^deb http://security\.debian\.org/debian-security/? buster/updates main" + pattern="^deb ?(\[.*\])? ?http://security\.debian\.org/debian-security/? buster/updates main" elif is_debian_stretch; then - pattern="^deb http://security\.debian\.org/debian-security/? stretch/updates main" + pattern="^deb ?(\[.*\])? ?http://security\.debian\.org/debian-security/? stretch/updates main" else pattern="^deb.*security" fi