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 #11895 issue #11897

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Fix #11895 issue #11897

merged 1 commit into from
Apr 26, 2024

Conversation

marcofortina
Copy link
Contributor

@marcofortina marcofortina commented Apr 26, 2024

Description:

This PR fixes wrong check on /sbin/audispd on Debian >= 11 and Ubuntu >= 22.04.

Rationale:

Review Hints:

Build the product:

./build_product ubuntu2204

To test these changes with Ansible:

ansible-playbook build/ansible/ubuntu2204-playbook-cis_level1_server.yml --tags "aide_check_audit_tools"

To test changes with bash, run the remediation sections: xccdf_org.ssgproject.content_rule_aide_check_audit_tools

Expected output:

Title   Configure AIDE to Verify the Audit Tools
Rule    xccdf_org.ssgproject.content_rule_aide_check_audit_tools
Result  pass

@marcofortina marcofortina requested a review from a team as a code owner April 26, 2024 10:43
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Apr 26, 2024
Copy link

openshift-ci bot commented Apr 26, 2024

Hi @marcofortina. 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

github-actions bot commented Apr 26, 2024

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

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

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

@marcusburghardt marcusburghardt added Debian Debian product related. Ubuntu Ubuntu product related. labels Apr 26, 2024
@dodys
Copy link
Contributor

dodys commented Apr 26, 2024

Please fix the description, aide_build_database has nothing to do with audisp

@dodys dodys self-assigned this Apr 26, 2024
@dodys
Copy link
Contributor

dodys commented Apr 26, 2024

/packit retest-failed

@marcofortina
Copy link
Contributor Author

Please fix the description, aide_build_database has nothing to do with audisp

I think I already fixed the description. Am I wrong?

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!

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.

just a small improvement

product_properties/10-aide-audit.yml Show resolved Hide resolved
@dodys dodys added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Apr 26, 2024
Copy link

codeclimate bot commented Apr 26, 2024

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

View more on Code Climate.

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 b494237 into ComplianceAsCode:master Apr 26, 2024
111 checks passed
@Mab879 Mab879 added this to the 0.1.73 milestone Apr 26, 2024
@Mab879 Mab879 added the Update Rule Issues or pull requests related to Rules updates. label Apr 26, 2024
@@ -1,4 +1,4 @@
aide_also_checks_audispd: 'yes'
aide_also_checks_audispd: 'no'
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there is a difference between CIS and STIG with respect to this variable.
According to Ubuntu 22.04 STIG, rule UBTU-22-651030, aide should also check the integrity of audispd.

I suggest we re-set the var to yes, enabling the check for all benchmarks, and thus introducing an (negligible) extra check in CIS, instead of having a missing check in STIG.

Copy link
Contributor

@dodys dodys May 31, 2024

Choose a reason for hiding this comment

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

@mpurg audispd doesn't exist on 22.04. DISA needs to update their benchmark.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ooops, mybad, should've read the original issue 🤦
All good then, I'll inform DISA.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Debian Debian product related. ok-to-test Used by openshift-ci bot. Ubuntu Ubuntu 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.

Rule "Configure AIDE to Verify the Audit Tools" fails on Ubuntu 22.04
5 participants