From f340077ef9d972316d3507e2e0f8276fc24c9207 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:35:39 +0200 Subject: [PATCH 1/8] Redefine vlock package name for Ubuntu 22.04 --- .../console_screen_locking/vlock_installed/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/vlock_installed/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/vlock_installed/rule.yml index 0aa51081b17..fad96ae8ebd 100644 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/vlock_installed/rule.yml +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/vlock_installed/rule.yml @@ -58,3 +58,4 @@ template: pkgname@ubuntu1604: vlock pkgname@ubuntu1804: vlock pkgname@ubuntu2004: vlock + pkgname@ubuntu2204: vlock From ae32a0ed8ac410fc7a405a374819e63a3284e9f0 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:36:34 +0200 Subject: [PATCH 2/8] Redefine pam_pkcs11 package name for Ubuntu 22.04 --- .../smart_card_login/install_smartcard_packages/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml index 7514548867e..b528f45e501 100644 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml @@ -77,6 +77,7 @@ template: pkgname@ubuntu1604: libpam-pkcs11 pkgname@ubuntu1804: libpam-pkcs11 pkgname@ubuntu2004: libpam-pkcs11 + pkgname@ubuntu2204: libpam-pkcs11 {{% endif %}} fixtext: |- From 6c803bf3bd34a653bc73ff024a6867a56a4d235d Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:37:30 +0200 Subject: [PATCH 3/8] Redefine opensc package name for Ubuntu 22.04 --- .../smart_card_login/package_opensc_installed/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml index 2d9860b0d5d..cc90d14dfe7 100644 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml @@ -54,6 +54,7 @@ template: pkgname@ubuntu1604: opensc-pkcs11 pkgname@ubuntu1804: opensc-pkcs11 pkgname@ubuntu2004: opensc-pkcs11 + pkgname@ubuntu2204: opensc-pkcs11 fixtext: |- {{% if 'ubuntu' not in product %}} From b276b197d87f4b76703c079145fcc9449211e2a9 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:37:46 +0200 Subject: [PATCH 4/8] Redefine apparmor package name for Ubuntu 22.04 --- linux_os/guide/system/apparmor/apparmor_configured/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/apparmor/apparmor_configured/rule.yml b/linux_os/guide/system/apparmor/apparmor_configured/rule.yml index 6ae8fd79f25..4c5a7923f6c 100644 --- a/linux_os/guide/system/apparmor/apparmor_configured/rule.yml +++ b/linux_os/guide/system/apparmor/apparmor_configured/rule.yml @@ -62,4 +62,5 @@ template: packagename@ubuntu1604: apparmor packagename@ubuntu1804: apparmor packagename@ubuntu2004: apparmor + packagename@ubuntu2204: apparmor packagename@debian12: apparmor From 9dfce217c95d76ef584f533956c73046beeeb63f Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:37:58 +0200 Subject: [PATCH 5/8] Redefine /var/log group owner for Ubuntu 22.04 --- .../permissions_var_log_dir/file_groupowner_var_log/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml index 8b5becc7895..5623c03ed14 100644 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml @@ -44,6 +44,7 @@ template: gid_or_name@ubuntu1604: '110' gid_or_name@ubuntu1804: '110' gid_or_name@ubuntu2004: '110' + gid_or_name@ubuntu2204: syslog fixtext: |- {{{ describe_file_group_owner(file="/var/log", group=gid) }}} From 00b009f7e50191c9b0b1ec8756b48590a4d3341a Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 11:38:06 +0200 Subject: [PATCH 6/8] Redefine gdm package name for Ubuntu 22.04 --- .../guide/system/software/gnome/package_gdm_removed/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml b/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml index 44804d15ea7..542b4c0a503 100644 --- a/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml +++ b/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml @@ -71,3 +71,4 @@ template: pkgname@ubuntu1604: gdm3 pkgname@ubuntu1804: gdm3 pkgname@ubuntu2004: gdm3 + pkgname@ubuntu2204: gdm3 From 6cf77172925d05225fda238fb13e16c06d161a41 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 12:22:38 +0200 Subject: [PATCH 7/8] Redefine ssh service name for Ubuntu 22.04 --- linux_os/guide/services/ssh/service_sshd_enabled/rule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml b/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml index 9d2f306d5fc..69828ae7479 100644 --- a/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml +++ b/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml @@ -58,6 +58,7 @@ template: servicename@ubuntu1604: ssh servicename@ubuntu1804: ssh servicename@ubuntu2004: ssh + servicename@ubuntu2204: ssh packagename: openssh-server packagename@sle12: openssh packagename@sle15: openssh From d12d4ab2991a4c323a2d0c3b01c7f4ebb7f3225d Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 2 May 2024 12:43:47 +0200 Subject: [PATCH 8/8] Fix failing test on Ubuntu --- shared/templates/service_enabled/tests/service_disabled.fail.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/templates/service_enabled/tests/service_disabled.fail.sh b/shared/templates/service_enabled/tests/service_disabled.fail.sh index 6835217a802..439164021c6 100644 --- a/shared/templates/service_enabled/tests/service_disabled.fail.sh +++ b/shared/templates/service_enabled/tests/service_disabled.fail.sh @@ -1,5 +1,5 @@ #!/bin/bash -{{% if SERVICENAME == "sshd" %}} +{{% if SERVICENAME in ["ssh", "sshd"] %}} # platform = Not Applicable {{% endif %}} # packages = {{{ PACKAGENAME }}}