From c3010e464d0365a37057939038c5b33791991a92 Mon Sep 17 00:00:00 2001 From: "YiLin.Li" Date: Fri, 1 Sep 2023 19:27:30 +0800 Subject: [PATCH] scanners: support scanning of non-UTF-8 OS Signed-off-by: YiLin.Li --- scanners/services/3.18-uninstall-the-avahi-server.sh | 3 ++- scanners/services/3.19-uninstall-the-kexec-tools.sh | 3 ++- scanners/services/3.20-uninstall-the-firstboot.sh | 3 ++- scanners/services/3.21-uninstall-the-wpa_supplicant.sh | 3 ++- scanners/services/3.22-ensure-NIS-Client-is-not-installed.sh | 3 ++- scanners/services/3.25-ensure-xinetd-is-not-installed.sh | 3 ++- .../4.64-ensure-nftables-is-not-installed.sh | 3 ++- ...-ensure-firewalld-is-not-installed-or-stopped-and-masked.sh | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/scanners/services/3.18-uninstall-the-avahi-server.sh b/scanners/services/3.18-uninstall-the-avahi-server.sh index 0e85c74..ee9cdda 100644 --- a/scanners/services/3.18-uninstall-the-avahi-server.sh +++ b/scanners/services/3.18-uninstall-the-avahi-server.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result=false rpm -q avahi | grep -Psiq "^package\s+avahi\s+is\s+not\s+installed$" && result=true @@ -6,4 +7,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/services/3.19-uninstall-the-kexec-tools.sh b/scanners/services/3.19-uninstall-the-kexec-tools.sh index e00c03e..6e86439 100644 --- a/scanners/services/3.19-uninstall-the-kexec-tools.sh +++ b/scanners/services/3.19-uninstall-the-kexec-tools.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result=false rpm -q kexec-tools | grep -Psiq "^package\s+kexec-tools\s+is\s+not\s+installed$" && result=true @@ -6,4 +7,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/services/3.20-uninstall-the-firstboot.sh b/scanners/services/3.20-uninstall-the-firstboot.sh index e32be54..d58166d 100644 --- a/scanners/services/3.20-uninstall-the-firstboot.sh +++ b/scanners/services/3.20-uninstall-the-firstboot.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result=false rpm -q firstboot | grep -Psiq "^package\s+firstboot\s+is\s+not\s+installed$" && result=true @@ -6,4 +7,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/services/3.21-uninstall-the-wpa_supplicant.sh b/scanners/services/3.21-uninstall-the-wpa_supplicant.sh index 902db48..1844599 100644 --- a/scanners/services/3.21-uninstall-the-wpa_supplicant.sh +++ b/scanners/services/3.21-uninstall-the-wpa_supplicant.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result=false rpm -q wpa_supplicant | grep -Psiq "^package\s+wpa_supplicant\s+is\s+not\s+installed$" && result=true @@ -6,4 +7,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/services/3.22-ensure-NIS-Client-is-not-installed.sh b/scanners/services/3.22-ensure-NIS-Client-is-not-installed.sh index ca7f2e5..6d621a1 100644 --- a/scanners/services/3.22-ensure-NIS-Client-is-not-installed.sh +++ b/scanners/services/3.22-ensure-NIS-Client-is-not-installed.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LANG="en_US.UTF-8" result=false rpm -q ypbind | grep -Psiq "^package\s+ypbind\s+is\s+not\s+installed$" && result=true @@ -7,4 +8,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/services/3.25-ensure-xinetd-is-not-installed.sh b/scanners/services/3.25-ensure-xinetd-is-not-installed.sh index 5abb602..9ff4bcb 100644 --- a/scanners/services/3.25-ensure-xinetd-is-not-installed.sh +++ b/scanners/services/3.25-ensure-xinetd-is-not-installed.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LANG="en_US.UTF-8" result=false rpm -q xinetd | grep -Psiq "^package\s+xinetd\s+is\s+not\s+installed$" && result=true @@ -7,4 +8,4 @@ if [ "$result" == true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/system-configurations/4.64-ensure-nftables-is-not-installed.sh b/scanners/system-configurations/4.64-ensure-nftables-is-not-installed.sh index 246e45f..fda3fa8 100644 --- a/scanners/system-configurations/4.64-ensure-nftables-is-not-installed.sh +++ b/scanners/system-configurations/4.64-ensure-nftables-is-not-installed.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result=false rpm -q nftables | grep -Psiq "^package\s+nftables\s+is\s+not\s+installed$" && result=true @@ -6,4 +7,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi diff --git a/scanners/system-configurations/4.65-ensure-firewalld-is-not-installed-or-stopped-and-masked.sh b/scanners/system-configurations/4.65-ensure-firewalld-is-not-installed-or-stopped-and-masked.sh index bd66ba6..b119582 100644 --- a/scanners/system-configurations/4.65-ensure-firewalld-is-not-installed-or-stopped-and-masked.sh +++ b/scanners/system-configurations/4.65-ensure-firewalld-is-not-installed-or-stopped-and-masked.sh @@ -1,3 +1,4 @@ +export LANG="en_US.UTF-8" result="" rpm -q firewalld | grep -Psiq "^package\s+firewalld\s+is\s+not\s+installed$" && result=true @@ -7,4 +8,4 @@ if [ "$result" = true ]; then echo "pass" else echo "fail" -fi \ No newline at end of file +fi -- Gitee