|
 |
c99e83 |
From bb039a92b4286c9090c0f40c82aefb967be2f5ba Mon Sep 17 00:00:00 2001
|
|
|
c99e83 |
From: Vojtech Polasek <vpolasek@redhat.com>
|
|
|
c99e83 |
Date: Thu, 14 May 2020 16:46:07 +0200
|
|
|
c99e83 |
Subject: [PATCH] reorder groups because of permissions verification
|
|
|
c99e83 |
|
|
|
c99e83 |
---
|
|
|
c99e83 |
ssg/build_yaml.py | 6 ++++++
|
|
|
c99e83 |
1 file changed, 6 insertions(+)
|
|
|
c99e83 |
|
|
|
c99e83 |
diff --git a/ssg/build_yaml.py b/ssg/build_yaml.py
|
|
|
c99e83 |
index e3e138283c..c9f3179c08 100644
|
|
|
c99e83 |
--- a/ssg/build_yaml.py
|
|
|
c99e83 |
+++ b/ssg/build_yaml.py
|
|
|
c99e83 |
@@ -700,6 +700,11 @@ def to_xml_element(self):
|
|
|
c99e83 |
# audit_rules_privileged_commands, othervise the rule
|
|
|
c99e83 |
# does not catch newly installed screeen binary during remediation
|
|
|
c99e83 |
# and report fail
|
|
|
c99e83 |
+ # the software group should come before the
|
|
|
c99e83 |
+ # bootloader-grub2 group because of conflict between
|
|
|
c99e83 |
+ # rules rpm_verify_permissions and file_permissions_grub2_cfg
|
|
|
c99e83 |
+ # specific rules concerning permissions should
|
|
|
c99e83 |
+ # be applied after the general rpm_verify_permissions
|
|
|
c99e83 |
# The FIPS group should come before Crypto - if we want to set a different (stricter) Crypto Policy than FIPS.
|
|
|
c99e83 |
# the firewalld_activation must come before ruleset_modifications, othervise
|
|
|
c99e83 |
# remediations for ruleset_modifications won't work
|
|
|
c99e83 |
@@ -707,6 +712,7 @@ def to_xml_element(self):
|
|
|
c99e83 |
# otherwise the remediation prints error although it is successful
|
|
|
c99e83 |
priority_order = [
|
|
|
c99e83 |
"accounts", "auditing",
|
|
|
c99e83 |
+ "software", "bootloader-grub2",
|
|
|
c99e83 |
"fips", "crypto",
|
|
|
c99e83 |
"firewalld_activation", "ruleset_modifications",
|
|
|
c99e83 |
"disabling_ipv6", "configuring_ipv6"
|