[PATCH 16/31] Updated XCCDF name of file_owner_etc_gshadow, moved to

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


-------------- next part --------------
>From c3944e29b2f22bdb9b7c339354f7c7b84ba71bbf Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Fri, 27 Dec 2013 00:58:14 -0500
Subject: [PATCH 16/31] Updated XCCDF name of file_owner_etc_gshadow, moved to
 shared/

- Updated XCCDF name to match template style
- Tested on RHEL7, updated CPE, moved to shared/
- OVAL filename->filepath call
---
 RHEL/6/input/auxiliary/stig_overlay.xml            |  2 +-
 RHEL/6/input/checks/file_owner_etc_gshadow.xml     | 31 +---------------------
 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_owner_etc_gshadow.xml     |  1 +
 RHEL/7/input/profiles/rht-ccp.xml                  |  2 +-
 RHEL/7/input/system/permissions/files.xml          |  2 +-
 shared/oval/file_owner_etc_gshadow.xml             | 30 +++++++++++++++++++++
 14 files changed, 43 insertions(+), 41 deletions(-)
 mode change 100644 => 120000 RHEL/6/input/checks/file_owner_etc_gshadow.xml
 create mode 120000 RHEL/7/input/checks/file_owner_etc_gshadow.xml
 create mode 100644 shared/oval/file_owner_etc_gshadow.xml

diff --git a/RHEL/6/input/auxiliary/stig_overlay.xml b/RHEL/6/input/auxiliary/stig_overlay.xml
index 652ce49..f217fd1 100644
--- a/RHEL/6/input/auxiliary/stig_overlay.xml
+++ b/RHEL/6/input/auxiliary/stig_overlay.xml
@@ -100,7 +100,7 @@
 		<VMSinfo VKey="38504" SVKey="50305" VRelease="1" />
 		<title>The /etc/shadow file must have mode 0000.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="userowner_gshadow_file" ownerid="RHEL-06-000036" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_owner_etc_gshadow" ownerid="RHEL-06-000036" disa="366" severity="medium">
 		<VMSinfo VKey="38443" SVKey="50243" VRelease="1" />
 		<title>The /etc/gshadow file must be owned by root.</title>
 	</overlay>
diff --git a/RHEL/6/input/checks/file_owner_etc_gshadow.xml b/RHEL/6/input/checks/file_owner_etc_gshadow.xml
deleted file mode 100644
index 5a41bc5..0000000
--- a/RHEL/6/input/checks/file_owner_etc_gshadow.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<def-group>
-  <definition class="compliance" id="file_owner_etc_gshadow" version="1">
-    <metadata>
-      <title>Verify user who owns 'gshadow' file</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The /etc/gshadow file should be owned by the appropriate
-      user.</description>
-      <reference source="MED" ref_id="20130807" ref_url="test_attestation" />
-    </metadata>
-    <criteria>
-      <criterion test_ref="test_file_owner_etc_gshadow" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist"
-  comment="Testing gshadow ownership" id="test_file_owner_etc_gshadow"
-  version="1">
-    <unix:object object_ref="object_file_owner_etc_gshadow" />
-    <unix:state state_ref="state_file_owner_etc_gshadow" />
-  </unix:file_test>
-  <unix:file_state id="state_file_owner_etc_gshadow" version="1">
-    <unix:user_id datatype="int">0</unix:user_id>
-  </unix:file_state>
-  <unix:file_object comment="/etc/gshadow" id="object_file_owner_etc_gshadow"
-  version="1">
-    <unix:path>/etc</unix:path>
-    <unix:filename>gshadow</unix:filename>
-  </unix:file_object>
-</def-group>
diff --git a/RHEL/6/input/checks/file_owner_etc_gshadow.xml b/RHEL/6/input/checks/file_owner_etc_gshadow.xml
new file mode 120000
index 0000000..db306a3
--- /dev/null
+++ b/RHEL/6/input/checks/file_owner_etc_gshadow.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_owner_etc_gshadow.xml
\ No newline at end of file
diff --git a/RHEL/6/input/profiles/CS2.xml b/RHEL/6/input/profiles/CS2.xml
index 9d33f72..906604c 100644
--- a/RHEL/6/input/profiles/CS2.xml
+++ b/RHEL/6/input/profiles/CS2.xml
@@ -151,7 +151,7 @@
 <select idref="userowner_shadow_file" selected="true"/>
 <select idref="groupowner_shadow_file" selected="true"/>
 <select idref="file_permissions_etc_shadow" selected="true"/>
