feat: replace SSH hardening step with devsec.hardening role

galaxy.yml

@@ -9,3 +9,6 @@ authors:
 description: Studio Ansible collection containing common roles
 license:
   - MIT
+
+dependencies:
+  "devsec.hardening": ">=9.0.0"

roles/base/tasks/main.yml

@@ -35,3 +35,5 @@
 #       APT::Periodic::Unattended-Upgrade "1";
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
+
+## SCHEDULE REBOOTS 4 kernel upgrades: with cron, unattended-upgrades or action workflows?

roles/docker/tasks/main.yml

@@ -1,76 +1,74 @@
 ---
-- name: Install Docker
+- name: Install Docker prerequisites
+  ansible.builtin.apt:
+    name:
+      - ca-certificates
+      - curl
+      - python3-debian ## needed for the deb822 module
+    state: present
+    update_cache: true
   become: true
-  block:
-    - name: Install Docker prerequisites
-      ansible.builtin.apt:
-        name:
-          - ca-certificates
-          - curl
-          - python3-debian ## needed for the deb822 module
-        state: present
-        update_cache: true
 
-    - name: Add Docker official APT repository (DEB822 format)
+- name: Add Docker official APT repository (DEB822 format)
-      ansible.builtin.deb822_repository:
+  ansible.builtin.deb822_repository:
-        name: docker
+    name: docker
-        types: deb
+    types: deb
-        uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
+    uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
-        suites: "{{ ansible_facts['distribution_release'] }}"
+    suites: "{{ ansible_facts['distribution_release'] }}"
-        components: stable
+    components: stable
-        signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
+    signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
-        state: present
+    state: present
-
-    - name: Install Docker CE packages
-      ansible.builtin.apt:
-        name:
-          - docker-ce
-          - docker-ce-cli
-          - containerd.io
-          - docker-buildx-plugin
-          - docker-compose-plugin
-        state: present
-        update_cache: true
-
-    - name: Ensure Docker service is running and enabled
-      ansible.builtin.service:
-        name: docker
-        state: started
-        enabled: true
-
-- name: Configure deployment user for Docker
-  when: deployment_public_ssh_key is defined
   become: true
-  block:
-    - name: Add deployment user to docker group
-      ansible.builtin.user:
-        name: deployment
-        groups: docker
-        append: true
 
-    - name: Create target for docker compose
+- name: Install Docker CE packages
-      ansible.builtin.file:
+  ansible.builtin.apt:
-        path: /opt/docker
+    name:
-        state: directory
+      - docker-ce
-        owner: deployment
+      - docker-ce-cli
-        group: deployment
+      - containerd.io
-        mode: "0755"
+      - docker-buildx-plugin
+      - docker-compose-plugin
+    state: present
+    update_cache: true
+  become: true
+
+- name: Ensure Docker service is running and enabled
+  ansible.builtin.service:
+    name: docker
+    state: started
+    enabled: true
+  become: true
+
+- name: Add deployment user to docker group
+  ansible.builtin.user:
+    name: deployment
+    groups: docker
+    append: true
+  become: true
+
+- name: Create target for docker compose files
+  ansible.builtin.file:
+    path: /opt/docker
+    state: directory
+    owner: deployment
+    group: deployment
+    mode: "0755"
+  become: true
+
+- name: Create appuser group
+  ansible.builtin.group:
+    name: appuser
+    state: present
+    gid: 9999
+  become: true
 
 - name: Create app user for secure container execution
+  ansible.builtin.user:
+    name: appuser
+    state: present
+    uid: 9999
+    group: appuser
+    system: true
+    shell: /usr/sbin/nologin
+    create_home: false
   become: true
-  block:
-    - name: Create appuser group
-      ansible.builtin.group:
-        name: appuser
-        state: present
-        gid: 9999
-
-    - name: Create appuser
-      ansible.builtin.user:
-        name: appuser
-        state: present
-        uid: 9999
-        group: appuser
-        system: true
-        shell: /usr/sbin/nologin
-        create_home: false

