[PATCH 23/31] Renamed groupowner_group_file ->

Shawn Wells shawn at redhat.com
Fri Dec 27 23:28:23 UTC 2013


-------------- next part --------------
>From 5f90361fca800286ac525d28721a8a6424ea91ff Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Fri, 27 Dec 2013 02:25:50 -0500
Subject: [PATCH 23/31] Renamed groupowner_group_file ->
 file_groupowner_etc_group, added to shared/

- XCCDF renamed to match template style

- Tested on RHEL7, updated CPE

- Added to shared, setup symlinks
---
 RHEL/6/input/auxiliary/stig_overlay.xml            |  2 +-
 RHEL/6/input/checks/file_groupowner_etc_group.xml  | 30 +---------------------
 RHEL/6/input/profiles/CS2.xml                      |  2 +-
 RHEL/6/input/profiles/common.xml                   |  2 +-
 .../6/input/profiles/fisma-medium-rhel6-server.xml |  2 +-
 RHEL/6/input/profiles/nist-CL-IL-AL.xml            |  2 +-
 RHEL/6/input/profiles/rht-ccp.xml                  |  2 +-
 RHEL/6/input/profiles/usgcb-rhel6-server.xml       |  2 +-
 RHEL/6/input/system/permissions/files.xml          |  2 +-
 RHEL/7/input/auxiliary/stig_overlay.xml            |  2 +-
 RHEL/7/input/checks/file_groupowner_etc_group.xml  |  1 +
 RHEL/7/input/profiles/rht-ccp.xml                  |  2 +-
 RHEL/7/input/system/permissions/files.xml          |  2 +-
 shared/oval/file_groupowner_etc_group.xml          | 30 ++++++++++++++++++++++
 14 files changed, 43 insertions(+), 40 deletions(-)
 mode change 100644 => 120000 RHEL/6/input/checks/file_groupowner_etc_group.xml
 create mode 120000 RHEL/7/input/checks/file_groupowner_etc_group.xml
 create mode 100644 shared/oval/file_groupowner_etc_group.xml

diff --git a/RHEL/6/input/auxiliary/stig_overlay.xml b/RHEL/6/input/auxiliary/stig_overlay.xml
index 7ce2383..c799612 100644
--- a/RHEL/6/input/auxiliary/stig_overlay.xml
+++ b/RHEL/6/input/auxiliary/stig_overlay.xml
@@ -128,7 +128,7 @@
 		<VMSinfo VKey="38458" SVKey="50258" VRelease="1" />
 		<title>The /etc/group file must be owned by root.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="groupowner_group_file" ownerid="RHEL-06-000043" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_groupowner_etc_group" ownerid="RHEL-06-000043" disa="366" severity="medium">
 		<VMSinfo VKey="38459" SVKey="50259" VRelease="1" />
 		<title>The /etc/group file must be group-owned by root.</title>
 	</overlay>
diff --git a/RHEL/6/input/checks/file_groupowner_etc_group.xml b/RHEL/6/input/checks/file_groupowner_etc_group.xml
deleted file mode 100644
index 0c6de67..0000000
--- a/RHEL/6/input/checks/file_groupowner_etc_group.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<def-group>
-  <definition class="compliance" id="file_groupowner_etc_group" version="1">
-    <metadata>
-      <title>Verify group who owns 'group' file</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The /etc/group file should be owned by the appropriate
-      group.</description>
-      <reference source="swells" ref_id="20130918" ref_url="test_attestation" />
-    </metadata>
-    <criteria>
-      <criterion test_ref="test_file_groupowner_etc_group" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist"
-  comment="Testing group ownership" id="test_file_groupowner_etc_group"
-  version="1">
-    <unix:object object_ref="object_file_groupowner_etc_group" />
-    <unix:state state_ref="state_file_groupowner_etc_group" />
-  </unix:file_test>
-  <unix:file_state id="state_file_groupowner_etc_group" version="1">
-    <unix:group_id datatype="int">0</unix:group_id>
-  </unix:file_state>
-  <unix:file_object comment="/etc/group" id="object_file_groupowner_etc_group"
-  version="1">
-    <unix:filepath>/etc/group</unix:filepath>
-  </unix:file_object>
-</def-group>
diff --git a/RHEL/6/input/checks/file_groupowner_etc_group.xml b/RHEL/6/input/checks/file_groupowner_etc_group.xml
new file mode 120000
index 0000000..c52a75e
--- /dev/null
+++ b/RHEL/6/input/checks/file_groupowner_etc_group.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_groupowner_etc_group.xml
\ No newline at end of file
diff --git a/RHEL/6/input/profiles/CS2.xml b/RHEL/6/input/profiles/CS2.xml
index 0d38147..fef458b 100644
--- a/RHEL/6/input/profiles/CS2.xml
+++ b/RHEL/6/input/profiles/CS2.xml
@@ -158,7 +158,7 @@
 <select idref="file_groupowner_etc_passwd" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
 <select idref="file_owner_etc_group" selected="true" />
