Split server part into "server.yml" tasks

README.md

@@ -16,19 +16,11 @@ Defaults:
 - `ssh_hardening_hostkeys_all`: `dsa`, `ecdsa`, `rsa`, `ed25519`
 - `ssh_hardening_moduli`: `/etc/ssh/moduli`
 - `ssh_hardening_moduli_backup`: `/etc/ssh/moduli.not-hardened`
-- `ssh_hardening_root_group`: `root`
-- `ssh_hardening_service_name`: `sshd`
 - `ssh_hardening_sshd_config`: `/etc/ssh/sshd_config`
 
 Included via `vars/ssh_*`:
 - `ssh_hardening_opts`: Parameter/Values to set for specific SSH version
 
-Included via `vars/os_*`:
-- `ssh_hardening_moduli`
-- `ssh_hardening_moduli_backup`
-- `ssh_hardening_service_name`
-- `ssh_hardening_root_group`
-
 Command line variables (undefined):
 - `ssh_hardening_force`: version/id to include, overwrites detected version!
 
@@ -47,36 +39,26 @@ Example Playbook
 SSH versions
 ------------
 - 6.0: [_] Debian 7 "wheezy"
-- 6.5: (support for `curve25519-sha256@libssh.org`, `ssh-ed25519`, `chacha20-poly1305@openssh.com`)
-- 6.6: ✅ Ubuntu 14.04 "trusty"
-- 6.7: ✅ Debian 8 "jessie"
+- 6.5: - (support for `curve25519-sha256@libssh.org`, `ssh-ed25519`, `chacha20-poly1305@openssh.com`)
+- 6.6: Ubuntu 14.04 "trusty"
+- 6.7: [_] Debian 8 "jessie"
 - 7.0:
 - 7.1:
-- 7.2: ✅ Ubuntu 16.04 "xenial"
-- 7.4: ✅ Debian 9 "stretch", ✅ RedHat 7 - (added `curve25519-sha256`)
-- 7.6: ✅ Ubuntu 18.04 "bionic"
+- 7.2: Ubuntu 16.04 "xenial"
+- 7.4: Debian 9 "stretch", RedHat 7 - (added `curve25519-sha256`)
+- 7.6: Ubuntu 18.04 "bionic"
 - 7.7:
 - 7.8:
-- 7.9: ✅ Debian 10 "buster"
-- 8.0: ✅ RedHat 8
-- 8.1: ✅ Suse 15.2
-- 8.2: ✅ Ubuntu 20.04 "focal"
+- 7.9: Debian 10 "buster"
+- 8.0: RedHat 8
+- 8.1: Suse 15.2
+- 8.2: Ubuntu 20.04 "focal"
 - 8.3:
-- 8.4: ✅ Alpine 3.13, ✅ Debian 11 "bullseye", ✅ Fedora 33, ✅ OpenSUSE 15.3/15.4
-- 8.5: (added `sntrup761x25519-sha512@openssh.com`)
-- 8.6: ✅ Alpine 3.14, ✅ Fedora 34
-- 8.7: ✅ Fedora 35
-- 8.8: ✅ Alpine 3.15, ✅ Fedora 36, ✅ Fedora 37
-- 8.9: ✅ Ubuntu 22.04 "jammy"
-- 9.0: ✅ Alpine 3.16, ✅ Fedora 38, ✅ Ubuntu 22.10 "kinetic", ✅ Ubuntu 23.04 "lunar"
-- 9.1: ✅ Alpine 3.17
-- 9.2: ✅ Debian 12 "bookworm"
-- 9.3: ✅ Alpine 3.18, ✅ Fedora 39, ✅ Ubuntu 23.10 "mantic"
-- 9.4:
-- 9.5: 
-- 9.6: ✅ Alpine 3.19, Fedora 40, Ubuntu 24.04 "noble"
-- 9.7: ✅ Alpine 3.20
-- 9.8: Archlinux, ✅ Voidlinux
+- 8.4: Debian 11 "bullseye", Fedora 33, Suse 15.3
+- 8.5:
+- 8.6: Fedora 34
+- 8.7: Fedora 35
+- 8.8: Archlinux, Voidlinux
 
 License
 -------

defaults/main.yml

@@ -12,9 +12,5 @@ ssh_hardening_hostkeys_all:
 ssh_hardening_moduli: /etc/ssh/moduli
 ssh_hardening_moduli_backup: /etc/ssh/moduli.not-hardened
 
-ssh_hardening_root_group: root
-
-ssh_hardening_service_name: sshd
-
 ssh_hardening_sshd_config: /etc/ssh/sshd_config
 

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Restart SSH
   service:
