From 6f9b8cb16c3f0763ab5111766f8994330f52038e Mon Sep 17 00:00:00 2001
From: Alan Moore <alan.moore@canonical.com>
Date: Wed, 15 Jan 2025 13:57:07 +0000
Subject: [PATCH] Use pam_options template with bash turned off

---
 .../oval/shared.xml                           | 52 -------------------
 .../rule.yml                                  | 15 ++++++
 2 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/oval/shared.xml

diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/oval/shared.xml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/oval/shared.xml
deleted file mode 100644
index 377eb4f24d20..000000000000
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/oval/shared.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-{{% if "sle12" in product or "debian" in product or "ubuntu" in product %}}
-{{%- set accounts_password_pam_file = '/etc/pam.d/common-password' -%}}
-{{% else %}}
-{{%- set accounts_password_pam_file = '/etc/pam.d/system-auth' -%}}
-{{% endif %}}
-
-<def-group>
-  <definition class="compliance" id="{{{ rule_id }}}" version="2">
-    {{{ oval_metadata("Enforce password history for root of pam_pwhistory.") }}}
-      <criteria operator="AND" comment="Check if pam_pwhistory.so is properly configured">
-        <criterion test_ref="test_accounts_password_pam_pwhistory_enabled"
-                   comment="pam_pwhistory.so is properly defined in password section of PAM file"/>
-        <criterion test_ref="test_accounts_password_pam_pwhistory_use_authtok_parameter"
-                 comment="use_authtok parameter of pam_pwhistory.so is properly configured"/>
-      </criteria>
-  </definition>
-
-  <!-- is pam_pwhistory.so enabled? -->
-  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_enabled"
-                              check="all" version="1" comment="Check pam_pwhistory.so presence in PAM file">
-    <ind:object object_ref="object_accounts_password_pam_pwhistory_enabled"/>
-  </ind:textfilecontent54_test>
-
-  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_enabled"
-                                version="1">
-    <ind:filepath>{{{ accounts_password_pam_file }}}</ind:filepath>
-    <ind:pattern var_ref="var_accounts_password_pam_pwhistory_module_regex"
-                 var_check="at least one" operation="pattern match"/>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-  <!-- variables used to check the module implementation -->
-  <local_variable id="var_accounts_password_pam_pwhistory_module_regex"
-		  datatype="string" version="1"
-		  comment="The regex is to confirm the pam_pwhistory.so module is enabled">
-    <literal_component>^\s*password\s+(?:(?:sufficient)|(?:required)|(?:requisite)|(?:\[.*\]))\s+pam_pwhistory\.so.*$</literal_component>
-  </local_variable>
-
-  <!-- Check the pam_pwhistory.so use_authtok parameter -->
-  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_use_authtok_parameter" version="1"
-                              check="all" check_existence="all_exist"
-                              comment="Test if use_authtok attribute of pam_pwhistory.so is set correctly in {{{ accounts_password_pam_file }}}">
-    <ind:object object_ref="object_accounts_password_pam_pwhistory_use_authtok_parameter" />
-  </ind:textfilecontent54_test>
-
-  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_use_authtok_parameter" version="1">
-    <ind:filepath>{{{ accounts_password_pam_file }}}</ind:filepath>
-    <ind:pattern operation="pattern match">^\s*password\s+(?:(?:sufficient)|(?:required)|(?:requisite)|(?:\[.*\]))\s+pam_pwhistory\.so\s+[^#\n\r]*\buse_authtok\b.*$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-</def-group>
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/rule.yml
index 2097396dc5df..d7575f75d088 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/rule.yml
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_use_authtok/rule.yml
@@ -16,3 +16,18 @@ rationale: |-
 severity: medium
 
 platform: package[pam]
+
+template:
+    name: pam_options
+    vars:
+      path: /etc/pam.d/common-password
+      type: password
+      control_flag: requisite
+      module: pam_pwhistory.so
+      arguments:
+        - argument: use_authtok
+          new_argument: use_authtok
+{{% if 'ubuntu' in product %}}
+      backends:
+        - bash: "off"
+{{% endif %}}