Initial 6.1.2.1.3 commit

ComplianceAsCode · Dec 6, 2024 · 5d4179f · 5d4179f
1 parent bf4ee45
commit 5d4179f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/controls/cis_ubuntu2404.yml b/controls/cis_ubuntu2404.yml
@@ -2261,7 +2261,8 @@ controls:
       - l1_server
       - l1_workstation
     status: planned
-    notes: TODO. Rule does not seem to be implemented. Analogous to ubuntu2204/4.2.1.1.3.
+    rules:
+      - service_systemd-journal-upload_enabled
 
   - id: 6.1.2.1.4
     title: Ensure systemd-journal-remote service is not in use (Automated)

diff --git a/...em/logging/journald/service_systemd-journal-upload_enabled/tests/service_disabled.fail.sh b/...em/logging/journald/service_systemd-journal-upload_enabled/tests/service_disabled.fail.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# packages = systemd
+
+{{{ bash_package_install("systemd-journal-upload") }}}
+
+SYSTEMCTL_EXEC='/usr/bin/systemctl'
+"$SYSTEMCTL_EXEC" stop 'systemd-journal-upload.service'
+"$SYSTEMCTL_EXEC" disable 'systemd-journal-upload.service'
diff --git a/...tem/logging/journald/service_systemd-journal-upload_enabled/tests/service_enabled.pass.sh b/...tem/logging/journald/service_systemd-journal-upload_enabled/tests/service_enabled.pass.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# packages = systemd
+
+{{{ bash_package_install("systemd-journal-upload") }}}
+
+SYSTEMCTL_EXEC='/usr/bin/systemctl'
+"$SYSTEMCTL_EXEC" unmask 'systemd-journal-upload.service'
+"$SYSTEMCTL_EXEC" --now enable 'systemd-journal-upload.service'
diff --git a/products/ubuntu2004/product.yml b/products/ubuntu2004/product.yml
@@ -46,6 +46,7 @@ platform_package_overrides:
   pam: libpam-runtime
   shadow: login
   sssd: sssd-common
+  systemd-journal-upload: systemd-journal-remote
   openssl-pkcs11: libpam-pkcs11
 
 reference_uris:

diff --git a/tests/data/product_stability/ubuntu2404.yml b/tests/data/product_stability/ubuntu2404.yml
@@ -60,6 +60,7 @@ platform_package_overrides:
   shadow: login
   sssd: sssd-common
   sssd-ldap: null
+  systemd-journal-upload: systemd-journal-remote
   uefi: null
   zipl: s390utils-base
 product: ubuntu2404