OPENSCAP-4951: Support modern watches in audit_rules_sysadmin_actions #13242
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This datastream diff is auto generated by the check Click here to see the full diffNew content has different text for rule 'xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions'.
--- xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions
+++ xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions
@@ -3,17 +3,35 @@
Ensure auditd Collects System Administrator Actions
[description]:
-At a minimum, the audit system should collect administrator actions
-for all users and root. If the auditd daemon is configured to use the
-augenrules program to read audit rules during daemon startup (the default),
-add the following line to a file with suffix .rules in the directory
-/etc/audit/rules.d:
+If the auditd daemon is configured to use the augenrules
+program to read audit rules during daemon startup (the default), add the
+following lines to a file with suffix .rules in the
+directory /etc/audit/rules.d:
+
-w /etc/sudoers -p wa -k actions
+
+If the auditd daemon is configured to use the auditctl
+utility to read audit rules during daemon startup, add the following lines to
+/etc/audit/audit.rules:
+
+-w /etc/sudoers -p wa -k actions
+
+
+
+
+
+
+If the auditd daemon is configured to use the augenrules
+program to read audit rules during daemon startup (the default), add the
+following lines to a file with suffix .rules in the
+directory /etc/audit/rules.d:
+
-w /etc/sudoers.d/ -p wa -k actions
+
If the auditd daemon is configured to use the auditctl
-utility to read audit rules during daemon startup, add the following line to
-/etc/audit/audit.rules file:
--w /etc/sudoers -p wa -k actions
+utility to read audit rules during daemon startup, add the following lines to
+/etc/audit/audit.rules:
+
-w /etc/sudoers.d/ -p wa -k actions
[reference]:
OVAL for rule 'xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions' differs.
--- oval:ssg-audit_rules_sysadmin_actions:def:1
+++ oval:ssg-audit_rules_sysadmin_actions:def:1
@@ -1,9 +1,3 @@
-criteria OR
criteria AND
-extend_definition oval:ssg-audit_rules_augenrules:def:1
-criterion oval:ssg-test_audit_rules_sysadmin_actions_sudoers_augenrules:tst:1
-criterion oval:ssg-test_audit_rules_sysadmin_actions_sudoers_d_augenrules:tst:1
-criteria AND
-extend_definition oval:ssg-audit_rules_auditctl:def:1
-criterion oval:ssg-test_audit_rules_sysadmin_actions_sudoers_auditctl:tst:1
-criterion oval:ssg-test_audit_rules_sysadmin_actions_sudoers_d_auditctl:tst:1
+extend_definition oval:ssg-audit_rules_sudoers:def:1
+extend_definition oval:ssg-audit_rules_sudoers_d:def:1
OCIL for rule 'xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions' differs.
--- ocil:ssg-audit_rules_sysadmin_actions_ocil:questionnaire:1
+++ ocil:ssg-audit_rules_sysadmin_actions_ocil:questionnaire:1
@@ -1,4 +1,16 @@
-To verify that auditing is configured for system administrator actions, run the following command:
-$ sudo auditctl -l | grep "watch=/etc/sudoers\|watch=/etc/sudoers.d\|-w /etc/sudoers\|-w /etc/sudoers.d"
+
+Verify Red Hat Enterprise Linux 8 generates audit records for all events that affect "/etc/sudoers" with the following command:
+
+$ sudo auditctl -l | grep /etc/sudoers
+
+-w /etc/sudoers -p wa -k actions
+
+
+
+Verify Red Hat Enterprise Linux 8 generates audit records for all events that affect "/etc/sudoers.d/" with the following command:
+
+$ sudo auditctl -l | grep /etc/sudoers.d/
+
+-w /etc/sudoers.d/ -p wa -k actions
Is it the case that there is not output?
bash remediation for rule 'xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions' differs.
--- xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions
+++ xccdf_org.ssgproject.content_rule_audit_rules_sysadmin_actions
@@ -2,6 +2,7 @@
if rpm --quiet -q audit && rpm --quiet -q kernel; then
# Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+
# Create a list of audit *.rules files that should be inspected for presence and correctness
# of a particular audit rule. The scheme is as follows: |
|
@jan-cerny this PR needs as rebase well. |
OVAL is done by reusing existing OVAL form other rules audit_rules_sudoers and audit_rules_sudoers_d that are templated. Remediations will reuse macros.
24b6d97 to
9d3b448
|
I have rebased this PR on the top of the latest upstream master branch. |
|
Code Climate has analyzed commit 9d3b448 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 62.0% (0.0% change). View more on Code Climate. |
|
/packit retest-failed |
|
/retest |
1 similar comment
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
OVAL is done by reusing existing OVAL form other rules audit_rules_sudoers and audit_rules_sudoers_d that are templated. Remediations will reuse macros.