refactor(googleauth): pam handling

This commit is contained in:
Pascal de Bruijn 2022-06-13 11:04:14 +02:00
parent 2a3b67647f
commit 1dcd7d5746

View File

@ -19,7 +19,7 @@ users_{{ users.googleauth_dir }}:
{%- if 'google_auth' in user %} {%- if 'google_auth' in user %}
{%- for svc in user['google_auth'] %} {%- for svc in user['google_auth'] %}
{%- if user.get('google_2fa', True) %} {%- if user.get('google_2fa', True) %}
{%- set repl = '{0} {1} {2} {3} {4}{5}/{6}_{7} {8}\\n{9}'.format( {%- set repl = '{0} {1} {2} {3} {4}{5}/{6}_{7} {8}'.format(
'auth', 'auth',
'[success=done new_authtok_reqd=done default=die]', '[success=done new_authtok_reqd=done default=die]',
'pam_google_authenticator.so', 'pam_google_authenticator.so',
@ -29,13 +29,12 @@ users_{{ users.googleauth_dir }}:
'${USER}', '${USER}',
svc, svc,
'echo_verification_code', 'echo_verification_code',
'@include common-auth',
) %} ) %}
users_googleauth-pam-{{ svc }}-{{ name }}: users_googleauth-pam-{{ svc }}-{{ name }}:
file.replace: file.replace:
- name: /etc/pam.d/{{ svc }} - name: /etc/pam.d/{{ svc }}
- pattern: "^@include common-auth" - pattern: '^(@include[ \t]*common-auth)'
- repl: "{{ repl }}" - repl: '{{ repl }}\n\1'
- unless: grep pam_google_authenticator.so /etc/pam.d/{{ svc }} - unless: grep pam_google_authenticator.so /etc/pam.d/{{ svc }}
- backup: .bak - backup: .bak
{%- endif %} {%- endif %}