[PATCH 20/25] accounts_minimum_age_login_defs --> shared/ && RHEL6
Shawn Wells
shawn at redhat.com
Tue Dec 24 01:59:55 UTC 2013
-------------- next part --------------
>From 10194f89562c7849000282ee82d86790e436c489 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Mon, 23 Dec 2013 08:01:19 -0500
Subject: [PATCH 20/25] accounts_minimum_age_login_defs --> shared/ && RHEL6
CCP profile update
- RHEL6 CCP profile using incorrect XCCDF variable, updated to
var_accounts_minimum_age_login_defs
- Added accounts_minimum_age_login_defs.xml to shared/
- Updated symlinks
Signed-off-by: Shawn Wells <shawn at redhat.com>
---
:100644 120000 a0cc5c3... 76381c0... T RHEL/6/input/checks/accounts_minimum_age_login_defs.xml
:100644 100644 bee24dd... e214b7e... M RHEL/6/input/profiles/rht-ccp.xml
:000000 120000 0000000... 76381c0... A RHEL/7/input/checks/accounts_minimum_age_login_defs.xml
:000000 100644 0000000... 03ada1e... A shared/oval/accounts_minimum_age_login_defs.xml
.../checks/accounts_minimum_age_login_defs.xml | 36 +---------------------
RHEL/6/input/profiles/rht-ccp.xml | 2 +-
.../checks/accounts_minimum_age_login_defs.xml | 1 +
shared/oval/accounts_minimum_age_login_defs.xml | 36 ++++++++++++++++++++++
4 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml b/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml
deleted file mode 100644
index a0cc5c3..0000000
--- a/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<def-group>
- <definition class="compliance" id="accounts_minimum_age_login_defs" version="1">
- <metadata>
- <title>Set Password Expiration Parameters</title>
- <affected family="unix">
- <platform>Red Hat Enterprise Linux 6</platform>
- </affected>
- <description>The minimum password age policy should be set appropriately.</description>
- <reference source="MED" ref_id="20130807" ref_url="test_attestation" />
- </metadata>
- <criteria comment="the value PASS_MIN_DAYS should be set appropriately in /etc/login.defs">
- <criterion test_ref="test_pass_min_days" />
- </criteria>
- </definition>
-
- <ind:textfilecontent54_test check="all"
- comment="Tests the value of PASS_MIN_DAYS in /etc/login.defs"
- id="test_pass_min_days" version="1">
- <ind:object object_ref="object_etc_login_defs_pass_min_age" />
- <ind:state state_ref="state_etc_login_defs_pass_min_age" />
- </ind:textfilecontent54_test>
-
- <ind:textfilecontent54_object id="object_etc_login_defs_pass_min_age" version="1">
- <ind:filepath>/etc/login.defs</ind:filepath>
- <ind:pattern operation="pattern match">^[\s]*PASS_MIN_DAYS[\s]+(\d+)\s*$</ind:pattern>
- <ind:instance datatype="int">1</ind:instance>
- </ind:textfilecontent54_object>
-
- <ind:textfilecontent54_state id="state_etc_login_defs_pass_min_age" version="1">
- <ind:subexpression operation="greater than or equal" var_ref="var_accounts_minimum_age_login_defs" datatype="int" />
- </ind:textfilecontent54_state>
-
- <external_variable comment="minimum password age in days" datatype="int" id="var_accounts_minimum_age_login_defs" version="1" />
-
-</def-group>
diff --git a/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml b/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml
new file mode 120000
index 0000000..76381c0
--- /dev/null
+++ b/RHEL/6/input/checks/accounts_minimum_age_login_defs.xml
@@ -0,0 +1 @@
+../../../../shared/oval/accounts_minimum_age_login_defs.xml
\ No newline at end of file
diff --git a/RHEL/6/input/profiles/rht-ccp.xml b/RHEL/6/input/profiles/rht-ccp.xml
index bee24dd..e214b7e 100644
--- a/RHEL/6/input/profiles/rht-ccp.xml
+++ b/RHEL/6/input/profiles/rht-ccp.xml
@@ -9,7 +9,7 @@
<refine-value idref="sshd_idle_timeout_value" selector="5_minutes"/>
<refine-value idref="var_accounts_password_minlen_login_defs" selector="6"/>
<refine-value idref="var_password_max_age" selector="90"/>
-<refine-value idref="var_password_min_age" selector="7"/>
+<refine-value idref="var_accounts_minimum_age_login_defs" selector="7"/>
<refine-value idref="var_password_warn_age" selector="7"/>
<refine-value idref="var_password_pam_cracklib_retry" selector="3"/>
<refine-value idref="var_password_pam_cracklib_dcredit" selector="1"/>
diff --git a/RHEL/7/input/checks/accounts_minimum_age_login_defs.xml b/RHEL/7/input/checks/accounts_minimum_age_login_defs.xml
new file mode 120000
index 0000000..76381c0
--- /dev/null
+++ b/RHEL/7/input/checks/accounts_minimum_age_login_defs.xml
@@ -0,0 +1 @@
+../../../../shared/oval/accounts_minimum_age_login_defs.xml
\ No newline at end of file
diff --git a/shared/oval/accounts_minimum_age_login_defs.xml b/shared/oval/accounts_minimum_age_login_defs.xml
new file mode 100644
index 0000000..03ada1e
--- /dev/null
+++ b/shared/oval/accounts_minimum_age_login_defs.xml
@@ -0,0 +1,36 @@
+<def-group>
+ <definition class="compliance" id="accounts_minimum_age_login_defs" version="1">
+ <metadata>
+ <title>Set Password Expiration Parameters</title>
+ <affected family="unix">
+ <platform>Red Hat Enterprise Linux 6</platform>
+ <platform>Red Hat Enterprise Linux 7</platform>
+ </affected>
+ <description>The minimum password age policy should be set appropriately.</description>
+ <reference source="MED" ref_id="20130807" ref_url="test_attestation" />
+ </metadata>
+ <criteria comment="the value PASS_MIN_DAYS should be set appropriately in /etc/login.defs">
+ <criterion test_ref="test_pass_min_days" />
+ </criteria>
+ </definition>
+
+ <ind:textfilecontent54_test check="all"
+ comment="Tests the value of PASS_MIN_DAYS in /etc/login.defs"
+ id="test_pass_min_days" version="1">
+ <ind:object object_ref="object_etc_login_defs_pass_min_age" />
+ <ind:state state_ref="state_etc_login_defs_pass_min_age" />
+ </ind:textfilecontent54_test>
+
+ <ind:textfilecontent54_object id="object_etc_login_defs_pass_min_age" version="1">
+ <ind:filepath>/etc/login.defs</ind:filepath>
+ <ind:pattern operation="pattern match">^[\s]*PASS_MIN_DAYS[\s]+(\d+)\s*$</ind:pattern>
+ <ind:instance datatype="int">1</ind:instance>
+ </ind:textfilecontent54_object>
+
+ <ind:textfilecontent54_state id="state_etc_login_defs_pass_min_age" version="1">
+ <ind:subexpression operation="greater than or equal" var_ref="var_accounts_minimum_age_login_defs" datatype="int" />
+ </ind:textfilecontent54_state>
+
+ <external_variable comment="minimum password age in days" datatype="int" id="var_accounts_minimum_age_login_defs" version="1" />
+
+</def-group>
--
1.8.3.1
More information about the scap-security-guide
mailing list