[PATCH 04/21] Updated template_permissions to place FILEID into strings

Shawn Wells shawn.d.wells at gmail.com
Mon May 13 03:11:16 UTC 2013


-------------- next part --------------
>From 7fae707ccf94efe213a94186993a4f9ae3a29cb9 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Sun, 12 May 2013 22:08:37 -0400
Subject: [PATCH 04/21] Updated template_permissions to place FILEID into strings

Build was producing the following errors:
Duplicate ID, which will not be added: state_uid_0
Duplicate ID, which will not be added: state_gid_0
Duplicate ID, which will not be added: state_mode_0000

These strings were common across all file_permissions_*. Prepended FILEID within
the template build process to give each check its own state names.
---
 .../file_permissions_boot_grub_grub_conf.xml       |   12 ++++++------
 .../input/checks/file_permissions_etc_gshadow.xml  |   12 ++++++------
 RHEL6/input/checks/file_permissions_etc_passwd.xml |   12 ++++++------
 RHEL6/input/checks/file_permissions_etc_shadow.xml |   12 ++++++------
 RHEL6/input/checks/templates/template_permissions  |   12 ++++++------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/RHEL6/input/checks/file_permissions_boot_grub_grub_conf.xml b/RHEL6/input/checks/file_permissions_boot_grub_grub_conf.xml
index c198cd5..b185de9 100644
--- a/RHEL6/input/checks/file_permissions_boot_grub_grub_conf.xml
+++ b/RHEL6/input/checks/file_permissions_boot_grub_grub_conf.xml
@@ -15,21 +15,21 @@
   </definition>
   <unix:file_test check="all" check_existence="all_exist" comment="/boot/grub/grub.conf mode and ownership" id="test_boot_grub_grub_conf" version="1">
     <unix:object object_ref="object_boot_grub_grub_conf" />
-    <unix:state state_ref="grub_state_uid_0" />
-    <unix:state state_ref="grub_state_gid_0" />
-    <unix:state state_ref="state_mode_0600" />
+    <unix:state state_ref="_boot_grub_grub_conf_state_uid_0" />
+    <unix:state state_ref="_boot_grub_grub_conf_state_gid_0" />
+    <unix:state state_ref="_boot_grub_grub_conf_state_mode_0600" />
   </unix:file_test>
   <unix:file_object comment="/boot/grub/grub.conf" id="object_boot_grub_grub_conf" version="1">
     <unix:path>/boot/grub</unix:path>
     <unix:filename>grub.conf</unix:filename>
   </unix:file_object>
-  <unix:file_state id="grub_state_uid_0" version="1">
+  <unix:file_state id="_boot_grub_grub_conf_state_uid_0" version="1">
     <unix:user_id datatype="int" operation="equals">0</unix:user_id>
   </unix:file_state>
-  <unix:file_state id="grub_state_gid_0" version="1">
+  <unix:file_state id="_boot_grub_grub_conf_state_gid_0" version="1">
     <unix:group_id datatype="int" operation="equals">0</unix:group_id>
   </unix:file_state>
-  <unix:file_state id="state_mode_0600" version="1">
+  <unix:file_state id="_boot_grub_grub_conf_state_mode_0600" version="1">
 	<unix:suid datatype="boolean">false</unix:suid>
 	<unix:sgid datatype="boolean">false</unix:sgid>
 	<unix:sticky datatype="boolean">false</unix:sticky>
diff --git a/RHEL6/input/checks/file_permissions_etc_gshadow.xml b/RHEL6/input/checks/file_permissions_etc_gshadow.xml
index ebfaf48..ea3540c 100644
--- a/RHEL6/input/checks/file_permissions_etc_gshadow.xml
+++ b/RHEL6/input/checks/file_permissions_etc_gshadow.xml
@@ -15,21 +15,21 @@
   </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="gshadow_state_uid_0" />
-    <unix:state state_ref="gshadow_state_gid_0" />
-    <unix:state state_ref="state_mode_0000" />
+    <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="gshadow_state_uid_0" version="1">
+  <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="gshadow_state_gid_0" version="1">
+  <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="state_mode_0000" version="1">
+  <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>
diff --git a/RHEL6/input/checks/file_permissions_etc_passwd.xml b/RHEL6/input/checks/file_permissions_etc_passwd.xml
index 2b034a0..042f088 100644
--- a/RHEL6/input/checks/file_permissions_etc_passwd.xml
+++ b/RHEL6/input/checks/file_permissions_etc_passwd.xml
@@ -15,21 +15,21 @@
   </definition>
   <unix:file_test check="all" check_existence="all_exist" comment="/etc/passwd mode and ownership" id="test_etc_passwd" version="1">
     <unix:object object_ref="object_etc_passwd" />
