mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-11-30 08:06:47 +00:00
Kevin Veen-Birkenbach
26dfab147d
Add end-to-end support for reserved usernames and tighten CAPTCHA / Keycloak logic.
Changes:
- Makefile: rename EXTRA_USERS → RESERVED_USERNAMES and pass it as --reserved-usernames to the users defaults generator.
- cli/build/defaults/users.py: propagate flag into generated users, add --reserved-usernames CLI option and mark listed accounts as reserved.
- Add reserved_users filter plugin with and helpers for Ansible templates and tasks.
- Add unit tests for reserved_users filters and the new reserved-usernames behaviour in the users defaults generator.
- group_vars/all/00_general.yml: harden RECAPTCHA_ENABLED / HCAPTCHA_ENABLED checks with default('') and explicit > 0 length checks.
- svc-db-openldap: introduce OPENLDAP_PROVISION_* flags, add OPENLDAP_PROVISION_RESERVED and OPERNLDAP_USERS to optionally exclude reserved users from provisioning.
- svc-db-openldap templates/tasks: switch role/group LDIF and user import loops to use OPERNLDAP_USERS instead of the full users dict.
- networks: assign dedicated subnet for web-app-roulette-wheel.
- web-app-keycloak vars: compute KEYCLOAK_RESERVED_USERNAMES_LIST and KEYCLOAK_RESERVED_USERNAMES_REGEX from users | reserved_usernames.
- web-app-keycloak user profile template: inject reserved-username regex into username validation pattern and improve error message, fix SSH public key attribute usage and add component name field.
- web-app-keycloak update/_update.yml: strip subComponents from component payloads before update and disable async/poll for easier debugging.
- web-app-keycloak tasks/main.yml: guard cleanup include with MODE_CLEANUP and keep reCAPTCHA update behind KEYCLOAK_RECAPTCHA_ENABLED.
- user/users defaults: mark system/service accounts (root, daemon, mail, admin, webmaster, etc.) as reserved so they cannot be chosen as login names.
- svc-prx-openresty vars: simplify OPENRESTY_CONTAINER lookup by dropping unused default parameter.
- sys-ctl-rpr-btrfs-balancer: simplify main.yml by removing the extra block wrapper.
- sys-daemon handlers: quote handler name for consistency.
Context: change set discussed and refined in ChatGPT on 2025-11-29 (Infinito.Nexus reserved usernames & Keycloak user profile flow). See conversation: https://chatgpt.com/share/692b21f5-5d98-800f-8e15-1ded49deddc9
57 lines
2.5 KiB
YAML
57 lines
2.5 KiB
YAML
###############################################################################
|
|
# 1) Create the LDAP entry if it does not yet exist
|
|
###############################################################################
|
|
- name: Ensure LDAP users exist
|
|
community.general.ldap_entry:
|
|
dn: "{{ LDAP.USER.ATTRIBUTES.ID }}={{ item.key }},{{ LDAP.DN.OU.USERS }}"
|
|
server_uri: "{{ OPENLDAP_SERVER_URI }}"
|
|
bind_dn: "{{ LDAP.DN.ADMINISTRATOR.DATA }}"
|
|
bind_pw: "{{ LDAP.BIND_CREDENTIAL }}"
|
|
objectClass: "{{ LDAP.USER.OBJECTS.STRUCTURAL }}"
|
|
attributes:
|
|
uid: "{{ item.value.username }}"
|
|
sn: "{{ item.value.sn | default(item.key) }}"
|
|
cn: "{{ item.value.cn | default(item.key) }}"
|
|
userPassword: "{SSHA}{{ item.value.password }}"
|
|
loginShell: /bin/bash
|
|
homeDirectory: "/home/{{ item.key }}"
|
|
uidNumber: "{{ item.value.uid | int }}"
|
|
gidNumber: "{{ item.value.gid | int }}"
|
|
state: present # ↳ creates but never updates
|
|
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
|
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
|
loop: "{{ OPERNLDAP_USERS | dict2items }}"
|
|
loop_control:
|
|
label: "{{ item.key }}"
|
|
|
|
###############################################################################
|
|
# 2) Keep the objectClass list AND the mail attribute up-to-date
|
|
###############################################################################
|
|
- name: Ensure required objectClass values and mail address are present
|
|
community.general.ldap_attrs:
|
|
dn: "{{ LDAP.USER.ATTRIBUTES.ID }}={{ item.key }},{{ LDAP.DN.OU.USERS }}"
|
|
server_uri: "{{ OPENLDAP_SERVER_URI }}"
|
|
bind_dn: "{{ LDAP.DN.ADMINISTRATOR.DATA }}"
|
|
bind_pw: "{{ LDAP.BIND_CREDENTIAL }}"
|
|
attributes:
|
|
objectClass: "{{ LDAP.USER.OBJECTS.STRUCTURAL }}"
|
|
mail: "{{ item.value.email }}"
|
|
state: exact
|
|
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
|
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
|
loop: "{{ OPERNLDAP_USERS | dict2items }}"
|
|
loop_control:
|
|
label: "{{ item.key }}"
|
|
|
|
- name: "Ensure container for application roles exists"
|
|
community.general.ldap_entry:
|
|
dn: "{{ LDAP.DN.OU.ROLES }}"
|
|
server_uri: "{{ OPENLDAP_SERVER_URI }}"
|
|
bind_dn: "{{ LDAP.DN.ADMINISTRATOR.DATA }}"
|
|
bind_pw: "{{ LDAP.BIND_CREDENTIAL }}"
|
|
objectClass: organizationalUnit
|
|
attributes:
|
|
ou: roles
|
|
description: Container for application access profiles
|
|
state: present
|