Merge branch 'development' into SLES-12-010360

guangyee · Dec 14, 2020 · 72563e5 · 72563e5
2 parents 1cfc5f6 + af47528
commit 72563e5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/...ccounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml b/...ccounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019
+prodtype: ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019,sle12
 
 title: 'Set Existing Passwords Maximum Age'
 
@@ -21,6 +21,7 @@ severity: medium
 identifiers:
     cce@rhel7: CCE-80522-6
     cce@rhel8: CCE-82473-0
+    cce@sle12: CCE-83041-4
 
 references:
     stigid@ol7: OL07-00-010260
@@ -29,6 +30,7 @@ references:
     srg: SRG-OS-000076-GPOS-00044
     vmmsrg: SRG-OS-000076-VMM-000430
     stigid@rhel7: RHEL-07-010260
+    stigid@sle12: SLES-12-010290
 
 ocil_clause: 'existing passwords are not configured correctly'
 

diff --git a/...ccounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml b/...ccounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019
+prodtype: ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019,sle12
 
 title: 'Set Existing Passwords Minimum Age'
 
@@ -21,6 +21,7 @@ severity: medium
 identifiers:
     cce@rhel7: CCE-80521-8
     cce@rhel8: CCE-82472-2
+    cce@sle12: CCE-83042-2
 
 references:
     stigid@ol7: OL07-00-010240
@@ -29,6 +30,7 @@ references:
     srg: SRG-OS-000075-GPOS-00043
     vmmsrg: SRG-OS-000075-VMM000420
     stigid@rhel7: RHEL-07-010240
+    stigid@sle12: SLES-12-010260
 
 ocil_clause: 'existing passwords are not configured correctly'
 

diff --git a/...tem/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/ansible/shared.yml b/...tem/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/ansible/shared.yml
@@ -1,4 +1,4 @@
-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_ol
+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_ol,multi_platform_sle
 # reboot = false
 # strategy = restrict
 # complexity = low

diff --git a/.../guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml b/.../guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml
@@ -17,6 +17,7 @@ severity: medium
 identifiers:
     cce@rhel7: CCE-80205-8
     cce@rhel8: CCE-82888-9
+    cce@sle12: CCE-83052-1
 
 references:
     stigid@ol7: OL07-00-020240
@@ -25,6 +26,7 @@ references:
     nist-csf: PR.IP-1,PR.IP-2
     srg: SRG-OS-000480-GPOS-00228
     stigid@rhel7: RHEL-07-020240
+    stigid@sle12: SLES-12-010620
     isa-62443-2013: 'SR 7.6'
     isa-62443-2009: 4.3.4.3.2,4.3.4.3.3
     cobit5: APO13.01,BAI03.01,BAI03.02,BAI03.03,BAI10.01,BAI10.02,BAI10.03,BAI10.05

diff --git a/sle12/profiles/stig.profile b/sle12/profiles/stig.profile
@@ -34,4 +34,8 @@ selections:
     - account_disable_post_pw_expiration
     - accounts_maximum_age_login_defs
     - package_audit-audispd-plugins_installed
+    - accounts_password_set_max_life_existing
+    - accounts_password_set_min_life_existing
     - account_temp_expire_date
+    - accounts_umask_etc_login_defs
+