roles/security/tasks/main.yml

@@ -1,35 +1,20 @@
 ---
 - name: Harden SSH configuration
+  ansible.builtin.import_role:
+    name: devsec.hardening.ssh_hardening
+  vars:
+    ssh_permit_root_login: "no"
+    ssh_password_authentication: "no"
+
+- name: Install fail2ban
+  ansible.builtin.apt:
+    name:
+      - fail2ban
+    state: present
   become: true
-  block:
-    - name: Create SSH drop-in directory
-      ansible.builtin.file:
-        path: /etc/ssh/sshd_config.d
-        state: directory
-        owner: root
-        group: root
-        mode: "0755"
 
-    - name: Harden SSH configuration with drop-in template
+- name: Start fail2ban
-      ansible.builtin.template:
+  ansible.builtin.service:
-        src: sshd.conf.j2
+    name: fail2ban
-        dest: /etc/ssh/sshd_config.d/sshd.conf
+    state: started
-        owner: root
+    enabled: yes
-        group: root
-        mode: "0644"
-      notify: Restart sshd
-
-- name: Enable fail2ban
-  become: true
-  block:
-    - name: Install fail2ban
-      ansible.builtin.apt:
-        name:
-          - fail2ban
-        state: present
-
-    - name: Start fail2ban
-      ansible.builtin.service:
-        name: fail2ban
-        state: started
-        enabled: yes

roles/security/templates/sshd.conf.j2

@@ -1,5 +0,0 @@
-## Disable root login
-PermitRootLogin no
-
-## Disable password authentication
-PasswordAuthentication no

roles/users/tasks/main.yml

@@ -1,42 +1,38 @@
 ---
-- name: Set up primary sysadmin user
+- name: Create primary sysadmin user
-  when: sysadmin_public_ssh_key is defined
+  ansible.builtin.user:
+    name: "{{ sysadmin_user }}"
+    groups: sudo
+    append: yes
+    shell: /bin/bash
+    create_home: yes
   become: true
-  block:
-    - name: Create sysadmin user
-      ansible.builtin.user:
-        name: "{{ sysadmin_user }}"
-        groups: sudo
-        append: yes
-        shell: /bin/bash
-        create_home: yes
 
-    - name: Add SSH public key
+- name: Add SSH public key for sysadmin
-      ansible.posix.authorized_key:
+  ansible.posix.authorized_key:
-        user: "{{ sysadmin_user }}"
+    user: "{{ sysadmin_user }}"
-        state: present
+    state: present
-        key: "{{ sysadmin_public_ssh_key }}"
+    key: "{{ sysadmin_public_ssh_key }}"
-
-    - name: Allow passwordless sudo
-      ansible.builtin.copy:
-        dest: /etc/sudoers.d/sudo-nopasswd
-        content: "%sudo ALL=(ALL) NOPASSWD: ALL"
-        mode: "0440"
-        validate: /usr/sbin/visudo -cf %s
-
-
-- name: Set up deployment user for CI/CD
-  when: deployment_public_ssh_key is defined
   become: true
-  block:
-    - name: Create deployment user
-      ansible.builtin.user:
-        name: deployment
-        shell: /bin/bash
-        create_home: yes
 
-    - name: Add SSH public key
+- name: Allow passwordless sudo for sudo group
-      ansible.posix.authorized_key:
+  ansible.builtin.copy:
-        user: deployment
+    dest: /etc/sudoers.d/sudo-nopasswd
-        state: present
+    content: "%sudo ALL=(ALL) NOPASSWD: ALL"
-        key: "{{ deployment_public_ssh_key }}"
+    mode: "0440"
+    validate: /usr/sbin/visudo -cf %s
+  become: true
+
+- name: Create deployment user for CI/CD
+  ansible.builtin.user:
+    name: deployment
+    shell: /bin/bash
+    create_home: yes
+  become: true
+
+- name: Add SSH public key for deployment user
+  ansible.posix.authorized_key:
+    user: deployment
+    state: present
+    key: "{{ deployment_public_ssh_key }}"
+  become: true