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

Add OL into jinja conditionals #12461

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

mrkanon
Copy link
Contributor

@mrkanon mrkanon commented Oct 3, 2024

Description:

Add OL into jinja conditionals in the following files:

controls/anssi.yml
auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml services/obsolete/package_rsync_removed/rule.yml
services/rng/service_rngd_enabled/rule.yml
system/bootloader-grub2/grub2_kernel_trust_cpu_rng/oval/shared.xml system/logging/log_rotation/ensure_logrotate_activated/oval/shared.xml system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/ansible/shared.yml system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/bash/shared.sh system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/oval/shared.xml system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/rule.yml system/software/sudo/sudo_add_env_reset/rule.yml
system/software/sudo/sudo_add_ignore_dot/rule.yml
system/software/sudo/sudo_add_passwd_timeout/rule.yml system/software/sudo/sudo_add_umask/rule.yml

Remove package_audit-audispd-plugins_installed rule, the package is not available in OL products/ol9/profiles/default.profile

Fix word error in sudo_add_ignore_dot rule

Rationale:

Filling OL gaps in jinja conditionals

Add OL into jinja conditionals in the following files:

controls/anssi.yml
auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
services/obsolete/package_rsync_removed/rule.yml
services/rng/service_rngd_enabled/rule.yml
system/bootloader-grub2/grub2_kernel_trust_cpu_rng/oval/shared.xml
system/logging/log_rotation/ensure_logrotate_activated/oval/shared.xml
system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/ansible/shared.yml
system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/bash/shared.sh
system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/oval/shared.xml
system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_exec_shield/rule.yml
system/software/sudo/sudo_add_env_reset/rule.yml
system/software/sudo/sudo_add_ignore_dot/rule.yml
system/software/sudo/sudo_add_passwd_timeout/rule.yml
system/software/sudo/sudo_add_umask/rule.yml

Remove package_audit-audispd-plugins_installed rule, the package is not available in OL
products/ol9/profiles/default.profile

Fix word error in sudo_add_ignore_dot rule

Signed-off-by: Armando Acosta <[email protected]>
@mrkanon mrkanon requested a review from a team as a code owner October 3, 2024 01:05
Copy link

openshift-ci bot commented Oct 3, 2024

Hi @mrkanon. 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-sigs/prow repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Oct 3, 2024
Copy link

github-actions bot commented Oct 3, 2024

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

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

github-actions bot commented Oct 3, 2024

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

Click here to see the full diff
New content has different text for rule 'xccdf_org.ssgproject.content_rule_sudo_add_ignore_dot'.
--- xccdf_org.ssgproject.content_rule_sudo_add_ignore_dot
+++ xccdf_org.ssgproject.content_rule_sudo_add_ignore_dot
@@ -5,7 +5,7 @@
 [description]:
 The sudo ignore_dot tag, when specified, will ignore the current directory
 in the PATH environment variable.
-On Red Hat Enterprise Linux 8, env_reset is enabled by default
+On Red Hat Enterprise Linux 8, ignore_dot is enabled by default
 This should be enabled by making sure that the ignore_dot tag exists in
 /etc/sudoers configuration file or any sudo configuration snippets
 in /etc/sudoers.d/.

Copy link

github-actions bot commented Oct 3, 2024

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

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:12461

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

Copy link

codeclimate bot commented Oct 3, 2024

Code Climate has analyzed commit e42c89d 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.5% (0.0% change).

View more on Code Climate.

@Xeicker Xeicker added the Oracle Linux Oracle Linux product related. label Oct 3, 2024
@Xeicker Xeicker added this to the 0.1.75 milestone Oct 3, 2024
Copy link
Contributor

@Xeicker Xeicker left a comment

Choose a reason for hiding this comment

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

The failing tests about automatus are because debian and ubuntu don't include the rule sysctl_kernel_exec_shield

@Xeicker Xeicker merged commit 0d49015 into ComplianceAsCode:master Oct 3, 2024
91 of 93 checks passed
@Mab879 Mab879 added the Update Rule Issues or pull requests related to Rules updates. label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-ok-to-test Used by openshift-ci bot. Oracle Linux Oracle Linux product related. Update Rule Issues or pull requests related to Rules updates.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants