-
Notifications
You must be signed in to change notification settings - Fork 685
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix rule ubtu 20 010033 #11065
Fix rule ubtu 20 010033 #11065
Conversation
Hi @dexterle. Thanks for your PR. I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
This datastream diff is auto generated by the check Click here to see the full diffNew content has different text for rule 'xccdf_org.ssgproject.content_rule_smartcard_pam_enabled'.
--- xccdf_org.ssgproject.content_rule_smartcard_pam_enabled
+++ xccdf_org.ssgproject.content_rule_smartcard_pam_enabled
@@ -13,7 +13,9 @@
# grep pam_pkcs11.so /etc/pam.d/common-auth
+
auth sufficient pam_pkcs11.so
+
For general information about enabling smart card authentication, consult
the documentation at:
OCIL for rule 'xccdf_org.ssgproject.content_rule_smartcard_pam_enabled' differs.
--- ocil:ssg-smartcard_pam_enabled_ocil:questionnaire:1
+++ ocil:ssg-smartcard_pam_enabled_ocil:questionnaire:1
@@ -13,7 +13,9 @@
# grep pam_pkcs11.so /etc/pam.d/common-auth
+
auth sufficient pam_pkcs11.so
+
If pam_pkcs11.so is not set in etc/pam.d/common-auth this
is a finding.
ansible remediation for rule 'xccdf_org.ssgproject.content_rule_smartcard_pam_enabled' differs.
--- xccdf_org.ssgproject.content_rule_smartcard_pam_enabled
+++ xccdf_org.ssgproject.content_rule_smartcard_pam_enabled
@@ -1,9 +1,6 @@
-- name: Gather list of packages
+- name: Gather the package facts
package_facts:
manager: auto
- when:
- - ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
- - ''
tags:
- CCE-83208-9
- DISA-STIG-SLES-12-030520
@@ -27,9 +24,39 @@
- restrict_strategy
- smartcard_pam_enabled
-- name: Check to see if 'pam_pkcs11' module is configured in '/etc/pam.d/common-auth'
- shell: grep -E '^\s*auth\s+\S+\s+pam_pkcs11\.so' /etc/pam.d/common-auth || true
+- name: Enable Smart Card Logins in PAM - Gather List of Packages
+ ansible.builtin.package_facts:
+ manager: auto
+ when: ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
+ tags:
+ - CCE-83208-9
+ - DISA-STIG-SLES-12-030520
+ - NIST-800-53-IA-2(1)
+ - NIST-800-53-IA-2(1).1
+ - NIST-800-53-IA-2(11)
+ - NIST-800-53-IA-2(12)
+ - NIST-800-53-IA-2(2)
+ - NIST-800-53-IA-2(2).1
+ - NIST-800-53-IA-2(3)
+ - NIST-800-53-IA-2(3).1
+ - NIST-800-53-IA-2(4)
+ - NIST-800-53-IA-2(4).1
+ - NIST-800-53-IA-5(2)
+ - NIST-800-53-IA-5(2)(c)
+ - NIST-800-53-IA-5(2).1
+ - low_complexity
+ - low_disruption
+ - medium_severity
+ - no_reboot_needed
+ - restrict_strategy
+ - smartcard_pam_enabled
+
+- name: Enable Smart Card Logins in PAM - Check to See if 'pam_pkcs11' Module Is Configured
+ in '/etc/pam.d/common-auth'
+ ansible.builtin.shell: grep -E '^\s*auth\s+\S+\s+pam_pkcs11\.so' /etc/pam.d/common-auth
+ || true
register: check_pam_pkcs11_module_result
+ changed_when: false
when:
- ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
- '"pam_pkcs11" in ansible_facts.packages'
@@ -56,8 +83,8 @@
- restrict_strategy
- smartcard_pam_enabled
-- name: Configure 'pam_pkcs11' module in '/etc/pam.d/common-auth'
- lineinfile:
+- name: Enable Smart Card Logins in PAM - Configure 'pam_pkcs11' Module in '/etc/pam.d/common-auth'
+ ansible.builtin.lineinfile:
path: /etc/pam.d/common-auth
line: auth sufficient pam_pkcs11.so
insertafter: ^\s*#
@@ -89,8 +116,9 @@
- restrict_strategy
- smartcard_pam_enabled
-- name: Ensure 'pam_pkcs11' module has 'sufficient' control flag
- lineinfile:
+- name: Enable Smart Card Logins in PAM - Ensure 'pam_pkcs11' Module Has sufficient
+ Control Flag
+ ansible.builtin.lineinfile:
path: /etc/pam.d/common-auth
regexp: ^(\s*auth\s+)\S+(\s+pam_pkcs11\.so.*)
line: \g<1>sufficient\g<2> |
...s/accounts-physical/screen_locking/smart_card_login/smartcard_pam_enabled/ansible/shared.yml
Show resolved
Hide resolved
...s/accounts-physical/screen_locking/smart_card_login/smartcard_pam_enabled/ansible/shared.yml
Show resolved
Hide resolved
This commit will fix descrition and ocil rule. Additionally, this commit will simplify conditionals and lines used by lineinfile module for UBTU-20-010033.
69fd464
to
7a39713
Compare
Code Climate has analyzed commit 7a39713 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 53.8% (0.0% change). View more on Code Climate. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
This is up to you now @dodys . : ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thanks
Description:
ubuntu.xml
OVAL definition and to use modifiedshared.xml
Rationale:
Review Hints:
Build the product:
To test these changes with Ansible:
To test changes with bash, run the remediation section:
xccdf_org.ssgproject.content_rule_smartcard_pam_enabled
Checkout Manual STIG OVAL definitions, and use software like DISA STIG Viewer to view definitions.
This STIG can be tested with the latest Ubuntu 2004 Benchmark SCAP. For reference, please review the latest artifacts: https://public.cyber.mil/stigs/downloads/