diff --git a/components/libpwquality.yml b/components/libpwquality.yml index 3bc12599379..0fc8244f8b3 100644 --- a/components/libpwquality.yml +++ b/components/libpwquality.yml @@ -3,3 +3,4 @@ packages: - libpwquality rules: - package_pam_pwquality_installed +- accounts_password_pam_pwquality_conf_retry diff --git a/components/pam.yml b/components/pam.yml index b050e3cca38..657bba9019c 100644 --- a/components/pam.yml +++ b/components/pam.yml @@ -9,7 +9,7 @@ groups: - password_expiration - password_quality - password_quality_pamcracklib -- password_quality_pwquality +- password_quality_pam_pwquality name: pam packages: - pam diff --git a/controls/stig_rhel9.yml b/controls/stig_rhel9.yml index 1a63bee32be..3f4b60c65c5 100644 --- a/controls/stig_rhel9.yml +++ b/controls/stig_rhel9.yml @@ -2783,9 +2783,11 @@ controls: RHEL 9 must ensure the password complexity module in the system-auth file is configured for three retries or less. rules: - - accounts_password_pam_retry + - accounts_password_pam_pwquality_conf_retry - var_password_pam_retry=3 status: automated + notes: |- + We check only the /etc/security/pwquality.conf, rule should be extended to check also /etc/security/pwquality.conf.d directory content. - id: RHEL-09-611025 levels: diff --git a/docs/templates/template_reference.md b/docs/templates/template_reference.md index 7f36d09ecca..f76ad513409 100644 --- a/docs/templates/template_reference.md +++ b/docs/templates/template_reference.md @@ -609,6 +609,8 @@ When the remediation is applied duplicate occurrences of `key` are removed. - **value** - the value the key should have in the specified path + - **xccdf_variable** - use value stored in an XCCDF variable instead of hardcoded value + - **app** - optional. If not set the check will use the default text `The respective application or service`. If set, the `app` is used within sentences like: "`application` is configured correctly and configuration file exists" diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/accounts_password_pam_pwquality_conf_retry/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/accounts_password_pam_pwquality_conf_retry/rule.yml new file mode 100644 index 00000000000..a8253e896a1 --- /dev/null +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/accounts_password_pam_pwquality_conf_retry/rule.yml @@ -0,0 +1,41 @@ +documentation_complete: true + + +title: 'Ensure PAM Enforces Password Requirements - Authentication Retry Prompts Permitted Per-Session in /etc/security/pwquality.conf' + +description: |- + To configure the number of retry prompts that are permitted per-session: + Edit the /etc/security/pwquality.conf to include + retry={{{xccdf_value("var_password_pam_retry") }}}, or a lower value if site + policy is more restrictive. The DoD requirement is a maximum of 3 prompts + per session. + +rationale: |- + Setting the password retry prompts that are permitted on a per-session basis to a low value + requires some software, such as SSH, to re-connect. This can slow down and + draw additional attention to some types of password-guessing attacks. Note that this + is different from account lockout, which is provided by the pam_faillock module. + +severity: medium + +identifiers: + cce@rhel9: CCE-86492-6 + +references: + disa: CCI-004066,CCI-000192 + srg: SRG-OS-000069-GPOS-00037 + +ocil_clause: 'the value of "retry" is set to "0" or greater than "{{{ xccdf_value("var_password_pam_retry") }}}", or is missing' + +ocil: |- + Verify {{{ full_name }}} is configured to limit the "pwquality" retry option to {{{ xccdf_value("var_password_pam_retry") }}}. + + Check for the use of the "pwquality" retry option in the pwquality.conf file with the following command: + 
$ grep retry /etc/security/pwquality.conf
+ +template: + name: key_value_pair_in_file + vars: + path: /etc/security/pwquality.conf + key: retry + xccdf_variable: var_password_pam_retry diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/group.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/group.yml new file mode 100644 index 00000000000..a3f1a989894 --- /dev/null +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_libpwquality/group.yml @@ -0,0 +1,6 @@ +documentation_complete: true + +title: 'Set Password Quality Requirements with pam_pwquality' + +description: |- + Use the file /etc/security/pwquality.conf for configuring various aspects of password quality. diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dcredit/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dcredit/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dcredit/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dcredit/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dictcheck/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dictcheck/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dictcheck/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_dictcheck/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_difok/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_difok/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_difok/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_difok/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_local/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_local/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_local/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_local/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_root/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_root/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_root/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_root/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_root/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_root/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforce_root/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforce_root/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/commented.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/commented.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/commented.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/commented.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/correct.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/correct.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/correct.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/correct.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/wrong_value.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_enforcing/tests/wrong_value.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_enforcing/tests/wrong_value.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_lcredit/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_lcredit/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_lcredit/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_lcredit/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxclassrepeat/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxclassrepeat/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxclassrepeat/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxclassrepeat/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxrepeat/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxrepeat/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxrepeat/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxrepeat/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxsequence/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxsequence/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxsequence/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_maxsequence/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minclass/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minclass/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minclass/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minclass/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minlen/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minlen/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minlen/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_minlen/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp_invalid.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp_invalid.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp_invalid.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp_invalid.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp_stricter.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp_stricter.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/tests/ospp_stricter.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ocredit/tests/ospp_stricter.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/bash/shared.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/bash/shared.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/bash/shared.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/bash/shared.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/oval/ubuntu.xml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/oval/ubuntu.xml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/oval/ubuntu.xml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/oval/ubuntu.xml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/bash/shared.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/bash/shared.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/bash/shared.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/bash/shared.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/oval/shared.xml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/oval/shared.xml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/oval/shared.xml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/oval/shared.xml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_correct_entry.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_correct_entry.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_correct_entry.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_correct_entry.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_missing_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_missing_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_missing_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_missing_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_modified_pam.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_modified_pam.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_modified_pam.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_wrong_control.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_wrong_control.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_wrong_control.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/correct_entry.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/correct_entry.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/correct_entry.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/correct_entry.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/missing_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/missing_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/missing_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/missing_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/wrong_control.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/wrong_control.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_password_auth/tests/wrong_control.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/ansible/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/ansible/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/ansible/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/bash/shared.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/bash/shared.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/bash/shared.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/bash/shared.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/oval/shared.xml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/oval/shared.xml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/oval/shared.xml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/oval/shared.xml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_correct_entry.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_correct_entry.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_correct_entry.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_correct_entry.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_missing_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_missing_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_missing_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_missing_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_modified_pam.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_modified_pam.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_modified_pam.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_wrong_control.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_wrong_control.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_wrong_control.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/correct_entry.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/correct_entry.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/correct_entry.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/correct_entry.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/missing_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/missing_entry.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/missing_entry.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/missing_entry.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/wrong_control.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/wrong_control.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_pwquality_system_auth/tests/wrong_control.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/ansible/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/ansible/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/ansible/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/debian.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/debian.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/debian.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/debian.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/shared.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/shared.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/shared.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/shared.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/ubuntu.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/ubuntu.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/bash/ubuntu.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/bash/ubuntu.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/oval/shared.xml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/oval/shared.xml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/oval/shared.xml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/oval/shared.xml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/common.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/common.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/common.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/common.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/correct_value.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/correct_value.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/correct_value.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_conflicting_values.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_conflicting_values.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_conflicting_values.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_conflicting_values.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_duplicate_values.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_duplicate_values.pass.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_duplicate_values.pass.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_duplicate_values.pass.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/wrong_value.fail.sh similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/wrong_value.fail.sh rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_retry/tests/wrong_value.fail.sh diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/policy/stig/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ucredit/policy/stig/shared.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/policy/stig/shared.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ucredit/policy/stig/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ucredit/rule.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/accounts_password_pam_ucredit/rule.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/group.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/group.yml similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/group.yml rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/group.yml diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_dcredit.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_dcredit.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_dcredit.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_dcredit.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_dictcheck.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_dictcheck.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_dictcheck.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_dictcheck.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_difok.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_difok.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_difok.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_difok.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_enforcing.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_enforcing.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_enforcing.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_enforcing.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_lcredit.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_lcredit.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_lcredit.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_lcredit.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxclassrepeat.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxclassrepeat.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxclassrepeat.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxclassrepeat.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxrepeat.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxrepeat.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxrepeat.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxrepeat.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxsequence.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxsequence.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_maxsequence.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_maxsequence.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_minclass.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_minclass.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_minclass.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_minclass.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_minlen.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_minlen.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_minlen.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_minlen.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_ocredit.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_ocredit.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_ocredit.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_ocredit.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_retry.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_retry.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_retry.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_retry.var diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_ucredit.var b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_ucredit.var similarity index 100% rename from linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/var_password_pam_ucredit.var rename to linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pam_pwquality/var_password_pam_ucredit.var diff --git a/shared/macros/10-oval.jinja b/shared/macros/10-oval.jinja index 1d1b4dc60c0..9b3e74cc560 100644 --- a/shared/macros/10-oval.jinja +++ b/shared/macros/10-oval.jinja @@ -43,15 +43,22 @@ Generates the :code:`` tag for OVAL check using correct product platfo :type section: str :param quotes: If non-empty, one level of matching quotes is considered when checking the value. See comment of oval_line_in_file_state for more info. :type quotes: str +:param xccdf_variable: the name of an XCCDF variable carrying the value, this conflicts with the value parameter +:type xccdf_variable: str #}} -{{%- macro oval_check_config_file(path='', prefix_regex='^[ \\t]*', parameter='', separator_regex='[ \\t]+', value='', missing_parameter_pass=false, application='', multi_value=false, missing_config_file_fail=false, section='', quotes='') -%}} +{{%- macro oval_check_config_file(path='', prefix_regex='^[ \\t]*', parameter='', separator_regex='[ \\t]+', value='', missing_parameter_pass=false, application='', multi_value=false, missing_config_file_fail=false, section='', quotes='', xccdf_variable="") -%}} {{%- if application == '' -%}} {{%- set application = "The respective application or service" -%}} {{%- endif -%}} +{{%- if xccdf_variable -%}} +{{%- set description= "Ensure '" + parameter + "' is configured with value configured through XCCDF variable " + xccdf_variable + (" in section '" + section if section else "") + "' in " + path -%}} +{{%- else -%}} +{{%- set description="Ensure '" + parameter + "' is configured with value '" + value | replace("(?i)", "") | replace("(?-i)", "") + (" in section '" + section if section else "") + "' in " + path -%}} +{{%- endif -%}} - {{{ oval_metadata("Ensure '" + parameter + "' is configured with value '" + value | replace("(?i)", "") | replace("(?-i)", "") + (" in section '" + section if section else "") + "' in " + path) }}} + {{{ oval_metadata(description) }}} {{%- if missing_config_file_fail %}} @@ -84,9 +91,19 @@ Generates the :code:`` tag for OVAL check using correct product platfo {{%- endif %}} + + {{% if xccdf_variable %}} + {{{ oval_line_in_file_define_variable(xccdf_variable, datatype="string") }}} + {{% endif %}} + {{{ oval_line_in_file_test(path, parameter) }}} {{{ oval_line_in_file_object(path, section, prefix_regex, parameter, separator_regex, false, multi_value) }}} + {{%- if xccdf_variable -%}} + {{{ oval_line_in_file_state_xccdf_variable(xccdf_variable, datatype="string") }}} + {{%- else -%}} {{{ oval_line_in_file_state(value, multi_value, quotes) }}} + {{%- endif -%}} + {{%- if missing_parameter_pass %}} {{{ oval_line_in_file_test(path, parameter, missing_parameter_pass) }}} {{{ oval_line_in_file_object(path, section, prefix_regex, parameter, separator_regex, missing_parameter_pass, multi_value) }}} diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt index 31c7ce7b82d..9aaf56359dd 100644 --- a/shared/references/cce-redhat-avail.txt +++ b/shared/references/cce-redhat-avail.txt @@ -36,7 +36,6 @@ CCE-86481-9 CCE-86482-7 CCE-86483-5 CCE-86484-3 -CCE-86492-6 CCE-86493-4 CCE-86494-2 CCE-86496-7 diff --git a/shared/templates/key_value_pair_in_file/ansible.template b/shared/templates/key_value_pair_in_file/ansible.template index 55b1b8fd879..c8b7c5e598f 100644 --- a/shared/templates/key_value_pair_in_file/ansible.template +++ b/shared/templates/key_value_pair_in_file/ansible.template @@ -4,4 +4,9 @@ # complexity = low # disruption = low +{{% if XCCDF_VARIABLE %}} +{{{ ansible_instantiate_variables(XCCDF_VARIABLE) }}} +{{{ ansible_set_config_file(msg, PATH, KEY, value="{{ "+XCCDF_VARIABLE+" }}", create=true, separator=SEP, separator_regex=SEP_REGEX, prefix_regex=PREFIX_REGEX) }}} +{{% else %}} {{{ ansible_set_config_file(msg, PATH, KEY, value=VALUE, create=true, separator=SEP, separator_regex=SEP_REGEX, prefix_regex=PREFIX_REGEX) }}} +{{% endif %}} diff --git a/shared/templates/key_value_pair_in_file/bash.template b/shared/templates/key_value_pair_in_file/bash.template index 24d9f508336..b08efde6082 100644 --- a/shared/templates/key_value_pair_in_file/bash.template +++ b/shared/templates/key_value_pair_in_file/bash.template @@ -4,4 +4,9 @@ # complexity = low # disruption = low +{{% if XCCDF_VARIABLE %}} +{{{ bash_instantiate_variables(XCCDF_VARIABLE) }}} +{{{ set_config_file(PATH, KEY, value="$" ~ XCCDF_VARIABLE, create='yes', separator=SEP, separator_regex=SEP_REGEX, prefix_regex=PREFIX_REGEX) -}}} +{{% else %}} {{{ set_config_file(PATH, KEY, value=VALUE, create='yes', separator=SEP, separator_regex=SEP_REGEX, prefix_regex=PREFIX_REGEX) -}}} +{{% endif %}} diff --git a/shared/templates/key_value_pair_in_file/oval.template b/shared/templates/key_value_pair_in_file/oval.template index 9276ee0bca7..89efb154edc 100644 --- a/shared/templates/key_value_pair_in_file/oval.template +++ b/shared/templates/key_value_pair_in_file/oval.template @@ -1 +1,5 @@ +{{%- if XCCDF_VARIABLE -%}} +{{{ oval_check_config_file(PATH, prefix_regex=PREFIX_REGEX, parameter=KEY, separator_regex=SEP_REGEX, xccdf_variable=XCCDF_VARIABLE, application=APP, missing_config_file_fail=true) }}} +{{%- else -%}} {{{ oval_check_config_file(PATH, prefix_regex=PREFIX_REGEX, parameter=KEY, separator_regex=SEP_REGEX, value=VALUE, application=APP, missing_config_file_fail=true) }}} +{{%- endif -%}} diff --git a/shared/templates/key_value_pair_in_file/template.py b/shared/templates/key_value_pair_in_file/template.py index 107ef6be861..d659d10e14b 100644 --- a/shared/templates/key_value_pair_in_file/template.py +++ b/shared/templates/key_value_pair_in_file/template.py @@ -1,4 +1,18 @@ +def set_variables_for_test_scenarios(data): + if not data.get("value"): + # this implies XCCDF variable is used + data["correct_value"] = "correct_value" + else: + data["correct_value"] = str(data["value"]) + + return data + + def preprocess(data, lang): + if data.get("value") is not None and data.get("xccdf_variable") is not None: + errmsg = ("The template definition of {0} specifies both value and xccdf_variable." + "This is forbidden.".format(data["_rule_id"])) + raise ValueError(errmsg) if "sep" not in data: data["sep"] = " = " @@ -10,4 +24,5 @@ def preprocess(data, lang): if "app" not in data: data["app"] = "" + data = set_variables_for_test_scenarios(data) return data diff --git a/shared/templates/key_value_pair_in_file/tests/commented_value.fail.sh b/shared/templates/key_value_pair_in_file/tests/commented_value.fail.sh index f1d2ec78e61..bd08f0ecb4f 100644 --- a/shared/templates/key_value_pair_in_file/tests/commented_value.fail.sh +++ b/shared/templates/key_value_pair_in_file/tests/commented_value.fail.sh @@ -1,7 +1,11 @@ #!/bin/bash +{{%- if XCCDF_VARIABLE %}} +# variables = {{{ XCCDF_VARIABLE }}}={{{ CORRECT_VALUE }}} +{{% endif %}} + mkdir -p $(dirname {{{ PATH }}}) touch {{{ PATH }}} sed -i "/{{{ KEY }}}/d" "{{{ PATH }}}" -echo "# {{{ KEY }}}{{{ SEP }}}{{{ VALUE }}}" >> "{{{ PATH }}}" +echo "# {{{ KEY }}}{{{ SEP }}}{{{ CORRECT_VALUE }}}" >> "{{{ PATH }}}" diff --git a/shared/templates/key_value_pair_in_file/tests/conflicting_values.fail.sh b/shared/templates/key_value_pair_in_file/tests/conflicting_values.fail.sh index 0a656e4af40..3e68979af12 100644 --- a/shared/templates/key_value_pair_in_file/tests/conflicting_values.fail.sh +++ b/shared/templates/key_value_pair_in_file/tests/conflicting_values.fail.sh @@ -1,8 +1,12 @@ #!/bin/bash +{{%- if XCCDF_VARIABLE %}} +# variables = {{{ XCCDF_VARIABLE }}}={{{ CORRECT_VALUE }}} +{{% endif %}} + mkdir -p $(dirname {{{ PATH }}}) touch {{{ PATH }}} sed -i "/{{{ KEY }}}/d" "{{{ PATH }}}" -echo "{{{ KEY }}}{{{ SEP }}}{{{ VALUE }}}" >> "{{{ PATH }}}" +echo "{{{ KEY }}}{{{ SEP }}}{{{ CORRECT_VALUE }}}" >> "{{{ PATH }}}" echo "{{{ KEY }}}{{{ SEP }}}wrong_value" >> "{{{ PATH }}}" diff --git a/shared/templates/key_value_pair_in_file/tests/correct_value.pass.sh b/shared/templates/key_value_pair_in_file/tests/correct_value.pass.sh index 01bbbf19836..a0b12260ab5 100644 --- a/shared/templates/key_value_pair_in_file/tests/correct_value.pass.sh +++ b/shared/templates/key_value_pair_in_file/tests/correct_value.pass.sh @@ -1,7 +1,11 @@ #!/bin/bash +{{%- if XCCDF_VARIABLE %}} +# variables = {{{ XCCDF_VARIABLE }}}={{{ CORRECT_VALUE }}} +{{% endif %}} + mkdir -p $(dirname {{{ PATH }}}) touch {{{ PATH }}} sed -i "/{{{ KEY }}}/d" "{{{ PATH }}}" -echo "{{{ KEY }}}{{{ SEP }}}{{{ VALUE }}}" >> "{{{ PATH }}}" +echo "{{{ KEY }}}{{{ SEP }}}{{{ CORRECT_VALUE }}}" >> "{{{ PATH }}}" diff --git a/shared/templates/key_value_pair_in_file/tests/duplicate_values.pass.sh b/shared/templates/key_value_pair_in_file/tests/duplicate_values.pass.sh index ced43dc294a..4fe7d3d2fad 100644 --- a/shared/templates/key_value_pair_in_file/tests/duplicate_values.pass.sh +++ b/shared/templates/key_value_pair_in_file/tests/duplicate_values.pass.sh @@ -1,8 +1,12 @@ #!/bin/bash +{{%- if XCCDF_VARIABLE %}} +# variables = {{{ XCCDF_VARIABLE }}}={{{ CORRECT_VALUE }}} +{{% endif %}} + mkdir -p $(dirname {{{ PATH }}}) touch {{{ PATH }}} sed -i "/{{{ KEY }}}/d" "{{{ PATH }}}" -echo "{{{ KEY }}}{{{ SEP }}}{{{ VALUE }}}" >> "{{{ PATH }}}" -echo "{{{ KEY }}}{{{ SEP }}}{{{ VALUE }}}" >> "{{{ PATH }}}" +echo "{{{ KEY }}}{{{ SEP }}}{{{ CORRECT_VALUE }}}" >> "{{{ PATH }}}" +echo "{{{ KEY }}}{{{ SEP }}}{{{ CORRECT_VALUE }}}" >> "{{{ PATH }}}" diff --git a/shared/templates/key_value_pair_in_file/tests/wrong_value.fail.sh b/shared/templates/key_value_pair_in_file/tests/wrong_value.fail.sh index 784f0121372..235db7f43cc 100644 --- a/shared/templates/key_value_pair_in_file/tests/wrong_value.fail.sh +++ b/shared/templates/key_value_pair_in_file/tests/wrong_value.fail.sh @@ -1,5 +1,9 @@ #!/bin/bash +{{%- if XCCDF_VARIABLE %}} +# variables = {{{ XCCDF_VARIABLE }}}={{{ CORRECT_VALUE }}} +{{% endif %}} + mkdir -p $(dirname {{{ PATH }}}) touch {{{ PATH }}} diff --git a/tests/data/profile_stability/rhel9/stig.profile b/tests/data/profile_stability/rhel9/stig.profile index d082832014a..b66d67635cc 100644 --- a/tests/data/profile_stability/rhel9/stig.profile +++ b/tests/data/profile_stability/rhel9/stig.profile @@ -55,7 +55,7 @@ selections: - accounts_password_pam_ocredit - accounts_password_pam_pwquality_password_auth - accounts_password_pam_pwquality_system_auth -- accounts_password_pam_retry +- accounts_password_pam_pwquality_conf_retry - accounts_password_pam_ucredit - accounts_password_pam_unix_rounds_password_auth - accounts_password_pam_unix_rounds_system_auth diff --git a/tests/data/profile_stability/rhel9/stig_gui.profile b/tests/data/profile_stability/rhel9/stig_gui.profile index ae104fc38e4..7da3d687f01 100644 --- a/tests/data/profile_stability/rhel9/stig_gui.profile +++ b/tests/data/profile_stability/rhel9/stig_gui.profile @@ -67,7 +67,7 @@ selections: - accounts_password_pam_ocredit - accounts_password_pam_pwquality_password_auth - accounts_password_pam_pwquality_system_auth -- accounts_password_pam_retry +- accounts_password_pam_pwquality_conf_retry - accounts_password_pam_ucredit - accounts_password_pam_unix_rounds_password_auth - accounts_password_pam_unix_rounds_system_auth