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

Enable OSPP profile in RHEL 10 #12776

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Conversation

jan-cerny
Copy link
Collaborator

Currently, the data stream in RHEL 10 daily productization contains OSPP profile and therefore differs from upstream defaults. We still want to run tests with OSPP profile in daily productization. At the same time, we don't want to test different data stream in daily productization than in upstream tests and CI. This will be solved by enabling the OSPP profile by default.

Currently, the data stream in RHEL 10 daily productization
contains OSPP profile and therefore differs from upstream defaults.
We still want to run tests with OSPP profile in daily productization.
At the same time, we don't want to test different data stream
in daily productization than in upstream tests and CI.
This will be solved by enabling the OSPP profile by default.
@jan-cerny jan-cerny added the RHEL10 Red Hat Enterprise Linux 10 product related. label Jan 3, 2025
@jan-cerny jan-cerny added this to the 0.1.76 milestone Jan 3, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 3, 2025
Copy link

openshift-ci bot commented Jan 3, 2025

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

Copy link

github-actions bot commented Jan 3, 2025

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

Based on contest test `/static-checks/rule-identifiers/ospp/`
Copy link

github-actions bot commented Jan 3, 2025

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_configure_openssl_crypto_policy'.
--- xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy
+++ xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy
@@ -45,6 +45,33 @@
 SC-12(3)
 
 [reference]:
+FCS_CKM.1
+
+[reference]:
+FCS_CKM.1.1
+
+[reference]:
+FCS_CKM.2
+
+[reference]:
+FCS_COP.1/ENCRYPT
+
+[reference]:
+FCS_COP.1/HASH
+
+[reference]:
+FCS_COP.1/SIGN
+
+[reference]:
+FCS_COP.1/KEYHMAC
+
+[reference]:
+FCS_TLSC_EXT.1
+
+[reference]:
+FCS_TLSC_EXT.1.1
+
+[reference]:
 Req-2.2
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_package_dnf-automatic_installed'.
--- xccdf_org.ssgproject.content_rule_package_dnf-automatic_installed
+++ xccdf_org.ssgproject.content_rule_package_dnf-automatic_installed
@@ -6,6 +6,12 @@
 The dnf-automatic package can be installed with the following command:
 
 $ sudo yum install dnf-automatic
+
+[reference]:
+FPT_TUD_EXT.1
+
+[reference]:
+FPT_TUD_EXT.2
 
 [reference]:
 SRG-OS-000191-GPOS-00080

New content has different text for rule 'xccdf_org.ssgproject.content_rule_zipl_bls_entries_only'.
--- xccdf_org.ssgproject.content_rule_zipl_bls_entries_only
+++ xccdf_org.ssgproject.content_rule_zipl_bls_entries_only
@@ -10,6 +10,9 @@
 To prevent breakage or removal of all boot entries oconfigured in /etc/zipl.conf
 automated remediation for this rule is not available.
 
+[reference]:
+FPT_TST_EXT.1
+
 [rationale]:
 Red Hat Enterprise Linux 8 adheres to Boot Loader Specification (BLS) and is the prefered method of
 configuration.

New content has different text for rule 'xccdf_org.ssgproject.content_rule_zipl_bootmap_is_up_to_date'.
--- xccdf_org.ssgproject.content_rule_zipl_bootmap_is_up_to_date
+++ xccdf_org.ssgproject.content_rule_zipl_bootmap_is_up_to_date
@@ -8,6 +8,9 @@
 be updated to reflect the changes.
 Run zipl command to generate an updated /boot/bootmap.
 
+[reference]:
+FPT_TST_EXT.1
+
 [rationale]:
 The file /boot/bootmap contains all boot data, keeping it up to date is crucial to
 boot correct kernel and options.

New content has different text for rule 'xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled'.
--- xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled
+++ xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled
@@ -227,6 +227,9 @@
 PR.PT-3
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 Req-1.4.2
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_kernel_module_bluetooth_disabled'.
--- xccdf_org.ssgproject.content_rule_kernel_module_bluetooth_disabled
+++ xccdf_org.ssgproject.content_rule_kernel_module_bluetooth_disabled
@@ -301,6 +301,9 @@
 PR.PT-4
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000095-GPOS-00049
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nodev'.
--- xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nodev
+++ xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nodev
@@ -70,6 +70,9 @@
 PR.PT-3
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000368-GPOS-00154
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_noexec'.
--- xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_noexec
+++ xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_noexec
@@ -67,6 +67,9 @@
 PR.PT-3
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000368-GPOS-00154
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nosuid'.
--- xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nosuid
+++ xccdf_org.ssgproject.content_rule_mount_option_var_log_audit_nosuid
@@ -68,6 +68,9 @@
 PR.PT-3
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000368-GPOS-00154
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_sysctl_kernel_dmesg_restrict'.
--- xccdf_org.ssgproject.content_rule_sysctl_kernel_dmesg_restrict
+++ xccdf_org.ssgproject.content_rule_sysctl_kernel_dmesg_restrict
@@ -43,6 +43,9 @@
 SI-11(b)
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000132-GPOS-00067
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_sysctl_kernel_kexec_load_disabled'.
--- xccdf_org.ssgproject.content_rule_sysctl_kernel_kexec_load_disabled
+++ xccdf_org.ssgproject.content_rule_sysctl_kernel_kexec_load_disabled
@@ -14,6 +14,9 @@
 
 [reference]:
 CM-6