-    <unix:state state_ref="passwd_state_uid_0" />
-    <unix:state state_ref="passwd_state_gid_0" />
-    <unix:state state_ref="state_mode_0644" />
+    <unix:state state_ref="_etc_passwd_state_uid_0" />
+    <unix:state state_ref="_etc_passwd_state_gid_0" />
+    <unix:state state_ref="_etc_passwd_state_mode_0644" />
   </unix:file_test>
   <unix:file_object comment="/etc/passwd" id="object_etc_passwd" version="1">
     <unix:path>/etc</unix:path>
     <unix:filename>passwd</unix:filename>
   </unix:file_object>
-  <unix:file_state id="passwd_state_uid_0" version="1">
+  <unix:file_state id="_etc_passwd_state_uid_0" version="1">
     <unix:user_id datatype="int" operation="equals">0</unix:user_id>
   </unix:file_state>
-  <unix:file_state id="passwd_state_gid_0" version="1">
+  <unix:file_state id="_etc_passwd_state_gid_0" version="1">
     <unix:group_id datatype="int" operation="equals">0</unix:group_id>
   </unix:file_state>
-  <unix:file_state id="state_mode_0644" version="1">
+  <unix:file_state id="_etc_passwd_state_mode_0644" version="1">
 	<unix:suid datatype="boolean">false</unix:suid>
 	<unix:sgid datatype="boolean">false</unix:sgid>
 	<unix:sticky datatype="boolean">false</unix:sticky>
diff --git a/RHEL6/input/checks/file_permissions_etc_shadow.xml b/RHEL6/input/checks/file_permissions_etc_shadow.xml
index 1303c7f..2e3a45c 100644
--- a/RHEL6/input/checks/file_permissions_etc_shadow.xml
+++ b/RHEL6/input/checks/file_permissions_etc_shadow.xml
@@ -15,21 +15,21 @@
   </definition>
   <unix:file_test check="all" check_existence="all_exist" comment="/etc/shadow mode and ownership" id="test_etc_shadow" version="1">
     <unix:object object_ref="object_etc_shadow" />
-    <unix:state state_ref="shadow_state_uid_0" />
-    <unix:state state_ref="shadow_state_gid_0" />
-    <unix:state state_ref="state_mode_0000" />
+    <unix:state state_ref="_etc_shadow_state_uid_0" />
+    <unix:state state_ref="_etc_shadow_state_gid_0" />
+    <unix:state state_ref="_etc_shadow_state_mode_0000" />
   </unix:file_test>
   <unix:file_object comment="/etc/shadow" id="object_etc_shadow" version="1">
     <unix:path>/etc</unix:path>
     <unix:filename>shadow</unix:filename>
   </unix:file_object>
-  <unix:file_state id="shadow_state_uid_0" version="1">
+  <unix:file_state id="_etc_shadow_state_uid_0" version="1">
     <unix:user_id datatype="int" operation="equals">0</unix:user_id>
   </unix:file_state>
-  <unix:file_state id="shadow_state_gid_0" version="1">
+  <unix:file_state id="_etc_shadow_state_gid_0" version="1">
     <unix:group_id datatype="int" operation="equals">0</unix:group_id>
   </unix:file_state>
-  <unix:file_state id="state_mode_0000" version="1">
+  <unix:file_state id="_etc_shadow_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>
diff --git a/RHEL6/input/checks/templates/template_permissions b/RHEL6/input/checks/templates/template_permissions
index c3a2c38..e0a2c62 100644
--- a/RHEL6/input/checks/templates/template_permissions
+++ b/RHEL6/input/checks/templates/template_permissions
@@ -15,20 +15,20 @@
   </definition>
   <unix:file_test check="all" check_existence="all_exist" comment="FILEPATH mode and ownership" id="testFILEID" version="1">
     <unix:object object_ref="objectFILEID" />
-    <unix:state state_ref="state_uid_FILEUID" />
-    <unix:state state_ref="state_gid_FILEGID" />
-    <unix:state state_ref="state_mode_FILEMODE" />
+    <unix:state state_ref="FILEID_state_uid_FILEUID" />
+    <unix:state state_ref="FILEID_state_gid_FILEGID" />
+    <unix:state state_ref="FILEID_state_mode_FILEMODE" />
   </unix:file_test>
   <unix:file_object comment="FILEPATH" id="objectFILEID" version="1">
     <unix:path>FILEDIR</unix:path>
     UNIX_FILENAME
   </unix:file_object>
-  <unix:file_state id="state_uid_FILEUID" version="1">
+  <unix:file_state id="FILEID_state_uid_FILEUID" version="1">
     <unix:user_id datatype="int" operation="equals">FILEUID</unix:user_id>
   </unix:file_state>
-  <unix:file_state id="state_gid_FILEGID" version="1">
+  <unix:file_state id="FILEID_state_gid_FILEGID" version="1">
     <unix:group_id datatype="int" operation="equals">FILEGID</unix:group_id>
   </unix:file_state>
-  <unix:file_state id="state_mode_FILEMODE" version="1">
+  <unix:file_state id="FILEID_state_mode_FILEMODE" version="1">
 STATEMODE
 </def-group>
-- 
1.7.1



More information about the scap-security-guide mailing list