Fix RBAC groups handling and refactor Keycloak role

- Fixed incorrect handling of RBAC group configuration (moved from OIDC claims into dedicated RBAC variable set).
- Unified RBAC group usage across applications (LAM, pgAdmin, phpLDAPadmin, phpMyAdmin, YOURLS).
- Replaced old 'KEYCLOAK_OIDC_RBAC_SCOPE_NAME' with dedicated 'KEYCLOAK_RBAC_GROUP_*' variables.
- Updated OAuth2 Proxy configuration to use 'RBAC.GROUP.CLAIM'.
- Refactored Keycloak role task structure:
  * Renamed and reorganized task files for clarity ('_update.yml', '02_cleanup.yml', etc.).
  * Introduced meta and dependency handling separation.
- Cleaned up Keycloak config defaults and recaptcha placeholders.
This commit is contained in:
2025-08-17 23:27:01 +02:00
24 changed files with 66 additions and 58 deletions

View File

@@ -0,0 +1,8 @@
- include_tasks: "{{ playbook_dir }}/tasks/utils/load_handlers.yml"
vars:
handler_role_name: "docker-compose"
- ansible.builtin.include_vars:
file: "{{ item }}"
loop:
- "{{ playbook_dir }}/roles/docker-compose/vars/docker-compose.yml"
- "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml"

View File

@@ -1,25 +0,0 @@
- name: Load the '{{ application_id }}' role dependencies
block:
- name: "load required 'web-svc-logout' for {{ application_id }}"
include_role:
name: web-svc-logout
when: run_once_web_svc_logout is not defined
- name: "load docker, db and proxy for {{ application_id }}"
include_role:
name: cmp-db-docker-proxy
vars:
docker_compose_flush_handlers: true
when: KEYCLOAK_LOAD_DEPENDENCIES | bool
- name: "Load database & docker-compose variables if role dependencies aren't loaded"
block:
- include_tasks: "{{ playbook_dir }}/tasks/utils/load_handlers.yml"
vars:
handler_role_name: "docker-compose"
- ansible.builtin.include_vars:
file: "{{ item }}"
loop:
- "{{ playbook_dir }}/roles/docker-compose/vars/docker-compose.yml"
- "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml"
when: not KEYCLOAK_LOAD_DEPENDENCIES | bool

View File

@@ -0,0 +1,12 @@
- block:
- name: "load required 'web-svc-logout' for {{ application_id }}"
include_role:
name: web-svc-logout
public: false
when: run_once_web_svc_logout is not defined
- name: "load docker, db and proxy for {{ application_id }}"
include_role:
name: cmp-db-docker-proxy
vars:
docker_compose_flush_handlers: true

View File

@@ -5,7 +5,7 @@
{{
(
KEYCLOAK_DICTIONARY_REALM.clientScopes
| selectattr('name','equalto', KEYCLOAK_OIDC_RBAC_SCOPE_NAME)
| selectattr('name','equalto', KEYCLOAK_RBAC_GROUP_CLAIME)
| list | first
) | to_json
}}
@@ -27,7 +27,7 @@
scope_id_rbac: >-
{{ (
all_scopes.stdout | from_json
| selectattr('name','equalto', KEYCLOAK_OIDC_RBAC_SCOPE_NAME)
| selectattr('name','equalto', KEYCLOAK_RBAC_GROUP_CLAIME)
| list | first | default({})
).id | default('') }}

View File

@@ -1,5 +1,5 @@
- name: "Update REALM settings (merge LDAP component .config)"
include_tasks: 03_update.yml
include_tasks: _update.yml
vars:
kc_object_kind: "component"
kc_lookup_value: "{{ KEYCLOAK_LDAP_CMP_NAME }}"
@@ -141,4 +141,4 @@
}, recursive=True)
}}
kc_merge_path: "config"
include_tasks: 03_update.yml
include_tasks: _update.yml

View File

@@ -1,12 +1,18 @@
---
- name: "Load meta"
include_tasks: 01_meta.yml
when: not KEYCLOAK_LOAD_DEPENDENCIES | bool
- name: "Load cleanup routine for '{{ application_id }}'"
include_tasks: 01_cleanup.yml
include_tasks: 02_cleanup.yml
- name: "Load init routine for '{{ application_id }}'"
include_tasks: 02_initialize.yml
include_tasks: 03_init.yml
- name: "Load the depdendencies required by '{{ application_id }}'"
include_tasks: 03_load_dependencies.yml
include_tasks: 04_dependencies.yml
when: KEYCLOAK_LOAD_DEPENDENCIES | bool
- name: "Wait until '{{ KEYCLOAK_CONTAINER }}' container is healthy"
community.docker.docker_container_info:
@@ -50,9 +56,9 @@
| list | first | default({}) ).attributes | default({}) )
| combine({'frontchannel.logout.url': KEYCLOAK_FRONTCHANNEL_LOGOUT_URL}, recursive=True)
}}
include_tasks: 03_update.yml
include_tasks: _update.yml
- include_tasks: 04_rbac_client_scope.yml
- include_tasks: 05_rbac_client_scope.yml
- include_tasks: 05_ldap.yml
- include_tasks: 06_ldap.yml
when: KEYCLOAK_LDAP_ENABLED | bool