-<select idref="groupowner_group_file" selected="true" />
+<select idref="file_groupowner_etc_group" selected="true" />
 <select idref="perms_group_file" selected="true" />
 <select idref="file_permissions_library_dirs" selected="true"/>
 <select idref="file_ownership_library_dirs" selected="true"/>
diff --git a/RHEL/6/input/profiles/common.xml b/RHEL/6/input/profiles/common.xml
index dd68778..364c31a 100644
--- a/RHEL/6/input/profiles/common.xml
+++ b/RHEL/6/input/profiles/common.xml
@@ -37,7 +37,7 @@
 <select idref="file_permissions_etc_passwd" selected="true"/>
 
 <select idref="file_owner_etc_group" selected="true" />
-<select idref="groupowner_group_file" selected="true" />
+<select idref="file_groupowner_etc_group" selected="true" />
 <select idref="perms_group_file" selected="true" />
 
 <select idref="file_permissions_library_dirs" selected="true"/>
diff --git a/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml b/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
index e021f01..a9a1691 100644
--- a/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
+++ b/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
@@ -43,7 +43,7 @@
 <select idref="groupowner_shadow_file" selected="true" />
 <select idref="file_permissions_etc_shadow" selected="true"/>
 <select idref="file_owner_etc_group" selected="true" />
-<select idref="groupowner_group_file" selected="true" />
+<select idref="file_groupowner_etc_group" selected="true" />
 <select idref="perms_group_file" selected="true" />
 <select idref="file_owner_etc_gshadow" selected="true" />
 <select idref="file_groupowner_etc_gshadow" selected="true" />
diff --git a/RHEL/6/input/profiles/nist-CL-IL-AL.xml b/RHEL/6/input/profiles/nist-CL-IL-AL.xml
index 78e2adc..1c0059c 100644
--- a/RHEL/6/input/profiles/nist-CL-IL-AL.xml
+++ b/RHEL/6/input/profiles/nist-CL-IL-AL.xml
@@ -137,7 +137,7 @@ assurance."</description>
 <select idref="groupowner_shadow_file" selected="true" \>
 <select idref="file_permissions_etc_shadow" selected="true" \>
 <select idref="file_owner_etc_group" selected="true" \>
-<select idref="groupowner_group_file" selected="true" \>
+<select idref="file_groupowner_etc_group" selected="true" \>
 <select idref="perms_group_file" selected="true" \>
 <select idref="file_owner_etc_gshadow" selected="true" \>
 <select idref="file_groupowner_etc_gshadow" selected="true" \>
diff --git a/RHEL/6/input/profiles/rht-ccp.xml b/RHEL/6/input/profiles/rht-ccp.xml
index 7dadbdc..47beccd 100644
--- a/RHEL/6/input/profiles/rht-ccp.xml
+++ b/RHEL/6/input/profiles/rht-ccp.xml
@@ -77,7 +77,7 @@
 <select idref="file_groupowner_etc_passwd" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
 <select idref="file_owner_etc_group" selected="true"/>
-<select idref="groupowner_group_file" selected="true"/>
+<select idref="file_groupowner_etc_group" selected="true"/>
 <select idref="perms_group_file" selected="true"/>
 <select idref="file_permissions_library_dirs" selected="true"/>
 <select idref="file_ownership_library_dirs" selected="true"/>
diff --git a/RHEL/6/input/profiles/usgcb-rhel6-server.xml b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
index e2c7690..28cde12 100644
--- a/RHEL/6/input/profiles/usgcb-rhel6-server.xml
+++ b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
@@ -41,7 +41,7 @@
 <select idref="groupowner_shadow_file" selected="true" />
 <select idref="perms_group_file" selected="true" /> 
 <select idref="file_owner_etc_group" selected="true" />
-<select idref="groupowner_group_file" selected="true" />
+<select idref="file_groupowner_etc_group" selected="true" />
 <select idref="file_permissions_etc_passwd" selected="true" />
 <select idref="file_owner_etc_passwd" selected="true" />
 <select idref="file_groupowner_etc_passwd" selected="true" />
