diff --git a/applications/openshift/logging/directory_access_var_log_kube_audit/oval/shared.xml b/applications/openshift/logging/directory_access_var_log_kube_audit/oval/shared.xml index f6137380bd5d..314f48ff17d2 100644 --- a/applications/openshift/logging/directory_access_var_log_kube_audit/oval/shared.xml +++ b/applications/openshift/logging/directory_access_var_log_kube_audit/oval/shared.xml @@ -7,13 +7,13 @@ - + - + @@ -26,10 +26,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_kube_audit_augenrules" version="1"> + - + ^/etc/audit/rules\.d/.*\.rules$ 1 @@ -38,10 +38,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_kube_audit_auditctl" version="1"> + - + /etc/audit/audit.rules 1 diff --git a/applications/openshift/logging/directory_access_var_log_oauth_audit/oval/shared.xml b/applications/openshift/logging/directory_access_var_log_oauth_audit/oval/shared.xml index c7f1506c2965..a1f75cfb451c 100644 --- a/applications/openshift/logging/directory_access_var_log_oauth_audit/oval/shared.xml +++ b/applications/openshift/logging/directory_access_var_log_oauth_audit/oval/shared.xml @@ -7,13 +7,13 @@ - + - + @@ -26,10 +26,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_oauth_audit_augenrules" version="1"> + - + ^/etc/audit/rules\.d/.*\.rules$ 1 @@ -38,10 +38,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_oauth_audit_auditctl" version="1"> + - + /etc/audit/audit.rules 1 diff --git a/applications/openshift/logging/directory_access_var_log_ocp_audit/oval/shared.xml b/applications/openshift/logging/directory_access_var_log_ocp_audit/oval/shared.xml index 579dde10725b..1af2c2d07fcd 100644 --- a/applications/openshift/logging/directory_access_var_log_ocp_audit/oval/shared.xml +++ b/applications/openshift/logging/directory_access_var_log_ocp_audit/oval/shared.xml @@ -7,13 +7,13 @@ - + - + @@ -26,10 +26,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_ocp_audit_augenrules" version="1"> + - + ^/etc/audit/rules\.d/.*\.rules$ 1 @@ -38,10 +38,10 @@ - + comment="defined audit rule must exist" id="test_directory_access_var_log_ocp_audit_auditctl" version="1"> + - + /etc/audit/audit.rules 1 diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/oval/shared.xml b/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/oval/shared.xml index 245224288fac..9fd0f27c9e9c 100644 --- a/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/oval/shared.xml +++ b/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/oval/shared.xml @@ -30,7 +30,7 @@ -{{% macro test_directory_acccess_var_log_audit(audit_tool, filepath, bits) %}} +{{% macro test_directory_access_var_log_audit(audit_tool, filepath, bits) %}} @@ -41,9 +41,9 @@ {{% endmacro %}} -{{{ test_directory_acccess_var_log_audit("augenrules", "^/etc/audit/rules\.d/.*\.rules$", "32") }}} -{{{ test_directory_acccess_var_log_audit("augenrules", "^/etc/audit/rules\.d/.*\.rules$", "64") }}} -{{{ test_directory_acccess_var_log_audit("auditctl", "/etc/audit/audit.rules", "32") }}} -{{{ test_directory_acccess_var_log_audit("auditctl", "/etc/audit/audit.rules", "64") }}} +{{{ test_directory_access_var_log_audit("augenrules", "^/etc/audit/rules\.d/.*\.rules$", "32") }}} +{{{ test_directory_access_var_log_audit("augenrules", "^/etc/audit/rules\.d/.*\.rules$", "64") }}} +{{{ test_directory_access_var_log_audit("auditctl", "/etc/audit/audit.rules", "32") }}} +{{{ test_directory_access_var_log_audit("auditctl", "/etc/audit/audit.rules", "64") }}} diff --git a/shared/checks/oval/audit_rules_auditctl.xml b/shared/checks/oval/audit_rules_auditctl.xml index 27a4e5489599..a08a43310046 100644 --- a/shared/checks/oval/audit_rules_auditctl.xml +++ b/shared/checks/oval/audit_rules_auditctl.xml @@ -8,11 +8,30 @@ Test if auditctl is in use for audit rules. +{{% if product in ['rhcos4'] %}} + + + + +{{% else %}} +{{% endif %}} +{{% if product in ['rhcos4'] %}} + + + + + + /usr/lib/systemd/system/audit-rules.service + ^ExecStart=\/sbin\/auditctl.*$ + 1 + +{{% endif %}} + diff --git a/shared/checks/oval/audit_rules_augenrules.xml b/shared/checks/oval/audit_rules_augenrules.xml index 7b46a1c9f136..92620913a0d9 100644 --- a/shared/checks/oval/audit_rules_augenrules.xml +++ b/shared/checks/oval/audit_rules_augenrules.xml @@ -8,11 +8,30 @@ Test if augenrules is enabled for audit rules. +{{% if product in ['rhcos4'] %}} + + + + +{{% else %}} +{{% endif %}} +{{% if product in ['rhcos4'] %}} + + + + + + /usr/lib/systemd/system/audit-rules.service + ^ExecStart=(\/usr|)?\/sbin\/augenrules.*$ + 1 + +{{% endif %}} +