-<select idref="userowner_gshadow_file" selected="true"/>
+<select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="groupowner_gshadow_file" selected="true"/>
 <select idref="perms_gshadow_file" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
diff --git a/RHEL/6/input/profiles/common.xml b/RHEL/6/input/profiles/common.xml
index 01cb978..ae8ccd6 100644
--- a/RHEL/6/input/profiles/common.xml
+++ b/RHEL/6/input/profiles/common.xml
@@ -28,7 +28,7 @@
 <select idref="groupowner_shadow_file" selected="true"/>
 <select idref="file_permissions_etc_shadow" selected="true"/>
 
-<select idref="userowner_gshadow_file" selected="true"/>
+<select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="groupowner_gshadow_file" selected="true"/>
 <select idref="perms_gshadow_file" 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 55254b0..f850d13 100644
--- a/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
+++ b/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
@@ -45,7 +45,7 @@
 <select idref="userowner_group_file" selected="true" />
 <select idref="groupowner_group_file" selected="true" />
 <select idref="perms_group_file" selected="true" />
-<select idref="userowner_gshadow_file" selected="true" />
+<select idref="file_owner_etc_gshadow" selected="true" />
 <select idref="groupowner_gshadow_file" selected="true" />
 <select idref="perms_gshadow_file" selected="true" />
 <select idref="userowner_passwd_file" 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 29103c0..6f84753 100644
--- a/RHEL/6/input/profiles/nist-CL-IL-AL.xml
+++ b/RHEL/6/input/profiles/nist-CL-IL-AL.xml
@@ -139,7 +139,7 @@ assurance."</description>
 <select idref="userowner_group_file" selected="true" \>
 <select idref="groupowner_group_file" selected="true" \>
 <select idref="perms_group_file" selected="true" \>
-<select idref="userowner_gshadow_file" selected="true" \>
+<select idref="file_owner_etc_gshadow" selected="true" \>
 <select idref="groupowner_gshadow_file" selected="true" \>
 <select idref="perms_gshadow_file" selected="true" \>
 <select idref="userowner_passwd_file" selected="true" \>
diff --git a/RHEL/6/input/profiles/rht-ccp.xml b/RHEL/6/input/profiles/rht-ccp.xml
index b6df557..92db102 100644
--- a/RHEL/6/input/profiles/rht-ccp.xml
+++ b/RHEL/6/input/profiles/rht-ccp.xml
@@ -70,7 +70,7 @@
 <select idref="userowner_shadow_file" selected="true"/>
 <select idref="groupowner_shadow_file" selected="true"/>
 <select idref="file_permissions_etc_shadow" selected="true"/>
-<select idref="userowner_gshadow_file" selected="true"/>
+<select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="groupowner_gshadow_file" selected="true"/>
 <select idref="perms_gshadow_file" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
diff --git a/RHEL/6/input/profiles/usgcb-rhel6-server.xml b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
index c8a7bfb..96dbf1b 100644
--- a/RHEL/6/input/profiles/usgcb-rhel6-server.xml
+++ b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
@@ -34,7 +34,7 @@
 <select idref="kernel_module_squashfs_disabled" selected="true" />
 <select idref="kernel_module_udf_disabled" selected="true" />
 <select idref="perms_gshadow_file" selected="true" /> <!-- RHEL5 had this as chmod 400, RHEL6 as 0000 -->
-<select idref="userowner_gshadow_file" selected="true" />
+<select idref="file_owner_etc_gshadow" selected="true" />
 <select idref="groupowner_gshadow_file" selected="true" />
 <select idref="file_permissions_etc_shadow" selected="true" /> <!-- RHEL5 as 400, RHEL6 as 000 -->
 <select idref="userowner_shadow_file" selected="true" />
diff --git a/RHEL/6/input/system/permissions/files.xml b/RHEL/6/input/system/permissions/files.xml
index 9db278b..0157dcf 100644
--- a/RHEL/6/input/system/permissions/files.xml
+++ b/RHEL/6/input/system/permissions/files.xml
@@ -95,7 +95,7 @@ on the system. Protection of this file is important for system security.</ration
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="userowner_gshadow_file" severity="medium">
+<Rule id="file_owner_etc_gshadow" severity="medium">
 <title>Verify User Who Owns <tt>gshadow</tt> File</title>
 <description><fileowner-desc-macro file="/etc/gshadow" owner="root"/></description>
 <ocil><fileowner-check-macro file="/etc/gshadow" owner="root"/></ocil>
