enhance OVAL for enable_fips_mode

[vojtapolasek]

Description:

• add more tests to check /etc/kernel/cmdline and also /boot/loader/entries/*.conf files
• use correct check based on prodtype, inspired by grub2_template
• if we are on S390X architecture, check /boot/loader/entries/*.conf only, there is no grubenv file

Rationale:

• fixes https://bugzilla.redhat.com/show_bug.cgi?id=2129100

Review Hints:

1. provision X86 and S390X RHEL 8 and RHEL 9 machines
2. ./build_product rhel8 rhel9
3. on each machine run fips-mode-setup --enable && update-crypto-policies --set fips:ospp
4. run oscap xccdf eval --profile ospp --report result.html --rule xccdf_org.ssgproject.content_rule_enable_fips_mode <datastream.xml>
5. inspect the HTML report to see that checks are checking corect things

[github-actions]

Start a new ephemeral environment with changes proposed in this pull request:

rhel8 (from CTF) Environment (using Fedora as testing environment)

Fedora Testing Environment

Oracle Linux 8 Environment

[github-actions]

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff

OVAL for rule 'xccdf_org.ssgproject.content_rule_enable_fips_mode' differs.
--- oval:ssg-enable_fips_mode:def:1
+++ oval:ssg-enable_fips_mode:def:1
@@ -4,6 +4,12 @@
 extend_definition oval:ssg-enable_dracut_fips_module:def:1
 extend_definition oval:ssg-configure_crypto_policy:def:1
 criterion oval:ssg-test_system_crypto_policy_value:tst:1
+criterion oval:ssg-test_fips_1_argument_in_etc_kernel_cmdline:tst:1
 criteria OR
+criteria AND
+extend_definition oval:ssg-system_info_architecture_s390_64:def:1
+criterion oval:ssg-test_fips_1_argument_in_boot_loader_entries_conf:tst:1
+criteria AND
+criteria None
 extend_definition oval:ssg-system_info_architecture_s390_64:def:1
 criterion oval:ssg-test_grubenv_fips_mode:tst:1

[marcusburghardt]

Thanks for the update. It is difficult to test this rule and I believe this is the reason to not have test scenario scripts. I have some comments. Could you take a look on them, please?

[marcusburghardt]

Thanks for updating this rule @vojtapolasek .

We have discussed privately on how to include test scenarios for this rule and concluded it would be possible but would not be simple. So we can merge this PR now to not block the fix and work on test scenarios in a separate PR.

[codeclimate]

Code Climate has analyzed commit 78f087f and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 53.2% (0.0% change).

View more on Code Climate.