diff --git a/RHEL/6/input/system/permissions/files.xml b/RHEL/6/input/system/permissions/files.xml
index caa7938..698d55a 100644
--- a/RHEL/6/input/system/permissions/files.xml
+++ b/RHEL/6/input/system/permissions/files.xml
@@ -71,7 +71,7 @@ on the system. Protection of this file is important for system security.</ration
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="groupowner_group_file" severity="medium">
+<Rule id="file_groupowner_etc_group" severity="medium">
 <title>Verify Group Who Owns <tt>group</tt> File</title>
 <description><filegroupowner-desc-macro file="/etc/group" group="root"/></description>
 <ocil><filegroupowner-check-macro file="/etc/group" group="root"/></ocil>
diff --git a/RHEL/7/input/auxiliary/stig_overlay.xml b/RHEL/7/input/auxiliary/stig_overlay.xml
index dd61f3c..794e4c3 100644
--- a/RHEL/7/input/auxiliary/stig_overlay.xml
+++ b/RHEL/7/input/auxiliary/stig_overlay.xml
@@ -128,7 +128,7 @@
 		<VMSinfo VKey="38458" SVKey="50258" VRelease="1" />
 		<title>The /etc/group file must be owned by root.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="groupowner_group_file" ownerid="RHEL-06-000043" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_groupowner_etc_group" ownerid="RHEL-06-000043" disa="366" severity="medium">
 		<VMSinfo VKey="38459" SVKey="50259" VRelease="1" />
 		<title>The /etc/group file must be group-owned by root.</title>
 	</overlay>
diff --git a/RHEL/7/input/checks/file_groupowner_etc_group.xml b/RHEL/7/input/checks/file_groupowner_etc_group.xml
new file mode 120000
index 0000000..c52a75e
--- /dev/null
+++ b/RHEL/7/input/checks/file_groupowner_etc_group.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_groupowner_etc_group.xml
\ No newline at end of file
diff --git a/RHEL/7/input/profiles/rht-ccp.xml b/RHEL/7/input/profiles/rht-ccp.xml
index 1be219f..573143a 100644
--- a/RHEL/7/input/profiles/rht-ccp.xml
+++ b/RHEL/7/input/profiles/rht-ccp.xml
@@ -76,7 +76,7 @@ FILE PERMISSION CHECKS
 <select idref="file_groupowner_etc_passwd" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
 <select idref="file_owner_etc_group" selected="true"/>
-<select idref="groupowner_group_file" selected="true"/>
+<select idref="file_groupowner_etc_group" selected="true"/>
 <select idref="perms_group_file" selected="true"/>
 <select idref="file_permissions_library_dirs" selected="true"/>
 <select idref="file_ownership_library_dirs" selected="true"/>
diff --git a/RHEL/7/input/system/permissions/files.xml b/RHEL/7/input/system/permissions/files.xml
index 1ed6110..7cdfc0e 100644
--- a/RHEL/7/input/system/permissions/files.xml
+++ b/RHEL/7/input/system/permissions/files.xml
@@ -71,7 +71,7 @@ on the system. Protection of this file is important for system security.</ration
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="groupowner_group_file" severity="medium">
+<Rule id="file_groupowner_etc_group" severity="medium">
 <title>Verify Group Who Owns <tt>group</tt> File</title>
 <description><filegroupowner-desc-macro file="/etc/group" group="root"/></description>
 <ocil><filegroupowner-check-macro file="/etc/group" group="root"/></ocil>
diff --git a/shared/oval/file_groupowner_etc_group.xml b/shared/oval/file_groupowner_etc_group.xml
new file mode 100644
index 0000000..9509102
--- /dev/null
+++ b/shared/oval/file_groupowner_etc_group.xml
@@ -0,0 +1,30 @@
+<def-group>
+  <definition class="compliance" id="file_groupowner_etc_group" version="1">
+    <metadata>
+      <title>Verify group who owns 'group' file</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The /etc/group file should be owned by the appropriate
+      group.</description>
+      <reference source="swells" ref_id="20130918" ref_url="test_attestation" />
+    </metadata>
+    <criteria>
+      <criterion test_ref="test_file_groupowner_etc_group" />
+    </criteria>
+  </definition>
+  <unix:file_test check="all" check_existence="all_exist"
+  comment="Testing group ownership" id="test_file_groupowner_etc_group"
+  version="1">
+    <unix:object object_ref="object_file_groupowner_etc_group" />
+    <unix:state state_ref="state_file_groupowner_etc_group" />
+  </unix:file_test>
+  <unix:file_state id="state_file_groupowner_etc_group" version="1">
+    <unix:group_id datatype="int">0</unix:group_id>
+  </unix:file_state>
+  <unix:file_object comment="/etc/group" id="object_file_groupowner_etc_group"
+  version="1">
+    <unix:filepath>/etc/group</unix:filepath>
+  </unix:file_object>
+</def-group>
-- 
1.8.3.1



More information about the scap-security-guide mailing list