mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-30 15:28:12 +02:00
Refactor Keycloak role:
- Replace KEYCLOAK_KCADM_PATH with KEYCLOAK_EXEC_KCADM consistently - Externalize client.json to separate Jinja2 template and include it in realm.json - Simplify LDAP bind update to use explicit KEYCLOAK_LDAP_* vars - Add async/poll support for long-running kcadm updates - Restructure vars/main.yml: clearer grouping (General, Docker, Server, Update, LDAP, API) - Compute redirectUris/webOrigins centrally in vars - Align post.logout.redirect.uris handling with playbook Conversation: https://chatgpt.com/share/68a1a11f-f8ac-800f-bada-cdc99a4fa1bf
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
# - KEYCLOAK_REALM target realm name
|
||||
# - KEYCLOAK_SERVER_HOST_URL e.g. "http://127.0.0.1:8080"
|
||||
# - KEYCLOAK_SERVER_INTERNAL_URL e.g. "http://127.0.0.1:8080"
|
||||
# - KEYCLOAK_KCADM_PATH e.g. "docker exec -i keycloak /opt/keycloak/bin/kcadm.sh"
|
||||
# - KEYCLOAK_EXEC_KCADM e.g. "docker exec -i keycloak /opt/keycloak/bin/kcadm.sh"
|
||||
# - KEYCLOAK_MASTER_API_USER_NAME
|
||||
# - KEYCLOAK_MASTER_API_USER_PASSWORD
|
||||
# - KEYCLOAK_CLIENT_ID clientId to update (e.g. same as realm or an app client)
|
||||
@@ -20,7 +20,7 @@
|
||||
- KEYCLOAK_REALM is defined
|
||||
- KEYCLOAK_SERVER_HOST_URL is defined
|
||||
- KEYCLOAK_SERVER_INTERNAL_URL is defined
|
||||
- KEYCLOAK_KCADM_PATH is defined
|
||||
- KEYCLOAK_EXEC_KCADM is defined
|
||||
- KEYCLOAK_MASTER_API_USER_NAME is defined
|
||||
- KEYCLOAK_MASTER_API_USER_PASSWORD is defined
|
||||
- KEYCLOAK_CLIENT_ID is defined
|
||||
@@ -32,32 +32,16 @@
|
||||
- name: "kcadm login"
|
||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
||||
shell: >
|
||||
{{ KEYCLOAK_KCADM_PATH }} config credentials
|
||||
{{ KEYCLOAK_EXEC_KCADM }} config credentials
|
||||
--server {{ KEYCLOAK_SERVER_INTERNAL_URL }}
|
||||
--realm master
|
||||
--user {{ KEYCLOAK_MASTER_API_USER_NAME }}
|
||||
--password {{ KEYCLOAK_MASTER_API_USER_PASSWORD }}
|
||||
changed_when: false
|
||||
|
||||
# 1) Build desired sets (NO defaults)
|
||||
- name: "Build desired redirect URIs from config via filter"
|
||||
set_fact:
|
||||
kc_redirect_uris: >-
|
||||
{{ domains | redirect_uris(applications, WEB_PROTOCOL, '/*', KEYCLOAK_REDIRECT_FEATURES, True) }}
|
||||
|
||||
- name: Build desired web origins (scheme://host[:port])
|
||||
set_fact:
|
||||
kc_web_origins: >-
|
||||
{{ kc_redirect_uris
|
||||
| map('regex_replace','/\\*$','')
|
||||
| map('regex_search','^(https?://[^/]+)')
|
||||
| select('string')
|
||||
| list | unique }}
|
||||
|
||||
# 2) Resolve client id (strictly by provided clientId, no fallback)
|
||||
- name: "Resolve client internal id for {{ KEYCLOAK_CLIENT_ID }}"
|
||||
shell: >
|
||||
{{ KEYCLOAK_KCADM_PATH }} get clients
|
||||
{{ KEYCLOAK_EXEC_KCADM }} get clients
|
||||
-r {{ KEYCLOAK_REALM }}
|
||||
--query 'clientId={{ KEYCLOAK_CLIENT_ID }}'
|
||||
--fields id --format json | jq -r '.[0].id'
|
||||
@@ -69,10 +53,9 @@
|
||||
that: kc_client.stdout is match('^[0-9a-f-]+$')
|
||||
fail_msg: "Client '{{ KEYCLOAK_CLIENT_ID }}' not found in realm '{{ KEYCLOAK_REALM }}'."
|
||||
|
||||
# 3) Read current config (assume keys exist; we don't use defaults)
|
||||
- name: "Read current client configuration"
|
||||
shell: >
|
||||
{{ KEYCLOAK_KCADM_PATH }} get clients/{{ kc_client.stdout }}
|
||||
{{ KEYCLOAK_EXEC_KCADM }} get clients/{{ kc_client.stdout }}
|
||||
-r {{ KEYCLOAK_REALM }} --format json
|
||||
register: kc_client_obj
|
||||
changed_when: false
|
||||
@@ -93,13 +76,11 @@
|
||||
| reject('equalto','')
|
||||
| list | sort
|
||||
}}
|
||||
kc_desired_redirect_uris: "{{ kc_redirect_uris | sort }}"
|
||||
kc_desired_web_origins: "{{ kc_web_origins | sort }}"
|
||||
kc_desired_post_logout_uris: "+"
|
||||
kc_desired_post_logout_uris_list: >-
|
||||
kc_desired_redirect_uris: "{{ KEYCLOAK_REDIRECT_URIS | sort }}"
|
||||
kc_desired_web_origins: "{{ KEYCLOAK_WEB_ORIGINS | sort }}"
|
||||
KEYCLOAK_POST_LOGOUT_URIS_list: >-
|
||||
{{ "+" | split('\n') | reject('equalto','') | list | sort }}
|
||||
|
||||
# after "Read current client configuration"
|
||||
- name: "Extract current frontchannel logout url"
|
||||
set_fact:
|
||||
kc_current_frontchannel_logout_url: >-
|
||||
@@ -111,16 +92,17 @@
|
||||
)
|
||||
}}
|
||||
|
||||
# 4) Update only when changed
|
||||
- name: "Update client with redirectUris, webOrigins, frontchannelLogout"
|
||||
shell: >
|
||||
{{ KEYCLOAK_KCADM_PATH }} update clients/{{ kc_client.stdout }}
|
||||
{{ KEYCLOAK_EXEC_KCADM }} update clients/{{ kc_client.stdout }}
|
||||
-r {{ KEYCLOAK_REALM }}
|
||||
-s 'redirectUris={{ kc_redirect_uris | to_json }}'
|
||||
-s 'webOrigins={{ kc_web_origins | to_json }}'
|
||||
-s 'redirectUris={{ KEYCLOAK_REDIRECT_URIS | to_json }}'
|
||||
-s 'webOrigins={{ KEYCLOAK_WEB_ORIGINS | to_json }}'
|
||||
-s 'frontchannelLogout=true'
|
||||
-s 'attributes."frontchannel.logout.url"={{ KEYCLOAK_FRONTCHANNEL_LOGOUT_URL | to_json }}'
|
||||
when: kc_current_redirect_uris != kc_desired_redirect_uris
|
||||
or kc_current_web_origins != kc_desired_web_origins
|
||||
or kc_current_frontchannel_logout_url != KEYCLOAK_FRONTCHANNEL_LOGOUT_URL
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
|
||||
|
@@ -79,21 +79,13 @@
|
||||
kc_ldap_current_bind_pw: "{{ ((kc_ldap_list.stdout | from_json)[0].config['bindCredential'] | default(['']))[0] }}"
|
||||
kc_ldap_current_connection_url: "{{ ((kc_ldap_list.stdout | from_json)[0].config['connectionUrl'] | default(['']))[0] }}"
|
||||
|
||||
# Desired values come STRICTLY from ldap.*
|
||||
- name: "Set desired LDAP values (strict from ldap.*)"
|
||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
||||
set_fact:
|
||||
kc_desired_bind_dn: "{{ ldap.dn.administrator.data }}"
|
||||
kc_desired_bind_pw: "{{ ldap.bind_credential }}"
|
||||
kc_desired_connection_url: "{{ ldap.server.uri }}"
|
||||
|
||||
- name: "Determine if update is required"
|
||||
set_fact:
|
||||
kc_needs_update: >-
|
||||
{{
|
||||
(kc_ldap_current_bind_dn != kc_desired_bind_dn)
|
||||
or (kc_ldap_current_bind_pw != kc_desired_bind_pw)
|
||||
or (kc_ldap_current_connection_url != kc_desired_connection_url)
|
||||
(kc_ldap_current_bind_dn != KEYCLOAK_LDAP_BIND_DN)
|
||||
or (kc_ldap_current_bind_pw != KEYCLOAK_LDAP_BIND_PW)
|
||||
or (kc_ldap_current_connection_url != KEYCLOAK_LDAP_URL)
|
||||
}}
|
||||
|
||||
# Pass each -s as a single argv token with valid JSON (arrays), zero shell quoting issues.
|
||||
@@ -103,16 +95,11 @@
|
||||
argv: "{{ kcadm_argv_base
|
||||
+ ['update', 'components/' ~ kc_ldap_component_id,
|
||||
'-r', KEYCLOAK_REALM,
|
||||
'-s', 'config.bindDn=' ~ ([kc_desired_bind_dn] | to_json),
|
||||
'-s', 'config.bindCredential=' ~ ([kc_desired_bind_pw] | to_json),
|
||||
'-s', 'config.connectionUrl=' ~ ([kc_desired_connection_url] | to_json)
|
||||
'-s', 'config.bindDn=' ~ ([KEYCLOAK_LDAP_BIND_DN] | to_json),
|
||||
'-s', 'config.bindCredential=' ~ ([KEYCLOAK_LDAP_BIND_PW] | to_json),
|
||||
'-s', 'config.connectionUrl=' ~ ([KEYCLOAK_LDAP_URL] | to_json)
|
||||
] }}"
|
||||
when: kc_needs_update | bool
|
||||
register: kc_bind_update
|
||||
|
||||
- name: "LDAP provider updated"
|
||||
debug:
|
||||
msg: "LDAP bindDn/bindCredential/connectionUrl updated on component {{ KEYCLOAK_LDAP_CMP_NAME }}."
|
||||
when:
|
||||
- kc_bind_update is defined
|
||||
- kc_bind_update.rc == 0
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
|
@@ -1,7 +1,7 @@
|
||||
# Configure Credentials
|
||||
- name: Ensure Keycloak CLI credentials are configured
|
||||
shell: |
|
||||
{{ KEYCLOAK_KCADM_PATH }} config credentials \
|
||||
{{ KEYCLOAK_EXEC_KCADM }} config credentials \
|
||||
--server {{ KEYCLOAK_SERVER_INTERNAL_URL }} \
|
||||
--realm master \
|
||||
--user {{ KEYCLOAK_MASTER_API_USER_NAME }} \
|
||||
@@ -10,7 +10,7 @@
|
||||
# LDAP Source
|
||||
- name: Get ID of LDAP storage provider
|
||||
shell: |
|
||||
{{ KEYCLOAK_KCADM_PATH }} get components \
|
||||
{{ KEYCLOAK_EXEC_KCADM }} get components \
|
||||
-r {{ KEYCLOAK_REALM }} \
|
||||
--query 'providerId=ldap' \
|
||||
--fields id,name \
|
||||
@@ -47,12 +47,12 @@
|
||||
|
||||
- name: Enable user profile in realm
|
||||
shell: >
|
||||
{{ KEYCLOAK_KCADM_PATH }} update realms/{{ KEYCLOAK_REALM }}
|
||||
{{ KEYCLOAK_EXEC_KCADM }} update realms/{{ KEYCLOAK_REALM }}
|
||||
-s 'attributes.userProfileEnabled=true'
|
||||
|
||||
- name: Re-authenticate to Keycloak after enabling user profile
|
||||
shell: |
|
||||
{{ KEYCLOAK_KCADM_PATH }} config credentials \
|
||||
{{ KEYCLOAK_EXEC_KCADM }} config credentials \
|
||||
--server {{ KEYCLOAK_SERVER_INTERNAL_URL }} \
|
||||
--realm master \
|
||||
--user {{ KEYCLOAK_MASTER_API_USER_NAME }} \
|
||||
@@ -69,3 +69,5 @@
|
||||
shell: |
|
||||
docker exec -i {{ KEYCLOAK_CONTAINER }} \
|
||||
/opt/keycloak/bin/kcadm.sh update realms/{{ KEYCLOAK_REALM }} -f {{ KEYCLOAK_DOCKER_IMPORT_DIR }}user-profile.json
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
Reference in New Issue
Block a user