Reorganize zIPL rules #5888

yuumasato · 2020-06-26T10:25:10Z

Description:

Separate from the zIPL rules what is exclusive to zIPL, which is:
- Ensure bootmap is up to date (with rule, check and fix)
- Ensure zIPL is using BLS entries only (with rule and check)
  - IMO, providing automated remediation for this is tricky and risky.
With this PR, the zIPL argument rules are much simpler now.

Rationale:

Separate common aspects to its own rules

openshift-ci-robot · 2020-06-26T10:25:11Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

JAORMX · 2020-07-01T11:07:35Z

/test all

Instead of having each zIPL argument rule check for BLS compliance, let's split into its own rule.

Automated remediation to remove non-BLS boot entries from /etc/zipl.conf is tricky and can lead to broken entries or removal of all of them.

Instead of having each zIPL argument rule check if zIPL bootmap is up to date, let's split it into its own rule.

These tests mock existence of zIPL files.

yuumasato · 2020-07-03T17:11:05Z

linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/ansible/shared.yml

+        path: /etc/zipl.conf
+      register: zipl_conf
+
+    # TODO: handle /boot/loader/entries/*.conf


I don't see an easy way to do this, leaving as a TODO item for the future.

vojtapolasek

Thank you for these changes. Please also modify the files pertaining to "stable profile" tests, currently the test is failing. See comments for questions and suggestions.
I ran all tests manually and they work as expected, except for the wrong path in the bash remediation for zipl_bootmap_is_up_to_date. When I fixed it everything was working.

linux_os/guide/system/bootloader-zipl/zipl_bls_entries_only/rule.yml

linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/rule.yml

linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/bash/shared.sh

linux_os/guide/system/bootloader-zipl/zipl_bls_entries_only/oval/shared.xml

There can be leading spaces before 'image'.

There is no need to perform pattern match, the check just needs to examine /etc/zipl.conf file.

Add RHEL-8 CCE identifiers for: - zipl_bls_entries_only - zipl_bootmap_is_up_to_date

Update the profile reference file.

yuumasato · 2020-07-08T12:41:18Z

Note: references to SFRs to be added later.

The zIPL rules are inherited from OSPP profile

mildas · 2020-07-08T13:29:06Z

Changes identified:
Rule zipl_bls_entries_only:
OVAL check is newly added.
Rule zipl_bootmap_is_up_to_date:
Bash remediation is newly added.
OVAL check is newly added.
Ansible remediation newly added.
Profile ospp on rhel8:
Rule zipl_bootmap_is_up_to_date, zipl_bls_entries_only added to ospp profile.
Profile cui on rhel8:
CUI profile extends changed OSPP profile.
Profile stig on rhel8:
Rule !zipl_bls_entries_only, !zipl_bootmap_is_up_to_date added to stig profile.
STIG profile extends changed OSPP profile.
Profile rhelh-stig on rhel8:
RHELH-STIG profile extends changed STIG profile.
Profile rhelh-vpp on rhel8:
RHELH-VPP profile extends changed OSPP profile.
Profile ospp-mls on rhel8:
OSPP-MLS profile extends changed OSPP profile.
Profile ospp on tests:
Rule zipl_bootmap_is_up_to_date, zipl_bls_entries_only added to ospp profile.

Recommended tests to execute:
build_product rhel8
tests/test_suite.py rule --libvirt qemu:///system test-suite-vm --remediate-using bash --datastream build/ssg-rhel8-ds.xml zipl_bls_entries_only
tests/test_suite.py rule --libvirt qemu:///system test-suite-vm --remediate-using ansible --datastream build/ssg-rhel8-ds.xml zipl_bootmap_is_up_to_date
tests/test_suite.py rule --libvirt qemu:///system test-suite-vm --remediate-using bash --datastream build/ssg-rhel8-ds.xml zipl_bootmap_is_up_to_date
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml cui
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml ospp-mls
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml rhelh-vpp
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml ospp
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml rhelh-stig
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-rhel8-ds.xml stig
build_product tests
tests/test_suite.py profile --libvirt qemu:///system test-suite-vm --datastream build/ssg-tests-ds.xml ospp

vojtapolasek · 2020-07-08T13:35:39Z

Please update the STIG stable profile as well.

yuumasato · 2020-07-08T13:47:42Z

Please update the STIG stable profile as well.

I actually unselected the zIPL rules from the STIG Profile.
33bae25 is going through Jenkins now.

yuumasato · 2020-07-09T07:54:38Z

/retest

matejak · 2020-07-09T09:35:14Z

Thank you for the PR, merging!

yuumasato · 2020-07-09T10:15:24Z

Thanks for the reviews, :)

openshift-ci-robot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jun 26, 2020

