From 499d1cab2e0c290869185fea3f8a22cd359edbb4 Mon Sep 17 00:00:00 2001 From: Maura Dailey Date: Tue, 6 Aug 2013 13:52:36 -0400 Subject: [PATCH] Small patch to replace autogenerated test, state, and object ids with human readable ones (now with 80 character line breaks) Signed-off-by: Maura Dailey --- .../checks/accounts_root_path_dirs_no_write.xml | 50 +++++++++---------- .../checks/core_dump_suid_progs_limits_conf.xml | 18 ++++---- RHEL6/input/checks/core_dumps_limitsconf.xml | 23 ++++----- RHEL6/input/checks/file_groupowner_etc_group.xml | 24 ++++----- RHEL6/input/checks/file_groupowner_etc_gshadow.xml | 22 ++++----- RHEL6/input/checks/file_groupowner_etc_passwd.xml | 20 ++++---- RHEL6/input/checks/file_groupowner_etc_shadow.xml | 22 ++++----- RHEL6/input/checks/file_owner_etc_group.xml | 23 ++++----- RHEL6/input/checks/file_owner_etc_gshadow.xml | 24 ++++----- RHEL6/input/checks/file_owner_etc_passwd.xml | 23 ++++----- RHEL6/input/checks/file_permissions_etc_group.xml | 20 ++++---- .../input/checks/file_permissions_ungroupowned.xml | 26 +++++------ RHEL6/input/checks/interactive_boot_disable.xml | 21 ++++---- 13 files changed, 145 insertions(+), 171 deletions(-) diff --git a/RHEL6/input/checks/accounts_root_path_dirs_no_write.xml b/RHEL6/input/checks/accounts_root_path_dirs_no_write.xml index 36a02cf..d0a20d3 100644 --- a/RHEL6/input/checks/accounts_root_path_dirs_no_write.xml +++ b/RHEL6/input/checks/accounts_root_path_dirs_no_write.xml @@ -1,60 +1,58 @@ - + - Write permissions are disabled for group and other in - all directories in Root's Path + Write permissions are disabled for group and other in all + directories in Root's Path Red Hat Enterprise Linux 6 - Check each directory in root's path and make use - it does not grant write permission to group and - other + Check each directory in root's path and make use it does not + grant write permission to group and other + test_ref="test_accounts_root_path_dirs_no_write_group" /> + test_ref="test_accounts_root_path_dirs_no_write_other" /> - - + comment="Check that write permission to group in root's path is denied" + id="test_accounts_root_path_dirs_no_write_group" version="1"> + + + id="state_accounts_root_path_dirs_no_write_group" version="1"> 1 - + - + + object_ref="object_accounts_root_path_dirs_no_write_pathenv" /> - PATH - - + comment="Check that write permission to other in root's path is denied" + id="test_accounts_root_path_dirs_no_write_other" version="1"> + + + id="state_accounts_root_path_dirs_no_write_other" version="1"> 1 diff --git a/RHEL6/input/checks/core_dump_suid_progs_limits_conf.xml b/RHEL6/input/checks/core_dump_suid_progs_limits_conf.xml index a2079f9..066957a 100644 --- a/RHEL6/input/checks/core_dump_suid_progs_limits_conf.xml +++ b/RHEL6/input/checks/core_dump_suid_progs_limits_conf.xml @@ -1,6 +1,6 @@ - + Disable Core Dumps for setuid programs @@ -11,20 +11,20 @@ + test_ref="test_core_dump_suid_progs_limits_conf" /> - - + id="test_core_dump_suid_progs_limits_conf" version="2"> + - /etc/security limits.conf - ^fs.suid_dumpable\s+=\s+1$ + + ^fs.suid_dumpable\s+=\s+1$ 1 diff --git a/RHEL6/input/checks/core_dumps_limitsconf.xml b/RHEL6/input/checks/core_dumps_limitsconf.xml index cb86b30..4107aae 100644 --- a/RHEL6/input/checks/core_dumps_limitsconf.xml +++ b/RHEL6/input/checks/core_dumps_limitsconf.xml @@ -1,34 +1,31 @@ - + Disable Core Dumps Red Hat Enterprise Linux 6 - Core dumps for all users should be - disabled + Core dumps for all users should be disabled + test_ref="test_core_dumps_limitsconf" /> - - + id="test_core_dumps_limitsconf" version="1"> + + - + 0 - + /etc/security limits.conf - ^[\s]*\*[\s]+hard[\s]+core[\s]+([\d]+) + + ^[\s]*\*[\s]+hard[\s]+core[\s]+([\d]+) 1 diff --git a/RHEL6/input/checks/file_groupowner_etc_group.xml b/RHEL6/input/checks/file_groupowner_etc_group.xml index eb61289..67f44cb 100644 --- a/RHEL6/input/checks/file_groupowner_etc_group.xml +++ b/RHEL6/input/checks/file_groupowner_etc_group.xml @@ -1,30 +1,28 @@ - + Verify group who owns 'group' file Red Hat Enterprise Linux 6 - The /etc/group file should be owned by the - appropriate group. + The /etc/group file should be owned by the appropriate + group. - + - - - - + + + + 0 - + /etc group diff --git a/RHEL6/input/checks/file_groupowner_etc_gshadow.xml b/RHEL6/input/checks/file_groupowner_etc_gshadow.xml index 7ee2921..833aa53 100644 --- a/RHEL6/input/checks/file_groupowner_etc_gshadow.xml +++ b/RHEL6/input/checks/file_groupowner_etc_gshadow.xml @@ -1,30 +1,28 @@ - + Verify group who owns 'gshadow' file Red Hat Enterprise Linux 6 - The /etc/gshadow file should be owned by the - appropriate group. + The /etc/gshadow file should be owned by the appropriate + group. - + - - - - + + + + 0 + id="object_file_groupowner_etc_gshadow" version="1"> /etc gshadow diff --git a/RHEL6/input/checks/file_groupowner_etc_passwd.xml b/RHEL6/input/checks/file_groupowner_etc_passwd.xml index d47e9bc..5f79132 100644 --- a/RHEL6/input/checks/file_groupowner_etc_passwd.xml +++ b/RHEL6/input/checks/file_groupowner_etc_passwd.xml @@ -1,30 +1,28 @@ - + Verify group who owns 'passwd' file Red Hat Enterprise Linux 6 - The /etc/passwd file should be owned by the - appropriate group. + The /etc/passwd file should be owned by the appropriate + group. - + - - + id="test_file_groupowner_etc_passwd" version="1"> + + - + 0 + id="object_file_groupowner_etc_passwd" version="1"> /etc passwd diff --git a/RHEL6/input/checks/file_groupowner_etc_shadow.xml b/RHEL6/input/checks/file_groupowner_etc_shadow.xml index 4127177..953c869 100644 --- a/RHEL6/input/checks/file_groupowner_etc_shadow.xml +++ b/RHEL6/input/checks/file_groupowner_etc_shadow.xml @@ -1,30 +1,28 @@ - + Verify group who owns 'shadow' file Red Hat Enterprise Linux 6 - The /etc/shadow file should be owned by the - appropriate group. + The /etc/shadow file should be owned by the appropriate + group. - + - - - - + + + + 0 + id="object_file_groupowner_etc_shadow" version="1"> /etc shadow diff --git a/RHEL6/input/checks/file_owner_etc_group.xml b/RHEL6/input/checks/file_owner_etc_group.xml index de3de67..a74ef27 100644 --- a/RHEL6/input/checks/file_owner_etc_group.xml +++ b/RHEL6/input/checks/file_owner_etc_group.xml @@ -1,30 +1,27 @@ - + Verify user who owns 'group' file Red Hat Enterprise Linux 6 - The /etc/group file should be owned by the - appropriate user. + The /etc/group file should be owned by the appropriate + user. - + - - + comment="Testing user ownership" id="test_file_owner_etc_group" version="1"> + + - + 0 - + /etc group diff --git a/RHEL6/input/checks/file_owner_etc_gshadow.xml b/RHEL6/input/checks/file_owner_etc_gshadow.xml index eb02df1..a33952e 100644 --- a/RHEL6/input/checks/file_owner_etc_gshadow.xml +++ b/RHEL6/input/checks/file_owner_etc_gshadow.xml @@ -1,30 +1,28 @@ - + Verify user who owns 'gshadow' file Red Hat Enterprise Linux 6 - The /etc/gshadow file should be owned by the - appropriate user. + The /etc/gshadow file should be owned by the appropriate + user. - + - - - - + + + + 0 - + /etc gshadow diff --git a/RHEL6/input/checks/file_owner_etc_passwd.xml b/RHEL6/input/checks/file_owner_etc_passwd.xml index 73e9899..5fb621d 100644 --- a/RHEL6/input/checks/file_owner_etc_passwd.xml +++ b/RHEL6/input/checks/file_owner_etc_passwd.xml @@ -1,30 +1,27 @@ - + Verify user who owns 'passwd' file Red Hat Enterprise Linux 6 - The /etc/passwd file should be owned by the - appropriate user. + The /etc/passwd file should be owned by the appropriate + user. - + - - + comment="Testing user ownership" id="test_file_owner_etc_passwd" version="1"> + + - + 0 - + /etc passwd diff --git a/RHEL6/input/checks/file_permissions_etc_group.xml b/RHEL6/input/checks/file_permissions_etc_group.xml index 774c5d9..c547656 100644 --- a/RHEL6/input/checks/file_permissions_etc_group.xml +++ b/RHEL6/input/checks/file_permissions_etc_group.xml @@ -1,6 +1,5 @@ - + Verify permissions on 'group' file @@ -10,17 +9,16 @@ correctly. - + - - - - + + + + true true false @@ -31,8 +29,8 @@ false false - + /etc group diff --git a/RHEL6/input/checks/file_permissions_ungroupowned.xml b/RHEL6/input/checks/file_permissions_ungroupowned.xml index 5bc34f7..8becd03 100644 --- a/RHEL6/input/checks/file_permissions_ungroupowned.xml +++ b/RHEL6/input/checks/file_permissions_ungroupowned.xml @@ -1,37 +1,35 @@ - + Find files unowned by a group Red Hat Enterprise Linux 6 - All files should be owned by a - group + All files should be owned by a group + negate="true" test_ref="test_file_permissions_ungroupowned" /> + id="test_file_permissions_ungroupowned" version="1"> - This will enumerate all files on local - partitions + This will enumerate all files on local partitions - - + + + id="state_file_permissions_ungroupowned" version="1"> 0 - + id="object_file_permissions_ungroupowned" version="1"> + / .* diff --git a/RHEL6/input/checks/interactive_boot_disable.xml b/RHEL6/input/checks/interactive_boot_disable.xml index 7f8ddd8..0f694ea 100644 --- a/RHEL6/input/checks/interactive_boot_disable.xml +++ b/RHEL6/input/checks/interactive_boot_disable.xml @@ -1,29 +1,28 @@ - + Disable Interactive Boot Red Hat Enterprise Linux 6 - The ability for users to perform interactive - startups should be disabled. + The ability for users to perform interactive startups should + be disabled. - + - - + id="test_interactive_boot_disable" version="1"> + - /etc/sysconfig init - PROMPT[\s]*=[\s]*no\s*$ + + PROMPT[\s]*=[\s]*no\s*$ 1 -- 1.7.1