From cfcd37a2faa10d26946a17ed1bc4c0ce8e809dc5 Mon Sep 17 00:00:00 2001 From: cmsassot Date: Thu, 29 Sep 2022 16:50:33 +0200 Subject: [PATCH] WIP --- defaults/main.yml | 11 ++++++----- templates/hydra-dispatcher-apps.yml.j2 | 15 +++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d7064be..f00e1ea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -110,12 +110,13 @@ hydra_passwordless_attributes_rewrite_rules: # Hydra SAML configuration enable_hydra_saml: yes -hydra_saml_app_title: SAML -hydra_saml_app_description: Authentification via SAML +hydra_saml_app_title: {} +hydra_saml_app_description: {} hydra_saml_app_icon_url: hydra_saml_identity_provider_id: saml hydra_saml_idp_entity_id: https://samltest.id/saml/idp hydra_saml_idp_metadata_url: https://samltest.id/saml/idp +hydra_saml_app_options: {} # Liste des URLs autorisées pour la redirection post-login/logout sur le service shibboleth-sp hydra_saml_allowed_redirects: [] @@ -187,8 +188,8 @@ oidc_test_app_public_base_url: "{{ haproxy_public_base_url }}{{ haproxy_oidc_tes enable_hydra_oidc: no hydra_oidc_debug: no hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}" -hydra_oidc_app_title: OpenID Connect -hydra_oidc_app_description: Authentification via OpenID Connect +hydra_oidc_app_title: {} +hydra_oidc_app_description: {} hydra_oidc_app_icon_url: https://openid.net/wordpress-content/uploads/2014/09/openid-r-logo-900x360.png hydra_oidc_identity_provider_id: oidc hydra_oidc_authorize_endpoint: @@ -200,7 +201,7 @@ hydra_oidc_scope: openid email hydra_oidc_client_id: hydra_oidc_client_secret: hydra_oidc_additionnal_env: {} - +hydra_oidc_options: {} hydra_oidc_attributes_rewrite_rules: email: - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null" diff --git a/templates/hydra-dispatcher-apps.yml.j2 b/templates/hydra-dispatcher-apps.yml.j2 index 02a2926..1291271 100644 --- a/templates/hydra-dispatcher-apps.yml.j2 +++ b/templates/hydra-dispatcher-apps.yml.j2 @@ -16,9 +16,11 @@ hydra: {% if enable_hydra_saml %} - id: {{ hydra_saml_identity_provider_id | default("saml") }} title: - fr: "{{ hydra_saml_app_title }}" + fr: "{{ hydra_saml_app_title_fr }}" + en: "{{ hydra_saml_app_title_en | default("{{ hydra_saml_app_title_fr }}") }}" description: - fr: "{{ hydra_saml_app_description }}" + fr: "{{ hydra_saml_app_description_fr }}" + en: "{{ hydra_saml_app_description_en | default("{{ hydra_saml_app_description_en }}") }}" login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/login" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/consent" logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/logout" @@ -28,14 +30,19 @@ hydra: {% if enable_hydra_oidc %} - id: {{ hydra_oidc_identity_provider_id | default("oidc") }} title: - fr: "{{ hydra_oidc_app_title }}" + fr: "{{ hydra_oidc_app_title_fr }}" + en: "{{ hydra_oidc_app_title_en | default("{{ hydra_oidc_app_title_fr }}") }}" description: - fr: "{{ hydra_oidc_app_description }}" + fr: "{{ hydra_oidc_app_description_fr }}" + en: "{{ hydra_oidc_app_description_en | default("{{ hydra_oidc_app_description_fr }}") }}" login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/login" consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent" logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout" attributes_rewrite_rules: {{ hydra_oidc_attributes_rewrite_rules | to_json }} icon_url: "{{ hydra_oidc_app_icon_url }}" + options: + fr: "{{ hydra_oidc_app_options_icon_url_fr }}" + en: "{{ hydra_oidc_app_options_icon_url_en | default("{{ hydra_oidc_app_icon_url }}") }}" {% endif %} {% if enable_hydra_ldap %} - id: ldap