diff --git a/linux_os/guide/system/auditing/bls_audit_option/kubernetes/shared.yml b/linux_os/guide/system/auditing/coreos_audit_option/kubernetes/shared.yml similarity index 100% rename from linux_os/guide/system/auditing/bls_audit_option/kubernetes/shared.yml rename to linux_os/guide/system/auditing/coreos_audit_option/kubernetes/shared.yml diff --git a/linux_os/guide/system/auditing/bls_audit_option/rule.yml b/linux_os/guide/system/auditing/coreos_audit_option/rule.yml similarity index 98% rename from linux_os/guide/system/auditing/bls_audit_option/rule.yml rename to linux_os/guide/system/auditing/coreos_audit_option/rule.yml index 23f00842ebbb..7879ae9cd52b 100644 --- a/linux_os/guide/system/auditing/bls_audit_option/rule.yml +++ b/linux_os/guide/system/auditing/coreos_audit_option/rule.yml @@ -48,7 +48,7 @@ ocil: |-
template: - name: bls_entries_option + name: coreos_kernel_option vars: arg_name: audit arg_value: '1' diff --git a/rhcos4/profiles/moderate.profile b/rhcos4/profiles/moderate.profile index e3348add8abe..a808158bbfd4 100644 --- a/rhcos4/profiles/moderate.profile +++ b/rhcos4/profiles/moderate.profile @@ -548,8 +548,8 @@ selections: # AU-3 - package_audit_installed - - bls_audit_option - grub2_audit_backlog_limit_argument + - coreos_audit_option #- grub2_slub_debug_argument - grub2_page_poison_argument - grub2_vsyscall_argument diff --git a/shared/templates/template_OVAL_coreos_kernel_option b/shared/templates/template_OVAL_coreos_kernel_option new file mode 100644 index 000000000000..9a161ba17368 --- /dev/null +++ b/shared/templates/template_OVAL_coreos_kernel_option @@ -0,0 +1,71 @@ + + + + Ensure that the most recent (default) CoreOS boot loader entry is configured to run Linux operating system with argument {{{ ARG_NAME_VALUE }}} + {{{- oval_affected(products) }}} + Ensure {{{ ARG_NAME_VALUE }}} option is configured in the 'options' line in /boot/loader/entries/ostree-2-*.conf (or ostree-1-*.conf if the second version does not exists). + + + + + + + + + + + + + + + + + + + ^/boot/loader/entries/ostree-2-*\.conf$ + ^options (.*)$ + 1 + + + + ^(?:.*\s)?{{{ ESCAPED_ARG_NAME_VALUE }}}(?:\s.*)?$ + + + + + + + + + ^/boot/loader/entries/ostree-1-*\.conf$ + ^options (.*)$ + 1 + + + + ^(?:.*\s)?{{{ ESCAPED_ARG_NAME_VALUE }}}(?:\s.*)?$ + + + + + + + + ^/boot/loader/entries/ostree-2-*\.conf + + + diff --git a/ssg/templates.py b/ssg/templates.py index a27fbb6cb614..e238ed76a09c 100644 --- a/ssg/templates.py +++ b/ssg/templates.py @@ -380,6 +380,11 @@ def zipl_bls_entries_option(data, lang): return bls_entries_option(data, lang) +@template(["oval"]) +def coreos_kernel_option(data, lang): + return bls_entries_option(data, lang) + + class Builder(object): """ Class for building all templated content for a given product.