+
+[reference]:
+FMT_SMF_EXT.1
 
 [reference]:
 SRG-OS-000480-GPOS-00227

New content has different text for rule 'xccdf_org.ssgproject.content_rule_sysctl_kernel_yama_ptrace_scope'.
--- xccdf_org.ssgproject.content_rule_sysctl_kernel_yama_ptrace_scope
+++ xccdf_org.ssgproject.content_rule_sysctl_kernel_yama_ptrace_scope
@@ -14,6 +14,9 @@
 
 [reference]:
 SC-7(10)
+
+[reference]:
+FMT_SMF_EXT.1
 
 [reference]:
 SRG-OS-000132-GPOS-00067

New content has different text for rule 'xccdf_org.ssgproject.content_rule_sysctl_kernel_kptr_restrict'.
--- xccdf_org.ssgproject.content_rule_sysctl_kernel_kptr_restrict
+++ xccdf_org.ssgproject.content_rule_sysctl_kernel_kptr_restrict
@@ -98,6 +98,9 @@
 CM-6(a)
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000132-GPOS-00067
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_selinux_policytype'.
--- xccdf_org.ssgproject.content_rule_selinux_policytype
+++ xccdf_org.ssgproject.content_rule_selinux_policytype
@@ -500,6 +500,9 @@
 PR.PT-4
 
 [reference]:
+FMT_MOF_EXT.1
+
+[reference]:
 SRG-OS-000445-GPOS-00199
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_selinux_state'.
--- xccdf_org.ssgproject.content_rule_selinux_state
+++ xccdf_org.ssgproject.content_rule_selinux_state
@@ -498,6 +498,9 @@
 PR.PT-4
 
 [reference]:
+FMT_MOF_EXT.1
+
+[reference]:
 SRG-OS-000445-GPOS-00199
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_package_fapolicyd_installed'.
--- xccdf_org.ssgproject.content_rule_package_fapolicyd_installed
+++ xccdf_org.ssgproject.content_rule_package_fapolicyd_installed
@@ -20,6 +20,9 @@
 SI-4(22)
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000370-GPOS-00155
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_package_usbguard_installed'.
--- xccdf_org.ssgproject.content_rule_package_usbguard_installed
+++ xccdf_org.ssgproject.content_rule_package_usbguard_installed
@@ -23,6 +23,9 @@
 IA-3
 
 [reference]:
+FMT_SMF_EXT.1
+
+[reference]:
 SRG-OS-000378-GPOS-00163
 
 [reference]:

New content has different text for rule 'xccdf_org.ssgproject.content_rule_auditd_data_retention_flush'.
--- xccdf_org.ssgproject.content_rule_auditd_data_retention_flush
+++ xccdf_org.ssgproject.content_rule_auditd_data_retention_flush
@@ -238,6 +238,9 @@
 PR.PT-1
 
 [reference]:
+FAU_GEN.1
+
+[reference]:
 SRG-OS-000480-GPOS-00227
 
 [rationale]:

Copy link

codeclimate bot commented Jan 3, 2025

Code Climate has analyzed commit 4847da1 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 61.6% (0.0% change).

View more on Code Climate.

@jan-cerny jan-cerny marked this pull request as ready for review January 6, 2025 07:48
@jan-cerny jan-cerny requested a review from a team as a code owner January 6, 2025 07:48
@jan-cerny jan-cerny added the OSPP OSPP benchmark related. label Jan 6, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 6, 2025
@Mab879 Mab879 self-assigned this Jan 6, 2025
Copy link
Member

@Mab879 Mab879 left a comment

Choose a reason for hiding this comment

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

Thanks.

@Mab879
Copy link
Member

Mab879 commented Jan 6, 2025

Waving Automatus tests as this PR just updates references and profiles.

@Mab879 Mab879 merged commit 59dbac9 into ComplianceAsCode:master Jan 6, 2025
99 of 105 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OSPP OSPP benchmark related. RHEL10 Red Hat Enterprise Linux 10 product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants