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.

Sign up for GitHub

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

Jump to bottom

Update CCI Numbers due to new STIG/SRG GPOS #12374

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update CCI Numbers due to new STIG/SRG GPOS #12374

wants to merge 8 commits into from

Conversation

Mab879
Copy link
Member

@Mab879 Mab879 commented Sep 10, 2024 •
edited
Loading

Description and Rationale:

Keep the CCI numbers updated.

Review Hints:

@Mab879 Mab879 added the Update Rule Issues or pull requests related to Rules updates. label Sep 10, 2024
@Mab879 Mab879 added this to the 0.1.75 milestone Sep 10, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 10, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 10, 2024

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

@openshift-merge-robot openshift-merge-robot added the needs-rebase Used by openshift-ci bot. label Sep 10, 2024
@github-actions GitHub Actions
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

@Mab879
Update RHEL 9 STIG reference file to V2R1
7c33da8
@Mab879
Update STIG Policy files based on RHEL 9 STIG V2R1
570e823
@Mab879
Improve Import DISA STIG
e468cf3 
* Replace auid>=1000 with auid>={{{ uid_min }}}
* Ensure that < and > are correctly replaced with &lt; and &gt;
* Remove the Satisfies: SRG-OS.+ check text
@Mab879
Update RHEL 9 STIG to V2R1
2da4d99
@Mab879
Update DISA CCI numbers for RHEL V2R1
d638711
@Mab879
Update rule CCI from RHEL 9 STIG V2R1
de5fafc 
# Conflicts:
#	linux_os/guide/auditing/package_audispd-plugins_installed/rule.yml
#	linux_os/guide/system/logging/package_rsyslog-gnutls_installed/rule.yml
#	linux_os/guide/system/software/system-tools/package_gnutls-utils_installed/rule.yml
#	linux_os/guide/system/software/system-tools/package_nss-tools_installed/rule.yml
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Used by openshift-ci bot. label Sep 10, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 10, 2024 •
edited
Loading

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

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

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

@Mab879 Mab879 assigned Mab879 and unassigned Mab879 Sep 12, 2024
@Mab879 Mab879 marked this pull request as ready for review September 12, 2024 18:27
@Mab879 Mab879 requested a review from a team as a code owner September 12, 2024 18:27
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 12, 2024
@Mab879 Mab879 marked this pull request as draft September 12, 2024 18:27
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 12, 2024
@Mab879 Mab879 changed the title Draft: Update CCI Numbers due to new STIG/SRG GPOS Update CCI Numbers due to new STIG/SRG GPOS Sep 13, 2024
@Mab879 Mab879 marked this pull request as ready for review September 13, 2024 13:19
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 13, 2024
@vojtapolasek vojtapolasek self-assigned this Sep 17, 2024
@vojtapolasek
Copy link
Collaborator

Hello @Mab879 and thanks for this update. I have few questions.

  1. Would you consider modifying the script clean_up_dupkeys.py so that your home path is not there? I don't see this as a good security practice. The path can be set through a variable.
  2. How did you actually get list of paths used in the clean_up_dupkeys.py?
  3. Just so that I understand... the workflow was like running the update_cci.py and then clean_up_dupkeys?
  4. How were commits d638711 and de5fafc created? The description is vague.

Thank you for answering these questions.

@Mab879
Add tools used for updating CCIs
6fe6cf3
@Mab879
Revert "Add tools used for updating CCIs"
1a93cd0 
This reverts commit 6fe6cf3.
The scripts due not need to stay the repo.
@Mab879
Copy link
Member Author

Mab879 commented Sep 19, 2024 •
edited
Loading

Hello @Mab879 and thanks for this update. I have few questions.

1. Would you consider modifying the script clean_up_dupkeys.py so that your home path is not there? I don't see this as a good security practice. The path can be set through a variable.

I just removed my home folder. Paths are now relative to SSG_ROOT.

2. How did you actually get list of paths used in the clean_up_dupkeys.py?

I used grep to find files with two disa keys`.

3. Just so that I understand... the workflow was like running the update_cci.py and then clean_up_dupkeys?

The vast majority was done that way.

4. How were commits [d638711](https://github.com/ComplianceAsCode/content/commit/d6387117cc7780bedb5b7000f5dbb417b71f97e4) and [de5fafc](https://github.com/ComplianceAsCode/content/commit/de5fafc39da87be83d2b525a4d669e93e7230d82) created? The description is vague.
  • d6387117cc7780bedb5b7000f5dbb417b71f97e4 - Was my manual try at the updates
  • de5fafc39da87be83d2b525a4d669e93e7230d82 - Was the automated way

@codeclimate CodeClimate
Copy link

codeclimate bot commented Sep 19, 2024

Code Climate has analyzed commit 1a93cd0 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@vojtapolasek vojtapolasek

Labels
Update Rule Issues or pull requests related to Rules updates.
Projects
None yet
Milestone
0.1.75
Development

Successfully merging this pull request may close these issues.
3 participants
@Mab879 @vojtapolasek @openshift-merge-robot