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

Modify adie db exist path for UBTU-20-010450 #11064

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

dexterle
Copy link
Contributor

@dexterle dexterle commented Sep 7, 2023

Description:

  • Fix aide_build_database ansible remediation to ensure proper aide path

Rationale:

Review Hints:

Build the product:

./build_product ubuntu2004

To test these changes with Ansible:

ansible-playbook build/ansible/ubuntu2004-playbook-stig.yml --tags "DISA-STIG-UBTU-20-010450"

To test changes with bash, run the remediation section: xccdf_org.ssgproject.content_rule_aide_build_database

Checkout Manual STIG OVAL definitions, and use software like DISA STIG Viewer to view definitions.

git checkout dexterle:add-manual-stig-ubtu-20-v1r9

This STIG can be tested with the latest Ubuntu 2004 Benchmark SCAP. For reference, please review the latest artifacts: https://public.cyber.mil/stigs/downloads/

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Used by openshift-ci bot. needs-ok-to-test Used by openshift-ci bot. labels Sep 7, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 7, 2023

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

@github-actions
Copy link

github-actions bot commented Sep 7, 2023

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

@marcusburghardt marcusburghardt added Ubuntu Ubuntu product related. STIG STIG Benchmark related. labels Sep 8, 2023
@marcusburghardt marcusburghardt requested a review from a team September 8, 2023 06:48
@dexterle dexterle marked this pull request as ready for review September 11, 2023 13:02
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 11, 2023
@dexterle
Copy link
Contributor Author

This should be consolidated with #11058

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.

you should create a separate ubuntu ansible remediation, following the bash implementation.
Our OVAL check is different from other and so our remediation.

@dodys dodys self-assigned this Sep 13, 2023
@dodys dodys added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Sep 13, 2023
@dexterle
Copy link
Contributor Author

you should create a separate ubuntu ansible remediation, following the bash implementation. Our OVAL check is different from other and so our remediation.

Taking a look at this now...

@dexterle
Copy link
Contributor Author

Should linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/ansible/shared.yml be reverted removing ubuntu specific tasks?

I've added in ansible remediation for Ubuntu that follows bash remediation.

@dodys
Copy link
Contributor

dodys commented Sep 15, 2023

Should linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/ansible/shared.yml be reverted removing ubuntu specific tasks?

I've added in ansible remediation for Ubuntu that follows bash remediation.

yes, please

…-010450

This commit will add in ansible remediation specific to Ubuntu, which follows the bash remediation. Additionally, this commit will remove all ubuntu specific configurations in the shared ansible remediation, as they do not follow the bash remediation. The shared ansible remediation also corrects and simplifies the format.
@dexterle
Copy link
Contributor Author

Reverted ubuntu specific on shared ansible remediation. I also shortened some of the logic and use proper styling.

@github-actions
Copy link

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

Click here to see the full diff
ansible remediation for rule 'xccdf_org.ssgproject.content_rule_aide_build_database' differs.
--- xccdf_org.ssgproject.content_rule_aide_build_database
+++ xccdf_org.ssgproject.content_rule_aide_build_database
@@ -1,5 +1,5 @@
-- name: Ensure AIDE is installed
-  package:
+- name: Build and Test AIDE Database - Ensure AIDE Is Installed
+  ansible.builtin.package:
     name: '{{ item }}'
     state: present
   with_items:
@@ -19,8 +19,8 @@
   - no_reboot_needed
   - restrict_strategy
 
-- name: Build and Test AIDE Database
-  command: /usr/sbin/aide --init
+- name: Build and Test AIDE Database - Build and Test AIDE Database
+  ansible.builtin.command: /usr/sbin/aide --init
   changed_when: true
   when: ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
   tags:
@@ -37,8 +37,8 @@
   - no_reboot_needed
   - restrict_strategy
 
-- name: Check whether the stock AIDE Database exists
-  stat:
+- name: Build and Test AIDE Database - Check Whether the Stock AIDE Database Exists
+  ansible.builtin.stat:
     path: /var/lib/aide/aide.db.new.gz
   register: aide_database_stat
   when: ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
@@ -56,8 +56,8 @@
   - no_reboot_needed
   - restrict_strategy
 
-- name: Stage AIDE Database
-  copy:
+- name: Build and Test AIDE Database - Stage AIDE Database
+  ansible.builtin.copy:
     src: /var/lib/aide/aide.db.new.gz
     dest: /var/lib/aide/aide.db.gz
     backup: true

@openshift-ci
Copy link

openshift-ci bot commented Sep 15, 2023

@dexterle: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images 33f7850 link true /test images

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@codeclimate
Copy link

codeclimate bot commented Sep 15, 2023

Code Climate has analyzed commit 33f7850 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 53.8% (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

@marcusburghardt marcusburghardt added this to the 0.1.70 milestone Sep 19, 2023
@marcusburghardt
Copy link
Member

I believe it can already be merged, correct?

@dodys dodys merged commit 12c85b9 into ComplianceAsCode:master Sep 21, 2023
37 of 38 checks passed
@Mab879 Mab879 added the Ansible Ansible remediation update. label Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ansible Ansible remediation update. ok-to-test Used by openshift-ci bot. STIG STIG Benchmark related. Ubuntu Ubuntu product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants