[PATCH 18/31] XCCDF perms_gshadow_file to

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


-------------- next part --------------
>From e1a914ecfdfd5873d8d5988d5c6eb743ea4b7c75 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Fri, 27 Dec 2013 01:07:11 -0500
Subject: [PATCH 18/31] XCCDF perms_gshadow_file to
 file_permissions_etc_gshadow.xml, added to shared/

- Updated to match templating style

- Tested on RHEL7, updated CPE, added to shared/
---
 RHEL/6/input/auxiliary/stig_overlay.xml            |  2 +-
 .../input/checks/file_permissions_etc_gshadow.xml  | 48 +---------------------
 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 +-
 .../input/checks/file_permissions_etc_gshadow.xml  |  1 +
 RHEL/7/input/profiles/rht-ccp.xml                  |  2 +-
 RHEL/7/input/system/permissions/files.xml          |  2 +-
 shared/oval/file_permissions_etc_gshadow.xml       | 47 +++++++++++++++++++++
 14 files changed, 60 insertions(+), 58 deletions(-)
 mode change 100644 => 120000 RHEL/6/input/checks/file_permissions_etc_gshadow.xml
 create mode 120000 RHEL/7/input/checks/file_permissions_etc_gshadow.xml
 create mode 100644 shared/oval/file_permissions_etc_gshadow.xml

diff --git a/RHEL/6/input/auxiliary/stig_overlay.xml b/RHEL/6/input/auxiliary/stig_overlay.xml
index 8d17020..e1d21c2 100644
--- a/RHEL/6/input/auxiliary/stig_overlay.xml
+++ b/RHEL/6/input/auxiliary/stig_overlay.xml
@@ -108,7 +108,7 @@
 		<VMSinfo VKey="38448" SVKey="50248" VRelease="1" />
 		<title>The /etc/gshadow file must be group-owned by root.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="perms_gshadow_file" ownerid="RHEL-06-000038" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_permissions_etc_gshadow" ownerid="RHEL-06-000038" disa="366" severity="medium">
 		<VMSinfo VKey="38449" SVKey="50249" VRelease="1" />
 		<title>The /etc/gshadow file must have mode 0000.</title>
 	</overlay>
diff --git a/RHEL/6/input/checks/file_permissions_etc_gshadow.xml b/RHEL/6/input/checks/file_permissions_etc_gshadow.xml
deleted file mode 100644
index 1a30780..0000000
--- a/RHEL/6/input/checks/file_permissions_etc_gshadow.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_permission_checks.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="file_permissions_etc_gshadow" version="1">
-    <metadata>
-      <title>Verify /etc/gshadow Permissions</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>This test makes sure that /etc/gshadow is owned by 0, group owned by 0, and has mode 0000. If
-      the target file or directory has an extended ACL then it will fail the mode check.</description>
-      <reference source="swells" ref_id="20130831" ref_url="test_attestation"/>
-    </metadata>
-    <criteria>
-      <criterion test_ref="test_etc_gshadow" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist" comment="/etc/gshadow mode and ownership" id="test_etc_gshadow" version="1">
-    <unix:object object_ref="object_etc_gshadow" />
-    <unix:state state_ref="_etc_gshadow_state_uid_0" />
-    <unix:state state_ref="_etc_gshadow_state_gid_0" />
-    <unix:state state_ref="_etc_gshadow_state_mode_0000" />
-  </unix:file_test>
-  <unix:file_object comment="/etc/gshadow" id="object_etc_gshadow" version="1">
-    <unix:path>/etc</unix:path>
-    <unix:filename>gshadow</unix:filename>
-  </unix:file_object>
-  <unix:file_state id="_etc_gshadow_state_uid_0" version="1">
-    <unix:user_id datatype="int" operation="equals">0</unix:user_id>
-  </unix:file_state>
-  <unix:file_state id="_etc_gshadow_state_gid_0" version="1">
-    <unix:group_id datatype="int" operation="equals">0</unix:group_id>
-  </unix:file_state>
-  <unix:file_state id="_etc_gshadow_state_mode_0000" version="1">
-	<unix:suid datatype="boolean">false</unix:suid>
-	<unix:sgid datatype="boolean">false</unix:sgid>
-	<unix:sticky datatype="boolean">false</unix:sticky>
-	<unix:uread datatype="boolean">false</unix:uread>
-	<unix:uwrite datatype="boolean">false</unix:uwrite>
-	<unix:uexec datatype="boolean">false</unix:uexec>
-	<unix:gread datatype="boolean">false</unix:gread>
-	<unix:gwrite datatype="boolean">false</unix:gwrite>
-	<unix:gexec datatype="boolean">false</unix:gexec>
-	<unix:oread datatype="boolean">false</unix:oread>
-	<unix:owrite datatype="boolean">false</unix:owrite>
-	<unix:oexec datatype="boolean">false</unix:oexec>
-  </unix:file_state>
-</def-group>
diff --git a/RHEL/6/input/checks/file_permissions_etc_gshadow.xml b/RHEL/6/input/checks/file_permissions_etc_gshadow.xml
new file mode 120000
index 0000000..75c454a
--- /dev/null
+++ b/RHEL/6/input/checks/file_permissions_etc_gshadow.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_permissions_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 1ef915d..d8d3f43 100644
--- a/RHEL/6/input/profiles/CS2.xml
+++ b/RHEL/6/input/profiles/CS2.xml
@@ -153,7 +153,7 @@
 <select idref="file_permissions_etc_shadow" selected="true"/>
 <select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="file_groupowner_etc_gshadow" selected="true"/>
-<select idref="perms_gshadow_file" selected="true"/>
+<select idref="file_permissions_etc_gshadow" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
 <select idref="groupowner_passwd_file" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
diff --git a/RHEL/6/input/profiles/common.xml b/RHEL/6/input/profiles/common.xml
index 792f1fa..eea2ac7 100644
--- a/RHEL/6/input/profiles/common.xml
+++ b/RHEL/6/input/profiles/common.xml
@@ -30,7 +30,7 @@
 
 <select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="file_groupowner_etc_gshadow" selected="true"/>
-<select idref="perms_gshadow_file" selected="true"/>
+<select idref="file_permissions_etc_gshadow" selected="true"/>
 
 <select idref="userowner_passwd_file" selected="true"/>
 <select idref="groupowner_passwd_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 22188c6..105d7ce 100644
--- a/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
+++ b/RHEL/6/input/profiles/fisma-medium-rhel6-server.xml
@@ -47,7 +47,7 @@
 <select idref="perms_group_file" selected="true" />
 <select idref="file_owner_etc_gshadow" selected="true" />
 <select idref="file_groupowner_etc_gshadow" selected="true" />
-<select idref="perms_gshadow_file" selected="true" />
+<select idref="file_permissions_etc_gshadow" selected="true" />
 <select idref="userowner_passwd_file" selected="true" />
 <select idref="groupowner_passwd_file" selected="true" />
 <select idref="file_permissions_etc_passwd" 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 d9b1f2b..7bf1293 100644
--- a/RHEL/6/input/profiles/nist-CL-IL-AL.xml
+++ b/RHEL/6/input/profiles/nist-CL-IL-AL.xml
@@ -141,7 +141,7 @@ assurance."</description>
 <select idref="perms_group_file" selected="true" \>
 <select idref="file_owner_etc_gshadow" selected="true" \>
 <select idref="file_groupowner_etc_gshadow" selected="true" \>
-<select idref="perms_gshadow_file" selected="true" \>
+<select idref="file_permissions_etc_gshadow" selected="true" \>
 <select idref="userowner_passwd_file" selected="true" \>
 <select idref="groupowner_passwd_file" selected="true" \>
 <select idref="file_permissions_etc_passwd" selected="true" \>
diff --git a/RHEL/6/input/profiles/rht-ccp.xml b/RHEL/6/input/profiles/rht-ccp.xml
index 1bd54b1..8af94c5 100644
--- a/RHEL/6/input/profiles/rht-ccp.xml
+++ b/RHEL/6/input/profiles/rht-ccp.xml
@@ -72,7 +72,7 @@
 <select idref="file_permissions_etc_shadow" selected="true"/>
 <select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="file_groupowner_etc_gshadow" selected="true"/>
-<select idref="perms_gshadow_file" selected="true"/>
+<select idref="file_permissions_etc_gshadow" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
 <select idref="groupowner_passwd_file" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
diff --git a/RHEL/6/input/profiles/usgcb-rhel6-server.xml b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
index fbc1afa..1f85107 100644
--- a/RHEL/6/input/profiles/usgcb-rhel6-server.xml
+++ b/RHEL/6/input/profiles/usgcb-rhel6-server.xml
@@ -33,7 +33,7 @@
 <select idref="kernel_module_jffs2_disabled" selected="true" />
 <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="file_permissions_etc_gshadow" selected="true" /> <!-- RHEL5 had this as chmod 400, RHEL6 as 0000 -->
 <select idref="file_owner_etc_gshadow" selected="true" />
 <select idref="file_groupowner_etc_gshadow" selected="true" />
 <select idref="file_permissions_etc_shadow" selected="true" /> <!-- RHEL5 as 400, RHEL6 as 000 -->
diff --git a/RHEL/6/input/system/permissions/files.xml b/RHEL/6/input/system/permissions/files.xml
index bbae77b..6f6f5c0 100644
--- a/RHEL/6/input/system/permissions/files.xml
+++ b/RHEL/6/input/system/permissions/files.xml
@@ -119,7 +119,7 @@ is critical for system security.</rationale>
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="perms_gshadow_file" severity="medium">
+<Rule id="file_permissions_etc_gshadow" severity="medium">
 <title>Verify Permissions on <tt>gshadow</tt> File</title>
 <description><fileperms-desc-macro file="/etc/gshadow" perms="0000"/></description>
 <ocil><fileperms-check-macro file="/etc/gshadow" perms="----------"/></ocil>
diff --git a/RHEL/7/input/auxiliary/stig_overlay.xml b/RHEL/7/input/auxiliary/stig_overlay.xml
index da6a57b..3152f32 100644
--- a/RHEL/7/input/auxiliary/stig_overlay.xml
+++ b/RHEL/7/input/auxiliary/stig_overlay.xml
@@ -108,7 +108,7 @@
 		<VMSinfo VKey="38448" SVKey="50248" VRelease="1" />
 		<title>The /etc/gshadow file must be group-owned by root.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="perms_gshadow_file" ownerid="RHEL-06-000038" disa="366" severity="medium">
+	<overlay owner="disastig" ruleid="file_permissions_etc_gshadow" ownerid="RHEL-06-000038" disa="366" severity="medium">
 		<VMSinfo VKey="38449" SVKey="50249" VRelease="1" />
 		<title>The /etc/gshadow file must have mode 0000.</title>
 	</overlay>
diff --git a/RHEL/7/input/checks/file_permissions_etc_gshadow.xml b/RHEL/7/input/checks/file_permissions_etc_gshadow.xml
new file mode 120000
index 0000000..75c454a
--- /dev/null
+++ b/RHEL/7/input/checks/file_permissions_etc_gshadow.xml
@@ -0,0 +1 @@
+../../../../shared/oval/file_permissions_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 c2102af..a8d25a3 100644
--- a/RHEL/7/input/profiles/rht-ccp.xml
+++ b/RHEL/7/input/profiles/rht-ccp.xml
@@ -71,7 +71,7 @@ FILE PERMISSION CHECKS
 <select idref="file_permissions_etc_shadow" selected="true"/>
 <select idref="file_owner_etc_gshadow" selected="true"/>
 <select idref="file_groupowner_etc_gshadow" selected="true"/>
