Merge a641d21b1528af3e0cce56ff06803ea1509d9d49 into ed4c1f0aaa4c808960371aa1b3b2f60440f1c366

users/googleauth.sls

@@ -1,7 +1,21 @@
 # vim: sts=2 ts=2 sw=2 et ai
 {%- from "users/map.jinja" import users with context %}
 
-{%- if not grains['os_family'] in ['RedHat', 'Suse'] %}
+{%- if not grains['os_family'] in ['Suse'] %}
+{%-   if salt['grains.get']('osfinger', '') in ['Amazon Linux-2'] %}
+users_epel_repo:
+  pkgrepo.managed:
+    - name: epel
+    - humanname: Extra Packages for Enterprise Linux 7 - $basearch
+    - mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
+    - enabled: 1
+    - gpgcheck: 1
+    - gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+    - failovermethod: priority
+    - require_in:
+      - pkg: users_googleauth-package
+{%-   endif %}
+
 users_googleauth-package:
   pkg.installed:
     - name: {{ users.googleauth_package }}
@@ -13,13 +27,34 @@ users_{{ users.googleauth_dir }}:
     - name: {{ users.googleauth_dir }}
     - user: root
     - group: {{ users.root_group }}
-    - mode: '0600'
+    - mode: '0700'
+
+{%-   if grains['os_family'] == 'RedHat' and "selinux" in grains and grains.selinux.enabled %}
+policycoreutils-package:
+  pkg.installed:
+    - pkgs:
+      - policycoreutils
+{%-     if grains['osmajorrelease']|int <= 7 %}
+      - policycoreutils-python
+{%-     else %}
+      - policycoreutils-python-utils
+{%-     endif %}
+users_googleauth_selinux_present:
+  selinux.fcontext_policy_present:
+    - name: "{{ users.googleauth_dir }}(/.*)?"
+    - filetype: 'a'
+    - sel_user: unconfined_u
+    - sel_type: ssh_home_t
+    - sel_level: s0
+    - require:
+        - pkg: policycoreutils-package
+{%-   endif %}
 
 {%-   for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
 {%-     if 'google_auth' in user %}
 {%-       for svc in user['google_auth'] %}
 {%-         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',
                              '[success=done new_authtok_reqd=done default=die]',
                              'pam_google_authenticator.so',
@@ -29,17 +64,38 @@ users_{{ users.googleauth_dir }}:
                              '${USER}',
                              svc,
                              'echo_verification_code',
-                             '@include common-auth',
                          ) %}
 users_googleauth-pam-{{ svc }}-{{ name }}:
   file.replace:
     - name: /etc/pam.d/{{ svc }}
-    - pattern: "^@include common-auth"
+{%- if grains['os_family'] == 'RedHat' %}
-    - repl: "{{ repl }}"
+    - pattern: '^(auth[ \t]*substack[ \t]*password-auth)'
+{%- else %}
+    - pattern: '^(@include[ \t]*common-auth)'
+{%- endif %}
+    - repl: '{{ repl }}\n\1'
     - unless: grep pam_google_authenticator.so /etc/pam.d/{{ svc }}
     - backup: .bak
 {%-         endif %}
 {%-       endfor %}
 {%-     endif %}
 {%-   endfor %}
+
+{%-   if grains['os_family'] == 'RedHat' and "selinux" in grains and grains.selinux.enabled %}
+users_googleauth_selinux_applied:
+  selinux.fcontext_policy_applied:
+    - name: {{ users.googleauth_dir }}
+{%-   endif %}
+
+sshd:
+  service.running:
+    - watch:
+      - file: /etc/ssh/sshd_config
+
+sshd_config:
+  file.replace:
+    - name: /etc/ssh/sshd_config
+    - pattern: '^(ChallengeResponseAuthentication|KbdInteractiveAuthentication).*'
+    - repl: '\1 yes'
+
 {%- endif %}

users/init.sls

@@ -506,7 +506,7 @@ users_{{ users.sudoers_dir }}/{{ sudoers_d_filename }}:
     - name: {{ users.sudoers_dir }}/{{ sudoers_d_filename }}
 {% endif %}
 
-{%- if not grains['os_family'] in ['RedHat', 'Suse'] %}
+{%- if not grains['os_family'] in ['Suse'] %}
 {%-   if 'google_auth' in user %}
 {%-     for svc in user['google_auth'] %}
 users_googleauth-{{ svc }}-{{ name }}:
@@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
     - contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
     - user: root
     - group: {{ users.root_group }}
-    - mode: '0400'
+    - mode: '0600'
     - require:
       - pkg: users_googleauth-package
 {%-     endfor %}

users/map.jinja

@@ -30,6 +30,19 @@
     'polkit_dir': '/etc/polkit-1/localauthority.conf.d',
     'polkit_defaults': 'unix-group:sudo;'
   },
+  'RedHat': {
+    'sudoers_dir': '/etc/sudoers.d',
+    'sudoers_file': '/etc/sudoers',
+    'googleauth_dir': '/etc/google_authenticator.d',
+    'root_group': 'root',
+    'shell': '/bin/bash',
+    'visudo_shell': '/bin/bash',
+    'bash_package': 'bash',
+    'sudo_package': 'sudo',
+    'googleauth_package': 'google-authenticator',
+    'polkit_dir': '/etc/polkit-1/localauthority.conf.d',
+    'polkit_defaults': 'unix-group:sudo;'
+  },
   'Gentoo': {
     'sudoers_dir': '/etc/sudoers.d',
     'sudoers_file': '/etc/sudoers',