-    name: "{{ ssh_hardening_service_name }}"
+    name: "{{ ssh_hardening_service_name|default('sshd') }}"
     state: restarted
 
 

tasks/main.yml

@@ -2,11 +2,11 @@
 - name: Set some variables
   set_fact:
     ssh_hardening_backup_suffix: "42.{{ ansible_date_time.date }}@{{ ansible_date_time.time }}~"
-    ssh_hardening_distri: "{{ (ansible_distribution|lower).split(' ')[0] }}-{{ ansible_distribution_major_version|default(ansible_distribution_version) }}"
+    ssh_hardening_distri: "{{ (ansible_distribution|lower).split(' ')[0] }}-{{ ansible_distribution_major_version }}"
 
 
 - name: Get SSH version number
-  shell: 'ssh -V 2>&1 | grep -Eo "OpenSSH_[0-9]+\.[0-9]+" | grep -Eo "[0-9]+\.[0-9]+"'
+  shell: 'ssh -V 2>&1 | grep -o "OpenSSH_[0-9]\+\.[0-9]" | grep -o "[0-9]\+\.[0-9]"'
   changed_when: False
   register: ssh_hardening_version
 
@@ -32,113 +32,8 @@
     - "os_{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
     - "os_default.yml"
 
-
-- name: Backup sshd_config
-  copy:
-    src: "{{ ssh_hardening_sshd_config }}"
-    dest: "{{ ssh_hardening_sshd_config }}.{{ ssh_hardening_backup_suffix }}"
-    remote_src: yes
-    owner: root
-    group: "{{ ssh_hardening_root_group }}"
-    mode: 0600
-
 ####################
 
-- name: "Hostkeys: Disable (EC)DSA (and maybe RSA)"
-  lineinfile:
-    dest: "{{ ssh_hardening_sshd_config }}"
-    regexp: '(?i)\s*#*\s*hostkey.*{{ item }}_key'
-    state: absent
-  loop: "{{ ssh_hardening_hostkeys_all|difference(ssh_hardening_hostkeys) }}"
-  notify: Restart SSH
-
-
-- name: "Hostkeys: Enable (RSA &) ED25519"
-  lineinfile:
-    dest: "{{ ssh_hardening_sshd_config }}"
-    regexp: '(?i)\s*#*\s*hostkey.*{{ item }}_key'
-    line: 'HostKey /etc/ssh/ssh_host_{{ item }}_key'
-  loop: '{{ ssh_hardening_hostkeys }}'
-  notify: Restart SSH
-
-
-- name: "Ensure ED25519 hostkey is available"
-  openssh_keypair:
-    path: /etc/ssh/ssh_host_ed25519_key
-    type: ed25519
-  when: '"ed25519" in ssh_hardening_hostkeys'
-
-
-- name: "Renew RSA hostkeys if too short"
-  openssh_keypair:
-    path: /etc/ssh/ssh_host_rsa_key
-    type: rsa
-    size: 4096
-  when: '"rsa" in ssh_hardening_hostkeys'
-
-####################
-
-- name: "INCLUDE: Remove small Diffie-Hellman moduli"
-  include_tasks: moduli.yml
-
-####################
-
-- name: "Check for SSH include directory"
-  stat:
-    path: /etc/ssh/sshd_config.d
-  register: ssh_hardening_sshd_include_dir
-
-
-#- name: "SSH include directory exists"
-#  find:
-#    path: /etc/ssh/sshd_config.d
-#    pattern: "*.conf"
-#  register: ssh_hardening_sshd_include_files
-
-
-- name: "Check for crypto-policy file"
-  stat:
-    path: /etc/crypto-policies/back-ends/opensshserver.config
-  register: ssh_hardening_policy_file
-
-
-- name: "BLOCK: what to do with crypto policy file"
-  when: ssh_hardening_policy_file.stat.exists
-  block:
-
-    - name: "Get systemd service file location"
-      service:
-        name: "{{ ssh_hardening_service_name }}"
-      register: ssh_hardening_systemd_file
-
-    - name: "Check for USED crypto-policies variable"
-      command: "awk '/CRYPTO_POLICY/{print}' {{ ssh_hardening_systemd_file.status.FragmentPath }}"
-      changed_when: False
-      register: ssh_hardening_policy_var
-        # stdout == "" → SSH-Cfg in CP
-        # stdout != "" → Variablen in CP
-
-
-    # Nicht bei SUSE Tumbleweed!
-    - name: "(policy file) Move original link"
-      command: mv /etc/crypto-policies/back-ends/opensshserver.config /etc/crypto-policies/back-ends/opensshserver.config.not-hardened
-      args:
-        creates: /etc/crypto-policies/back-ends/opensshserver.config.not-hardened
-      when: ssh_hardening_policy_file.stat.islnk
-
-
-- name: "The (RedHat-8) crypto policy variable way..."
-  include_tasks: restrictions_crypto_policy.yml
-  when: ssh_hardening_policy_var.stdout is defined and ssh_hardening_policy_var.stdout|length > 0
-
-
-- name: "The (RedHat-X) crypto policy include way..."
-  include_tasks: restrictions_crypto_policy_include.yml
-  when: ssh_hardening_policy_var.stdout is defined and ssh_hardening_policy_var.stdout|length == 0 and ssh_hardening_policy_file.stat.exists
-
-
-- name: "The standard config way..."
-  include_tasks: restrictions_configfile.yml
-  when: not ssh_hardening_policy_file.stat.exists
-
+- name: "INCLUDE: Server hardening"
+  include_tasks: server.yml
 