yuumasato mentioned this pull request Jun 26, 2020

Extend bls_entries_options to check for runtime and $kernelopts #5887

Closed

yuumasato force-pushed the unload_zipl_rules branch from e222c63 to dc415f0 Compare July 2, 2020 14:19

yuumasato added 8 commits July 3, 2020 18:28

Add rule to check for zIPL conformance to BLS

8cbec60

Instead of having each zIPL argument rule check for BLS compliance, let's split into its own rule.

zipl_bls_entries_only: Add OVAL and tests

5e3b190

zipl_bls_entries_only: Add no-remediation warning

05e5b05

Automated remediation to remove non-BLS boot entries from /etc/zipl.conf is tricky and can lead to broken entries or removal of all of them.

Add rule to check hotness of zIPL bootmap

53d811e

Instead of having each zIPL argument rule check if zIPL bootmap is up to date, let's split it into its own rule.

zipl_bootmap_is_up_to_date: Add OVAL check

b9f2738

zipl_bootmap_is_up_to_date: Add mock tests

97aff87

These tests mock existence of zIPL files.

zipl_bootmap_is_up_to_date: Add remediations

180e57b

Select zIPL specific rules in OSPP profile

9370372

yuumasato force-pushed the unload_zipl_rules branch from dc415f0 to 9370372 Compare July 3, 2020 17:05

yuumasato commented Jul 3, 2020

View reviewed changes

yuumasato marked this pull request as ready for review July 3, 2020 17:11

openshift-ci-robot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Jul 3, 2020

yuumasato mentioned this pull request Jul 3, 2020

Add template for zIPL boot entry option #5908

Merged

matejak self-assigned this Jul 8, 2020

vojtapolasek requested changes Jul 8, 2020

View reviewed changes

matejak requested changes Jul 8, 2020

View reviewed changes

linux_os/guide/system/bootloader-zipl/zipl_bls_entries_only/oval/shared.xml Outdated Show resolved Hide resolved

yuumasato added 5 commits July 8, 2020 14:03

Fix path to zipl binary in Bash remediation

260891e

zipl_bls_entries_only: there can be leading spaces

46d2b15

There can be leading spaces before 'image'.

zipl_bls_entries_only: check file /etc/zipl.conf

0a89ed1

There is no need to perform pattern match, the check just needs to examine /etc/zipl.conf file.

Add CCE identifiers to bootmap and bls only rules

699d5f5

Add RHEL-8 CCE identifiers for: - zipl_bls_entries_only - zipl_bootmap_is_up_to_date

Incorporate OSPP selection changes to profile test

2ebc3d1

Update the profile reference file.

Unselect zIPL rules from STIG Profile

33bae25

The zIPL rules are inherited from OSPP profile

vojtapolasek approved these changes Jul 8, 2020

View reviewed changes

matejak approved these changes Jul 9, 2020

View reviewed changes

matejak assigned vojtapolasek Jul 9, 2020

matejak merged commit 15b08f2 into ComplianceAsCode:master Jul 9, 2020

yuumasato deleted the unload_zipl_rules branch July 9, 2020 09:52

yuumasato added this to the 0.1.51 milestone Jul 9, 2020

vojtapolasek modified the milestones: 0.1.51, 0.1.52 Jul 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reorganize zIPL rules #5888

Reorganize zIPL rules #5888

yuumasato commented Jun 26, 2020 •

edited

Loading

openshift-ci-robot commented Jun 26, 2020

JAORMX commented Jul 1, 2020

yuumasato Jul 3, 2020

vojtapolasek left a comment •

edited

Loading

yuumasato commented Jul 8, 2020

mildas commented Jul 8, 2020

vojtapolasek commented Jul 8, 2020

yuumasato commented Jul 8, 2020

yuumasato commented Jul 9, 2020

matejak commented Jul 9, 2020

yuumasato commented Jul 9, 2020

Reorganize zIPL rules #5888

Reorganize zIPL rules #5888

Conversation

yuumasato commented Jun 26, 2020 • edited Loading

Description:

Rationale:

openshift-ci-robot commented Jun 26, 2020

JAORMX commented Jul 1, 2020

yuumasato Jul 3, 2020

Choose a reason for hiding this comment

vojtapolasek left a comment • edited Loading

Choose a reason for hiding this comment

yuumasato commented Jul 8, 2020

mildas commented Jul 8, 2020

vojtapolasek commented Jul 8, 2020

yuumasato commented Jul 8, 2020

yuumasato commented Jul 9, 2020

matejak commented Jul 9, 2020

yuumasato commented Jul 9, 2020

yuumasato commented Jun 26, 2020 •

edited

Loading

vojtapolasek left a comment •

edited

Loading