diff --git a/RHEL/7/input/auxiliary/stig_overlay.xml b/RHEL/7/input/auxiliary/stig_overlay.xml
index 3468472..5e6089d 100644
--- a/RHEL/7/input/auxiliary/stig_overlay.xml
+++ b/RHEL/7/input/auxiliary/stig_overlay.xml
@@ -100,7 +100,7 @@
 		<VMSinfo VKey="38504" SVKey="50305" VRelease="1" />
 		<title>The /etc/shadow file must have mode 0000.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="userowner_gshadow_file" ownerid="RHEL-06-000036" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_owner_etc_gshadow" ownerid="RHEL-06-000036" disa="366" severity="medium">
 		<VMSinfo VKey="38443" SVKey="50243" VRelease="1" />
 		<title>The /etc/gshadow file must be owned by root.</title>
 	</overlay>
diff --git a/RHEL/7/input/checks/file_owner_etc_gshadow.xml b/RHEL/7/input/checks/file_owner_etc_gshadow.xml
new file mode 120000
index 0000000..db306a3
--- /dev/null
+++ b/RHEL/7/input/checks/file_owner_etc_gshadow.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_owner_etc_gshadow.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 cc17b32..9c406bb 100644
--- a/RHEL/7/input/profiles/rht-ccp.xml
+++ b/RHEL/7/input/profiles/rht-ccp.xml
@@ -69,7 +69,7 @@ FILE PERMISSION CHECKS
 <select idref="userowner_shadow_file" selected="true"/>
 <select idref="groupowner_shadow_file" selected="true"/>
 <select idref="file_permissions_etc_shadow" selected="true"/>
-<select idref="userowner_gshadow_file" selected="true"/>
+<select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="groupowner_gshadow_file" selected="true"/>
 <select idref="perms_gshadow_file" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
diff --git a/RHEL/7/input/system/permissions/files.xml b/RHEL/7/input/system/permissions/files.xml
index 4464cf7..6273c3d 100644
--- a/RHEL/7/input/system/permissions/files.xml
+++ b/RHEL/7/input/system/permissions/files.xml
@@ -95,7 +95,7 @@ on the system. Protection of this file is important for system security.</ration
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="userowner_gshadow_file" severity="medium">
+<Rule id="file_owner_etc_gshadow" severity="medium">
 <title>Verify User Who Owns <tt>gshadow</tt> File</title>
 <description><fileowner-desc-macro file="/etc/gshadow" owner="root"/></description>
 <ocil><fileowner-check-macro file="/etc/gshadow" owner="root"/></ocil>
diff --git a/shared/oval/file_owner_etc_gshadow.xml b/shared/oval/file_owner_etc_gshadow.xml
new file mode 100644
index 0000000..e140ccc
--- /dev/null
+++ b/shared/oval/file_owner_etc_gshadow.xml
@@ -0,0 +1,30 @@
+<def-group>
+  <definition class="compliance" id="file_owner_etc_gshadow" version="1">
+    <metadata>
+      <title>Verify user who owns 'gshadow' file</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The /etc/gshadow file should be owned by the appropriate
+      user.</description>
+      <reference source="MED" ref_id="20130807" ref_url="test_attestation" />
+    </metadata>
+    <criteria>
+      <criterion test_ref="test_file_owner_etc_gshadow" />
+    </criteria>
+  </definition>
+  <unix:file_test check="all" check_existence="all_exist"
+  comment="Testing gshadow ownership" id="test_file_owner_etc_gshadow"
+  version="1">
+    <unix:object object_ref="object_file_owner_etc_gshadow" />
+    <unix:state state_ref="state_file_owner_etc_gshadow" />
+  </unix:file_test>
+  <unix:file_state id="state_file_owner_etc_gshadow" version="1">
+    <unix:user_id datatype="int">0</unix:user_id>
+  </unix:file_state>
+  <unix:file_object comment="/etc/gshadow" id="object_file_owner_etc_gshadow"
+  version="1">
+    <unix:filepath>/etc/gshadow</unix:filepath>
+  </unix:file_object>
+</def-group>
-- 
1.8.3.1



More information about the scap-security-guide mailing list