tasks/moduli.yml

@@ -11,13 +11,13 @@
 
 
 - name: 'Moduli: Check for small Diffie-Hellman moduli'
-  shell: "grep -Ec ' 1535 | 2047 ' {{ ssh_hardening_moduli }} || true"
+  shell: "grep -c ' 1535 \\| 2047 ' /etc/ssh/moduli || true"
   changed_when: False
   register: ssh_hardening_moduli_small
 
 
 - name: 'Moduli: Remove small Diffie-Hellman moduli'
-  shell: "TMPF=$(mktemp) && awk '$5 >= 3071' {{ ssh_hardening_moduli }} >${TMPF} && mv ${TMPF} {{ ssh_hardening_moduli }}"
+  shell: "TMPF=$(mktemp) && awk '$5 >= 3071' /etc/ssh/moduli >${TMPF} && mv ${TMPF} /etc/ssh/moduli"
   when: ssh_hardening_moduli_small.stdout|int > 0
 
 

tasks/restrictions_configfile.yml

@@ -1,6 +1,6 @@
 ---
 - name: Check for Include directory
-  shell: "awk '/^[^#]*Include/ { print $2; }' /etc/ssh/sshd_config"
+  shell: "awk '/Include/ { print $2; }' /etc/ssh/sshd_config"
   changed_when: False
   register: ssh_hardening_includedir
 

tasks/restrictions_crypto_policy.yml

@@ -1,12 +1,22 @@
 ---
+- name: Move original link
+  command: mv /etc/crypto-policies/back-ends/opensshserver.config /etc/crypto-policies/back-ends/opensshserver.config.not-hardened
+  args:
+    creates: /etc/crypto-policies/back-ends/opensshserver.config.not-hardened
+  when: ssh_hardening_use_policies.stat.islnk
+
+
 - name: Write new crypto policies
   template:
-    src: 'crypto-policies/opensshserver.config.j2'
+    src: '{{ item }}'
     dest: /etc/crypto-policies/back-ends/opensshserver.config
     owner: root
     group: root
     mode: 0644
     backup: yes
+  with_first_found:
+    - 'crypto-policies/opensshserver_{{ ansible_distribution|lower }}.config.j2'
+    - 'crypto-policies/opensshserver_{{ ansible_os_family|lower }}.config.j2'
   notify: Restart SSH
 
 

tasks/restrictions_crypto_policy_include.yml

@@ -1,12 +0,0 @@
----
-- name: Write restrictions to crypto-policy file
-  template:
-    src: 'sshd_config_hardening.j2'
-    dest: '/etc/crypto-policies/back-ends/opensshserver.config'
-    owner: root
-    group: root
-    mode: 0600
-    backup: yes
-  notify: Restart SSH
-
-

tasks/server.yml

