Skip to content
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.

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

Fix handling of grub.d configs in grub2_bootloader_argument #11726

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

mpurg
Copy link
Contributor

@mpurg mpurg commented Mar 18, 2024

Description:

  • Fixed failing check on Ubuntu when grub parameters were defined in /etc/default/grub.d/*cfg but not in /etc/default/grub.
  • The fixed oval now checks for the existence of the parameter in either /etc/default/grub or at least one
    /etc/default/grub.d/*cfg, ignoring loading order or overriden values.

Rationale:

  • Fixes change introduced in PR Fix grub2_bootloader_argument to check /etc/default/grub.d on Ubuntu #11612
  • We can avoid the added complexity of checking the loading order and potentially overridden GRUB_CMDLINE_LINUX variables, because the tests with /etc/default/grub* are redundant to begin with. The OVAL checks also the parameters in the generated grub configs in /boot (as prescribed by CIS 1.0.0 for Ubuntu 22.04).

Fixed failing check on Ubuntu when grub parameters were defined in
/etc/default/grub.d/*cfg but not in /etc/default/grub.

The fixed oval checks for the existence of the parameter
in *either* /etc/default/grub or *at least one*
/etc/default/grub.d/*cfg, ignoring loading order or overriden values.

We can avoid the added complexity of checking the loading
order and potentially overridden GRUB_CMDLINE_LINUX variables,
because the tests with /etc/default/grub* are redundant to begin with.
The OVAL checks also the parameters in the generated grub configs
in /boot (as prescribed by CIS 1.0.0 for Ubuntu 22.04).
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Mar 18, 2024
Copy link

openshift-ci bot commented Mar 18, 2024

Hi @mpurg. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link

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

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:11726
This image was built from commit: 62dafb1

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:11726

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:11726 make deploy-local

Copy link

codeclimate bot commented Mar 18, 2024

Code Climate has analyzed commit 62dafb1 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 59.3% (0.0% change).

View more on Code Climate.

@marcusburghardt marcusburghardt added the Ubuntu Ubuntu product related. label Mar 19, 2024
@marcusburghardt marcusburghardt added this to the 0.1.73 milestone Mar 19, 2024
@dodys dodys self-assigned this Mar 19, 2024
@dodys dodys added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Mar 19, 2024
Copy link
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@dodys dodys merged commit ef7ac1b into ComplianceAsCode:master Mar 19, 2024
44 checks passed
@Mab879 Mab879 added the OVAL OVAL update. Related to the systems assessments. label May 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Used by openshift-ci bot. OVAL OVAL update. Related to the systems assessments. Ubuntu Ubuntu product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants