From 56ce017b4f1a32a991c1dbdba907d43cf378cea3 Mon Sep 17 00:00:00 2001 From: marcus-cr Date: Wed, 26 Oct 2016 06:35:47 -0400 Subject: [PATCH 1/3] Updated profiles (#300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated profiles Added “personal” machine-role, changed “desktop” to “workstation”. * Changed Default Profile Amended roles of system: changed “desktop” to “workstation”, and added “personal”. --- default.prf | 2 +- include/profiles | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.prf b/default.prf index ef497011..1b949d42 100644 --- a/default.prf +++ b/default.prf @@ -39,7 +39,7 @@ language= # Lynis Enterprise license key license-key= -# Defines the role of the system (desktop, server) +# Defines the role of the system (personal, workstation or server) machine-role=server # Profile name, will be used as title/description diff --git a/include/profiles b/include/profiles index 7988995e..4e543fad 100644 --- a/include/profiles +++ b/include/profiles @@ -174,10 +174,10 @@ LOG_INCORRECT_OS=${SETTING_LOG_TESTS_INCORRECT_OS} ;; - # What type of machine we are scanning (eg. desktop, server, server with storage) + # What type of machine we are scanning (eg. personal, workstation or server) machine-role | machine_role) MACHINE_ROLE="${VALUE}" - AddSetting "machine-role" "${MACHINE_ROLE}" "Machine role (server or desktop)" + AddSetting "machine-role" "${MACHINE_ROLE}" "Machine role (personal, workstation or server)" ;; # Define if any found NTP daemon instance is configured as a server or client From 9208125c0660e426612ddb70dda087cd4142942d Mon Sep 17 00:00:00 2001 From: marcus-cr Date: Wed, 26 Oct 2016 06:36:31 -0400 Subject: [PATCH 2/3] Malware Scanner Colors for Personal Machine Role (#301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Results for malware scanner will show different color for “personal” machine-roles (in yellow) rather than the other roles (in red). Added for leniency towards typical personal PC users for not having malware scanner (should be a suggestion). Also included log text result if no scanner found, regardless of machine-role. --- include/tests_hardening | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/tests_hardening b/include/tests_hardening index 93c01ff5..4ed6f8e5 100644 --- a/include/tests_hardening +++ b/include/tests_hardening @@ -105,9 +105,15 @@ AddHP 3 3 else LogText "Result: no malware scanner found" + if [$MACHINE_ROLE = "personal"]; then + Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color YELLOW + else + Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color RED + fi Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color RED ReportSuggestion ${TEST_NO} "Harden the system by installing at least one malware scanner, to perform periodic file system scans" "-" "Install a tool like rkhunter, chkrootkit, OSSEC" AddHP 1 3 + LogText "Result: no malware scanner found" fi fi # From 94d31bba225b322edc02b2f79dce84a9d86b8bc5 Mon Sep 17 00:00:00 2001 From: marcus-cr Date: Wed, 26 Oct 2016 06:37:35 -0400 Subject: [PATCH 3/3] NETW-3030 - DHCPD Support Added (#299) Added support for DHCPD --- include/tests_networking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_networking b/include/tests_networking index 9c890128..26d042f0 100644 --- a/include/tests_networking +++ b/include/tests_networking @@ -574,7 +574,7 @@ # Description : Checking for DHCP client Register --test-no NETW-3030 --weight L --network NO --category security --description "Checking DHCP client status" if [ ${SKIPTEST} -eq 0 ]; then - IsRunning dhclient + IsRunning dhclient || IsRunning dhcpd if [ ${RUNNING} -eq 1 ]; then Display --indent 2 --text "- Checking status DHCP client" --result "${STATUS_RUNNING}" --color WHITE DHCP_CLIENT_RUNNING=1