-<select idref="perms_gshadow_file" selected="true"/>
+<select idref="file_permissions_etc_gshadow" selected="true"/>
 <select idref="userowner_passwd_file" selected="true"/>
 <select idref="groupowner_passwd_file" selected="true"/>
 <select idref="file_permissions_etc_passwd" selected="true"/>
diff --git a/RHEL/7/input/system/permissions/files.xml b/RHEL/7/input/system/permissions/files.xml
index 67b28c4..a580674 100644
--- a/RHEL/7/input/system/permissions/files.xml
+++ b/RHEL/7/input/system/permissions/files.xml
@@ -119,7 +119,7 @@ is critical for system security.</rationale>
 <tested by="DS" on="20121026"/>
 </Rule>
 
-<Rule id="perms_gshadow_file" severity="medium">
+<Rule id="file_permissions_etc_gshadow" severity="medium">
 <title>Verify Permissions on <tt>gshadow</tt> File</title>
 <description><fileperms-desc-macro file="/etc/gshadow" perms="0000"/></description>
 <ocil><fileperms-check-macro file="/etc/gshadow" perms="----------"/></ocil>
diff --git a/shared/oval/file_permissions_etc_gshadow.xml b/shared/oval/file_permissions_etc_gshadow.xml
new file mode 100644
index 0000000..30bb0bf
--- /dev/null
+++ b/shared/oval/file_permissions_etc_gshadow.xml
@@ -0,0 +1,47 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_permission_checks.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="file_permissions_etc_gshadow" version="1">
+    <metadata>
+      <title>Verify /etc/gshadow Permissions</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>This test makes sure that /etc/gshadow is owned by 0, group owned by 0, and has mode 0000. If
+      the target file or directory has an extended ACL then it will fail the mode check.</description>
+      <reference source="swells" ref_id="20130831" ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion test_ref="test_etc_gshadow" />
+    </criteria>
+  </definition>
+  <unix:file_test check="all" check_existence="all_exist" comment="/etc/gshadow mode and ownership" id="test_etc_gshadow" version="1">
+    <unix:object object_ref="object_etc_gshadow" />
+    <unix:state state_ref="_etc_gshadow_state_uid_0" />
+    <unix:state state_ref="_etc_gshadow_state_gid_0" />
+    <unix:state state_ref="_etc_gshadow_state_mode_0000" />
+  </unix:file_test>
+  <unix:file_object comment="/etc/gshadow" id="object_etc_gshadow" version="1">
+    <unix:filepath>/etc/gshadow</unix:filepath>
+  </unix:file_object>
+  <unix:file_state id="_etc_gshadow_state_uid_0" version="1">
+    <unix:user_id datatype="int" operation="equals">0</unix:user_id>
+  </unix:file_state>
+  <unix:file_state id="_etc_gshadow_state_gid_0" version="1">
+    <unix:group_id datatype="int" operation="equals">0</unix:group_id>
+  </unix:file_state>
+  <unix:file_state id="_etc_gshadow_state_mode_0000" version="1">
+	<unix:suid datatype="boolean">false</unix:suid>
+	<unix:sgid datatype="boolean">false</unix:sgid>
+	<unix:sticky datatype="boolean">false</unix:sticky>
+	<unix:uread datatype="boolean">false</unix:uread>
+	<unix:uwrite datatype="boolean">false</unix:uwrite>
+	<unix:uexec datatype="boolean">false</unix:uexec>
+	<unix:gread datatype="boolean">false</unix:gread>
+	<unix:gwrite datatype="boolean">false</unix:gwrite>
+	<unix:gexec datatype="boolean">false</unix:gexec>
+	<unix:oread datatype="boolean">false</unix:oread>
+	<unix:owrite datatype="boolean">false</unix:owrite>
+	<unix:oexec datatype="boolean">false</unix:oexec>
+  </unix:file_state>
+</def-group>
-- 
1.8.3.1



More information about the scap-security-guide mailing list