@@ -0,0 +1,58 @@
+---
+- name: Backup sshd_config
+  copy:
+    src: "{{ ssh_hardening_sshd_config }}"
+    dest: "{{ ssh_hardening_sshd_config }}.{{ ssh_hardening_backup_suffix }}"
+    remote_src: yes
+    owner: root
+    group: root
+    mode: 0600
+
+
+- name: "Hostkeys: Disable (EC)DSA (and maybe RSA)"
+  lineinfile:
+    dest: "{{ ssh_hardening_sshd_config }}"
+    regexp: '(?i)\s*#*\s*hostkey.*{{ item }}_key'
+    state: absent
+  loop: "{{ ssh_hardening_hostkeys_all|difference(ssh_hardening_hostkeys) }}"
+  notify: Restart SSH
+
+
+- name: "Hostkeys: Enable (RSA &) ED25519"
+  lineinfile:
+    dest: "{{ ssh_hardening_sshd_config }}"
+    regexp: '(?i)\s*#*\s*hostkey.*{{ item }}_key'
+    line: 'HostKey /etc/ssh/ssh_host_{{ item }}_key'
+  loop: '{{ ssh_hardening_hostkeys }}'
+  notify: Restart SSH
+
+
+- name: "Renew RSA hostkeys if too short"
+  openssh_keypair:
+    path: /etc/ssh/ssh_host_rsa_key
+    type: rsa
+    size: 4096
+  when: '"rsa" in ssh_hardening_hostkeys'
+
+####################
+
+- name: "INCLUDE: Remove small Diffie-Hellman moduli"
+  include_tasks: moduli.yml
+
+####################
+
+- name: "Check for crypto-policies"
+  stat:
+    path: /etc/crypto-policies/back-ends/opensshserver.config
+  register: ssh_hardening_use_policies
+
+
+- name: "The (RedHat) crypto policy way..."
+  include_tasks: restrictions_crypto_policy.yml
+  when: ssh_hardening_use_policies.stat.exists
+
+
+- name: "The standard config way..."
+  include_tasks: restrictions_configfile.yml
+  when: not ssh_hardening_use_policies.stat.exists
+

templates/crypto-policies/opensshserver_fedora.config.j2

@@ -0,0 +1 @@
+../sshd_config_hardening.j2

vars/os_freebsd.yml

@@ -1,3 +0,0 @@
----
-ssh_hardening_root_group: wheel
-

vars/os_netbsd.yml

@@ -1,6 +0,0 @@
----
-ssh_hardening_root_group: wheel
-
-ssh_hardening_moduli: /etc/moduli
-ssh_hardening_moduli_backup: /etc/moduli.not-hardened
-

vars/os_openbsd.yml

@@ -1,6 +0,0 @@
----
-ssh_hardening_root_group: wheel
-
-ssh_hardening_moduli: /etc/moduli
-ssh_hardening_moduli_backup: /etc/moduli.not-hardened
-

vars/ssh_6.7.yml

@@ -1 +0,0 @@
-ssh_6.6.yml

vars/ssh_8.2.yml

@@ -1,31 +0,0 @@
-# 8.2: Ubuntu 20.04
-# 8.4: Debian 11 & Suse 15.3
-
-ssh_hardening_opts:
-  KexAlgorithms:
-    - curve25519-sha256
-    - curve25519-sha256@libssh.org
-    - diffie-hellman-group16-sha512
-    - diffie-hellman-group18-sha512
-    - diffie-hellman-group-exchange-sha256
-  Ciphers:
-    - chacha20-poly1305@openssh.com
-    - aes256-gcm@openssh.com
-    - aes128-gcm@openssh.com
-    - aes256-ctr
-    - aes192-ctr
-    - aes128-ctr
-  MACs:
-    - hmac-sha2-256-etm@openssh.com
-    - hmac-sha2-512-etm@openssh.com
-    - umac-128-etm@openssh.com
-  HostKeyAlgorithms:
-    - ssh-ed25519
-    - ssh-ed25519-cert-v01@openssh.com
-    - sk-ssh-ed25519@openssh.com
-    - sk-ssh-ed25519-cert-v01@openssh.com
-    - rsa-sha2-512
-    - rsa-sha2-512-cert-v01@openssh.com
-    - rsa-sha2-256
-    - rsa-sha2-256-cert-v01@openssh.com
-

vars/ssh_8.3.yml

@@ -1 +0,0 @@
-ssh_8.2.yml

vars/ssh_8.4.yml

@@ -1 +0,0 @@
-ssh_8.2.yml

vars/ssh_default.yml

@@ -2,11 +2,10 @@
 # 8.4: Debian 11 & Suse 15.3
 # 8.6: Fedora 34 (no diff in *hardened policy* to 8.4)
 # 8.7: Fedora 35 (no diff in *hardened policy* to 8.4)
-# 8.9: Ubuntu 22.04
+# 8.8: Arch/Void
 
 ssh_hardening_opts:
   KexAlgorithms:
-    - sntrup761x25519-sha512@openssh.com
     - curve25519-sha256
     - curve25519-sha256@libssh.org
     - diffie-hellman-group16-sha512
@@ -28,8 +27,8 @@ ssh_hardening_opts:
     - ssh-ed25519-cert-v01@openssh.com
     - sk-ssh-ed25519@openssh.com
     - sk-ssh-ed25519-cert-v01@openssh.com
-    - rsa-sha2-512
-    - rsa-sha2-512-cert-v01@openssh.com
     - rsa-sha2-256
+    - rsa-sha2-512
     - rsa-sha2-256-cert-v01@openssh.com
+    - rsa-sha2-512-cert-v01@openssh.com