From ab17f170a57c1212d488fb24839be120a7d438e1 Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Sun, 19 May 2024 12:23:56 +0200 Subject: [PATCH 1/8] Fix regex for NETW-3200 --- include/tests_networking | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_networking b/include/tests_networking index 44a65708..24bfc7d1 100644 --- a/include/tests_networking +++ b/include/tests_networking @@ -750,7 +750,7 @@ UNCOMMON_PROTOCOL_DISABLED=0 # First check modprobe.conf if [ -f ${ROOTDIR}etc/modprobe.conf ]; then - DATA=$(${GREPBINARY} "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) + DATA=$(${GREPBINARY} "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) if [ -n "${DATA}" ]; then LogText "Result: found ${P} module disabled via modprobe.conf" UNCOMMON_PROTOCOL_DISABLED=1 @@ -759,7 +759,7 @@ # Then additional modprobe configuration files if [ -d ${ROOTDIR}etc/modprobe.d ]; then # Return file names (-l) and suppress errors (-s) - DATA=$(${GREPBINARY} -l -s "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) + DATA=$(${GREPBINARY} -l -s "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) if [ -n "${DATA}" ]; then UNCOMMON_PROTOCOL_DISABLED=1 for F in ${DATA}; do From 0515094a337a092b8ae530e6fa94ba583827c1fe Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Sun, 19 May 2024 12:34:57 +0200 Subject: [PATCH 2/8] Fix REGEX in FILE-6430 --- include/tests_filesystems | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_filesystems b/include/tests_filesystems index cabc27e7..3bc5ec3e 100644 --- a/include/tests_filesystems +++ b/include/tests_filesystems @@ -877,8 +877,8 @@ fi FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null) if [ -n "${FIND}" ]; then - FIND1=$(${GREPBINARY} -E "^blacklist \+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") - FIND2=$(${GREPBINARY} -E "^install \+${FS} \+/bin/true$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") + FIND1=$(${GREPBINARY} -E "^blacklist +${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") + FIND2=$(${GREPBINARY} -E "^install +${FS} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN LogText "Result: module ${FS} is blacklisted" From a6da9336af579703887e12cffe6a42ce55827756 Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Fri, 24 May 2024 08:15:50 +0200 Subject: [PATCH 3/8] Update tests_networking More elegant regex to accommodate for tabs and spaces. --- include/tests_networking | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_networking b/include/tests_networking index 24bfc7d1..764204cf 100644 --- a/include/tests_networking +++ b/include/tests_networking @@ -750,7 +750,7 @@ UNCOMMON_PROTOCOL_DISABLED=0 # First check modprobe.conf if [ -f ${ROOTDIR}etc/modprobe.conf ]; then - DATA=$(${GREPBINARY} "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) + DATA=$(${GREPBINARY} -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) if [ -n "${DATA}" ]; then LogText "Result: found ${P} module disabled via modprobe.conf" UNCOMMON_PROTOCOL_DISABLED=1 @@ -759,7 +759,7 @@ # Then additional modprobe configuration files if [ -d ${ROOTDIR}etc/modprobe.d ]; then # Return file names (-l) and suppress errors (-s) - DATA=$(${GREPBINARY} -l -s "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) + DATA=$(${GREPBINARY} -l -s -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) if [ -n "${DATA}" ]; then UNCOMMON_PROTOCOL_DISABLED=1 for F in ${DATA}; do From 9eafa7913c979033cf8c9d704e899bf553e211ac Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Fri, 24 May 2024 08:18:16 +0200 Subject: [PATCH 4/8] Update tests_filesystems More elegant regex to accommodate for tabs and spaces. --- include/tests_filesystems | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_filesystems b/include/tests_filesystems index 3bc5ec3e..58efe975 100644 --- a/include/tests_filesystems +++ b/include/tests_filesystems @@ -877,8 +877,8 @@ fi FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null) if [ -n "${FIND}" ]; then - FIND1=$(${GREPBINARY} -E "^blacklist +${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") - FIND2=$(${GREPBINARY} -E "^install +${FS} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") + FIND1=$(${GREPBINARY} -E "^blacklist[[:space:]]+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") + FIND2=$(${GREPBINARY} -E "^install[[:space:]]+${FS}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#") if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN LogText "Result: module ${FS} is blacklisted" From 79ad5fc0c94f700aca3669b3f748441d32eaba99 Mon Sep 17 00:00:00 2001 From: Maik Date: Tue, 25 Jun 2024 10:13:04 +0200 Subject: [PATCH 5/8] Accept Keberos translation in DE Language Kerberos is Kerberos in german. --- db/languages/de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/languages/de b/db/languages/de index 7932153a..ab4c76f9 100644 --- a/db/languages/de +++ b/db/languages/de @@ -106,4 +106,4 @@ STATUS_WEAK="SCHWACH" STATUS_YES="JA" TEXT_UPDATE_AVAILABLE="Aktualisierung verfügbar" TEXT_YOU_CAN_HELP_LOGFILE="Sie können durch Übermittlung Ihrer Logdatei helfen" -#SECTION_KERBEROS="Kerberos" +SECTION_KERBEROS="Kerberos" From bc88602e41c02d03229dc4ca571465bc87a70c47 Mon Sep 17 00:00:00 2001 From: ferorge <38674077+ferorge@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:19:55 -0300 Subject: [PATCH 6/8] Fix issue #1496 Added package and service name used in ubuntu 24.04. --- include/tests_insecure_services | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_insecure_services b/include/tests_insecure_services index 0a1dd955..564db774 100644 --- a/include/tests_insecure_services +++ b/include/tests_insecure_services @@ -41,7 +41,7 @@ if [ ${SKIPTEST} -eq 0 ]; then # Check for installed inetd daemon LogText "Test: Checking if inetd is installed" - if PackageIsInstalled "inetd"; then + if PackageIsInstalled "inetd" || PackageIsInstalled "inetutils-inetd"; then INETD_PACKAGE_INSTALLED=1 LogText "Result: inetd is installed" Display --indent 2 --text "- Installed inetd package" --result "${STATUS_FOUND}" --color YELLOW @@ -61,7 +61,7 @@ if [ ${SKIPTEST} -eq 0 ]; then # Check running processes LogText "Test: Searching for active inet daemon" - if IsRunning "inetd"; then + if IsRunning "inetd" || IsRunning "inetutils-inetd"; then LogText "Result: inetd is running" Display --indent 4 --text "- inetd status" --result "${STATUS_ACTIVE}" --color GREEN INETD_ACTIVE=1 From 623eaa76fe211075530e7fafd59b4ae06e7273da Mon Sep 17 00:00:00 2001 From: ferorge <38674077+ferorge@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:22:07 -0300 Subject: [PATCH 7/8] Fix issue #1497 Added kernel name for Hardkernel odroid XU4. --- include/tests_ports_packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ports_packages b/include/tests_ports_packages index 4a9fe6f3..35de8cd5 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -1378,7 +1378,7 @@ EOF if [ "${DPKGBINARY}" ]; then TESTED=1 - KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]" + KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]|linux-odroid-5422" KERNELS=$(${DPKGBINARY} -l 2> /dev/null | ${GREPBINARY} -E "${KERNEL_PKG_NAMES}" | ${WCBINARY} -l) if [ ${KERNELS} -eq 0 ]; then LogText "Result: found no kernels from dpkg -l output, which is unexpected" From 5f4c78972433f618ddf722687f06c02bc5308f19 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Tue, 10 Sep 2024 13:05:49 +0200 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b41e276..9c460d5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,8 +19,7 @@ ### Changed - Correction of software EOL database and inclusion of AIX entries - Support sysctl value perf_event_paranoid -> 2|3 -- Update of Turkish translation -- Update of Portuguese translation +- Update of translations: German, Portuguest, Turkish - Grammar and spell improvements - Improved package detection on Alpine Linux - Slackware support to check installed packges (functionPackageIsInstalled()) @@ -32,6 +31,7 @@ - CONT-8104 - Checking for errors, not only warning in docker info output - DBS-1826 - PostgreSQL detection improved for AlmaLinux, Rocky Linux, and FreeBSD - FILE-6344 - Test kernel version (major/minor) +- INSE-8000 - Added inetd package and service name used in ubuntu 24.04 - KRNL-5622 - Use systemctl get-default instead of following link - KRNL-5820 - Accept ulimit with -H parameter also - LOGG-2144 - Check for wazuh-agent presence on Linux systems @@ -43,6 +43,7 @@ - PKGS-7303 - Added version numbers to brew packages - PKGS-7370 - Cron job check for debsums improved - PKGS-7392 - Improved filtering of apt-check output (Ubuntu 24.04 may give an error) +- PKGS-7410 - Added kernel name for Hardkernel odroid XU4 ---------------------------------------------------------------------------------