Skip to content

Update grub2_uefi_password & grub2_uefi_admin_username #8438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jan-cerny merged 5 commits into from
Apr 19, 2022
Merged

Update grub2_uefi_password & grub2_uefi_admin_username #8438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f351ac8
Make grub2_uefi_password rule compliant for ol8
Feb 25, 2022
fbad97a
Apply grub2_uefi_password changes to rhel8
Jan 26, 2022
99c83ed
Update grub2_uefi_admin_username to use CPE
Mar 25, 2022
8d21756
Update grub2_uefi_password to use CPE
Mar 25, 2022
2daeb5b
Generalize changes in grub2_uefi_password
Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"The grub2 boot loader superuser should have a username that is hard to guess.") }}}

<criteria operator="OR">
{{{ oval_file_absent_criterion(grub2_uefi_boot_path + "/grub.cfg") }}}
<criterion comment="Superuser is defined in {{{ grub2_uefi_boot_path }}}/grub.cfg and it
isn't root, admin, administrator nor equal to any system username"
test_ref="test_bootloader_uefi_superuser_differ_from_other_users"/>
Expand All @@ -20,8 +19,6 @@
<object_component item_field="username" object_ref="object_uefi_user_accounts"/>
</local_variable>

{{{ oval_file_absent(grub2_uefi_boot_path + "/grub.cfg") }}}

<ind:textfilecontent54_state id="state_bootloader_uefi_superuser_differ_from_other_users"
version="1">
<ind:subexpression datatype="string" operation="not equal" var_check="all"
Expand Down
8 changes: 0 additions & 8 deletions linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/tests/no-grub.pass.sh
View file
Open in desktop

This file was deleted.

30 changes: 2 additions & 28 deletions linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,10 @@
{{{ oval_metadata("The UEFI grub2 boot loader should have password protection enabled.") }}}

<criteria operator="OR">
{{{ oval_file_absent_criterion(grub2_uefi_boot_path + "/grub.cfg") }}}
<criteria operator="AND">
<criteria comment="check both files to account for procedure change in documenation" operator="OR">
<criterion comment="make sure a password is defined in {{{ grub2_uefi_boot_path }}}/user.cfg" test_ref="test_grub2_uefi_password_usercfg" />
<criterion comment="make sure a password is defined in {{{ grub2_uefi_boot_path }}}/grub.cfg" test_ref="test_grub2_uefi_password_grubcfg" />
</criteria>
<criterion comment="make sure a superuser is defined in {{{ grub2_uefi_boot_path }}}/grub.cfg" test_ref="test_bootloader_uefi_superuser"/>
</criteria>
<criterion comment="make sure a password is defined in {{{ grub2_uefi_boot_path }}}/user.cfg" test_ref="test_grub2_uefi_password_usercfg" />
</criteria>
</definition>

{{{ oval_file_absent(grub2_uefi_boot_path + "/grub.cfg") }}}

<ind:textfilecontent54_test check="all" check_existence="all_exist" comment="superuser is defined in {{{ grub2_uefi_boot_path }}}/grub.cfg." id="test_bootloader_uefi_superuser" version="2">
<ind:object object_ref="object_bootloader_uefi_superuser" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="object_bootloader_uefi_superuser" version="2">
<ind:filepath>{{{ grub2_uefi_boot_path }}}/grub.cfg</ind:filepath>
<ind:pattern operation="pattern match">^[\s]*set[\s]+superusers=("?)[a-zA-Z_]+\1$</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>


<ind:textfilecontent54_test check="all" check_existence="all_exist" comment="make sure a password is defined in /boot/efi/EFI/redhat/user.cfg" id="test_grub2_uefi_password_usercfg" version="1">
<ind:object object_ref="object_grub2_uefi_password_usercfg" />
</ind:textfilecontent54_test>
Expand All @@ -34,12 +16,4 @@
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

<ind:textfilecontent54_test check="all" check_existence="all_exist" comment="make sure a password is defined in /boot/efi/EFI/redhat/grub.cfg" id="test_grub2_uefi_password_grubcfg" version="1">
<ind:object object_ref="object_grub2_uefi_password_grubcfg" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="object_grub2_uefi_password_grubcfg" version="1">
<ind:filepath>{{{ grub2_uefi_boot_path }}}/grub.cfg</ind:filepath>
<ind:pattern operation="pattern match">^[\s]*password_pbkdf2[\s]+.*[\s]+grub\.pbkdf2\.sha512.*$</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
</def-group>
7 changes: 0 additions & 7 deletions linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/tests/no-grub.pass.sh
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions products/ol8/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pkg_version: "ad986da3"
release_key_fingerprint: "76FD3DB13AB67410B89DB10E82562EA9AD986DA3"

dconf_gdm_dir: "local.d"
grub2_uefi_boot_path: "/boot/efi/EFI/redhat"

oval_feed_url: "https://linux.oracle.com/security/oval/com.oracle.elsa-all.xml.bz2"

Expand Down