add default value to hydra_saml_allowed_redirects tepmplate

Reviewed-on: #15

defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+install_only: false
+
 # cadoles-pod repository configuration
 cadoles_pod_debian_repository_url: https://vulcain.cadoles.com
 cadoles_pod_debian_repository: bullseye-dev
@@ -15,7 +17,8 @@ cadoles_pod_hydra_oidc_v1_package_version: '*'
 cadoles_pod_hydra_ldap_v1_package_version: '*'
 
 # Hydra database configuration
-hydra_use_external_database: no
+hydra_use_external_database: false
+hydra_auto_migrate: false
 hydra_database_name: hydra
 hydra_database_user: hydra
 hydra_database_password: hydra
@@ -45,7 +48,7 @@ hydra_urls_login: "{{ haproxy_public_base_url }}{{ haproxy_hydra_dispatcher_base
 hydra_urls_logout: "{{ haproxy_public_base_url }}{{ haproxy_hydra_dispatcher_base_path }}/logout"
 hydra_url_post_logout: "{{ haproxy_public_base_url }}"
 hydra_urls_error: "{{ haproxy_public_base_url }}/erreur"
-
+hydra_public_cors_allowed_origins: []
 
 hydra_log_level: warn
 hydra_log_leak_sensitive_values: no
@@ -61,6 +64,7 @@ hydra_clients:
 
 # Hydra dispatcher configuration
 
+enable_hydra_dispatcher: true
 hydra_dispatcher_cookie_path: "{{ haproxy_hydra_dispatcher_base_path }}"
 hydra_dispatcher_debug: no
 hydra_dispatcher_admin_authorized_hosts:
@@ -74,12 +78,37 @@ hydra_dispatcher_available_locales:
 hydra_dispatcher_sentry_dsn:
 hydra_dispatcher_sentry_environment:
 hydra_dispatcher_mounts: []
-
+hydra_dispatcher_disable_app_auto_select: true
+hydra_dispatcher_webhook: false
+hydra_dispatcher_webhook_api_url:
+hydra_dispatcher_webhook_api_key: YouNeedToChangeMe
+hydra_dispatcher_webhook_rules:
+    email:
+      required: false
+      pattern:
+    family_name:
+      required: false
+    given_name:
+      required: false
+    birthdate:
+      required: false
+    birthplace:
+      required: false
+    birthcountry:
+      required: false
+    crous:
+      required: false
+    idpve:
+      required: false
+    sub:
+      required: false
 # Hydra Passwordless configuration
 
 enable_hydra_passwordless: yes
-hydra_passwordless_app_title: Adresse courriel
-hydra_passwordless_app_description: Authentification via adresse courriel
+hydra_passwordless_app_title:
+  fr: Adresse courriel
+hydra_passwordless_app_description: 
+  fr: Authentification via adresse courriel
 hydra_passwordless_app_icon_url: https://upload.wikimedia.org/wikipedia/commons/4/48/You%27ve_got_mail.png
 hydra_passwordless_identity_provider_id: passwordless
 hydra_passwordless_smtp_host: smtp-server
@@ -113,13 +142,17 @@ hydra_passwordless_attributes_rewrite_rules:
 # Hydra SAML configuration
 
 enable_hydra_saml: yes
-hydra_saml_app_title: {}
-hydra_saml_app_description: {}
+hydra_saml_app_title:
+  fr: SAML
+hydra_saml_app_description:
+  fr: Authentification via SAML
 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: {}
+hydra_saml_app_options:
+  icon_url:
+    fr: 
 
 # Liste des URLs autorisées pour la redirection post-login/logout sur le service shibboleth-sp
 hydra_saml_allowed_redirects: []
@@ -133,6 +166,9 @@ hydra_saml_debug: no
 # Niveau de verbosité du service shibboleth-sp
 hydra_saml_sp_log_level: WARN
 
+# Durée de vie des "refresh_token"
+hydra_ttl_refresh_token: "24h"
+
 # Inclure les règles de cartographie des attributs SAML fournis  par défaut par le projet hydra-shibboleth-sp-v3
 hydra_saml_include_sp_default_attributes_mapping: "yes"
 
@@ -193,8 +229,10 @@ hydra_oidc_debug: no
 hydra_oidc_hydra_url_error:
 hydra_oidc_base_url:
 hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}"
-hydra_oidc_app_title: {}
-hydra_oidc_app_description: {}
+hydra_oidc_app_title:
+  fr: OIDC
+hydra_oidc_app_description:
+  fr: Authentification via OIDC
 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:
@@ -206,7 +244,9 @@ hydra_oidc_scope: openid email
 hydra_oidc_client_id:
 hydra_oidc_client_secret:
 hydra_oidc_additionnal_env: {}
-hydra_oidc_app_options: {}
+hydra_oidc_app_options:
+  icon_url:
+    fr:
 hydra_oidc_attributes_rewrite_rules:
   email:
     - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
@@ -230,8 +270,10 @@ hydra_oidc_attributes_rewrite_rules:
 # Hydra LDAP configuration
 
 enable_hydra_ldap: no
-hydra_ldap_app_title: LDAP
-hydra_ldap_app_description: Authentification via LDAP
+hydra_ldap_app_title:
+  fr: LDAP
+hydra_ldap_app_description: 
+  fr: Authentification via LDAP
 hydra_ldap_app_icon_url:
 hydra_ldap_dev_mode: false
 hydra_ldap_attributes_rewrite_rules:

handlers/main.yml

@@ -4,36 +4,42 @@
     name: haproxy
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-hydra-v1
   service:
     name: cadoles-pod-hydra-v1
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-hydra-dispatcher-v1
   service:
     name: cadoles-pod-hydra-dispatcher-v1
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-hydra-passwordless-v1
   service:
     name: cadoles-pod-hydra-passwordless-v1
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-hydra-remote-user-v1
   service:
     name: cadoles-pod-hydra-remote-user-v1
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-shibboleth-sp-v3
   service:
     name: cadoles-pod-shibboleth-sp-v3
     state: restarted
   become: true
+  when: not install_only
 
 - name: Restart cadoles-pod-hydra-oidc-v1
   service:
@@ -46,7 +52,16 @@
     name: cadoles-pod-hydra-ldap-v1
     state: restarted
   become: true
+  when: not install_only
+
+- name: Restart cadoles-pod-goweb-oidc-v1
+  service:
+    name: cadoles-pod-goweb-oidc-v1
+    state: restarted
+  become: true
+  when: not install_only
 
 - name: Reload hydra clients
   ansible.builtin.include_tasks:
-    file: hydra-reload-clients.yml
+    file: hydra-reload-clients.yml
+  when: not install_only

sso.schema.yml

@@ -86,6 +86,9 @@ properties:
   hydra_log_leak_sensitive_values:
     type: boolean
 
+  hydra_ttl_refresh_token:
+    type: string
+
   # This value should not be changed after first deployment !
   hydra_secrets_seed:
     type: string
@@ -109,9 +112,9 @@ properties:
   enable_hydra_passwordless:
     type: boolean
   hydra_passwordless_app_title:
-    type: string
+    type: object
   hydra_passwordless_app_description:
-    type: string
+    type: object
   hydra_passwordless_app_icon_url:
     type: string
   hydra_passwordless_smtp_host:
@@ -134,9 +137,9 @@ properties:
   enable_hydra_saml:
     type: boolean
   hydra_saml_app_title:
-    type: string
+    type: object
   hydra_saml_app_description:
-    type: string
+    type: object
   hydra_saml_app_icon_url:
     type: string
   hydra_saml_idp_entity_id:

tasks/goweb-oidc.yml

@@ -0,0 +1,22 @@
+---
+
+- name: Install cadoles-pod-goweb-oidc-v1 package
+  ansible.builtin.apt:
+    name:
+      - "cadoles-pod-goweb-oidc-v1={{ cadoles_pod_goweb_oidc_v1_package_version }}"
+    update_cache: yes
+    state: present
+  become: true
+
+- name: Configure cadoles-pod-goweb-oidc-v1
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - src:  cadoles-pod-goweb-oidc-v1.conf.j2
+      dest: /etc/cadoles-pod-goweb-oidc-v1.conf
+      mode: u=rw,g=r,o=r
+  notify:
+    - Restart cadoles-pod-goweb-oidc-v1
+  become: true

tasks/hydra-create-client.yml

@@ -0,0 +1,25 @@
+---
+# Simple task to create 1 client for hydra. Fails if the client already exists.
+# Parameter: client_id
+
+- fail: msg='Error, client does not exist. Please define the client first'
+  when: hydra_clients|selectattr("client_id", "equalto", client_id)|list|length == 0
+
+# Creating a client which already exists could create problems
+- name: Check client doesn't already exists
+  command: podman exec -t cadoles-pod-hydra-v1 /bin/sh -c "hydra clients get {{ client_id }} --endpoint http://127.0.0.1:4445"
+  register: command_result
+  failed_when: command_result.rc == 0
+  become: true
+
+- name: Create hydra-client
+  template:
+    src: hydra-client.json.j2
+    dest: "/etc/hydra/clients.d/{{ item.client_id }}.json"
+  with_items: "{{ hydra_clients }}"
+  when: item.client_id == client_id
+  become: true
+
+- name: Import client
+  command: podman exec -t cadoles-pod-hydra-v1 /bin/sh -c "hydra clients import /etc/hydra/clients.d/{{ client_id }}.json --endpoint http://127.0.0.1:4445"
+  become: true

tasks/hydra-update-client.yml

@@ -0,0 +1,33 @@
+---
+# Simple task to update 1 client for hydra.
+# Parameter: client_id
+
+- fail: msg='Error, client does not exist. Please define the client first'
+  when: hydra_clients|selectattr("client_id", "equalto", client_id)|list|length == 0
+
+- name: Create or overwrite hydra-client
+  template:
+    src: hydra-client.json.j2
+    dest: "/etc/hydra/clients.d/{{ item.client_id }}.json"
+  with_items: "{{ hydra_clients }}"
+  when: item.client_id == client_id
+  become: true
+
+- name: Update client
+  command: >
+    podman exec -t cadoles-pod-hydra-v1 /bin/sh -c "hydra clients update '{{ client_id }}'
+    --endpoint http://127.0.0.1:4445
+    --name '{{ item.client_name | default(item.client_id) }}'
+    --secret '{{ item.client_secret | default(lookup('ansible.builtin.password', '/dev/null chars=ascii_lowercase,digits length=32 seed=inventory_hostname')) }}'
+    --grant-types '{{ ','.join(item.grant_types) if "grant_types" in item else "authorization_code, refresh_token" }}'
+    --post-logout-callbacks '{{ ','.join(item.post_logout_redirect_uris) if "post_logout_redirect_uris" in item else "" }}'
+    --callbacks '{{ ','.join(item.redirect_uris) }}'
+    --response-types '{{ ','.join(item.response_types) if "response_types" in item else "code" }}'
+    --logo-uri '{{ item.logo_uri if "logo_uri" in item else "" }}'
+    --scope '{{ ','.join(item.scope) if "scope" in item else "openid profile email webhook" }}'
+    --token-endpoint-auth-method '{{ item.token_endpoint_auth_method if "token_endpoint_auth_method" in item else "client_secret_post" }}'
+    "
+  with_items: "{{ hydra_clients }}"
+  when: item.client_id == client_id
+  become: true
+

tasks/install-hydra.yml

@@ -0,0 +1,45 @@
+---
+
+- name: Install Hydra
+  ansible.builtin.apt:
+    name:
+      - cadoles-pod-hydra-v1={{ cadoles_pod_hydra_v1_package_version }}
+    update_cache: yes
+    state: present
+  become: true
+
+- name: Configure Hydra local database
+  ansible.builtin.include_tasks: hydra-database.yml
+  when: not hydra_use_external_database
+
+- name: Configure cadoles-pod-hydra-v1
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - src:  cadoles-pod-hydra-v1.conf.j2
+      dest: /etc/cadoles-pod-hydra-v1.conf
+  notify:
+    - Restart cadoles-pod-hydra-v1
+  become: true
+
+- name: Check cadoles-pod-hydra-v1 status
+  service:
+    name: cadoles-pod-hydra-v1
+    state: started
+  become: true
+
+- name: Migrate Hydra database schema
+  command: podman exec -it cadoles-pod-hydra-v1 migrate-hydra-schema
+  become: true
+  when: hydra_auto_migrate
+
+- name: Create hydra-clients
+  template:
+    src: hydra-client.json.j2
+    dest: "/etc/hydra/clients.d/{{ item.client_id }}.json"
+  with_items: "{{ hydra_clients }}"
+  notify:
+    - Reload hydra clients
+  become: true
+

tasks/main.yml

@@ -9,24 +9,28 @@
     update_cache: yes
     state: present
   become: true
+  tags: [ hydra-only ]
 
 - name: Add LetsEncrypt missing intermediate certificates
   command: "bash -c 'wget -O- --no-check-certificate https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash'"
   args:
     creates: /etc/ssl/certs/lets-encrypt-e1.pem.pem
   become: true
+  tags: [ hydra-only ]
 
 - name: Add cadoles-pod debian repository key
   ansible.builtin.apt_key:
     url: "{{ cadoles_pod_debian_repository_key_url }}"
     state: present
   become: true
+  tags: [ hydra-only ]
 
 - name: Configure cadoles-pod debian repository
   ansible.builtin.apt_repository:
     repo: "deb {{ cadoles_pod_debian_repository_url }} {{ cadoles_pod_debian_repository }} main"
     state: present
   become: true
+  tags: [ hydra-only ]
 
 - name: Ensure sysctl configuration
   ansible.posix.sysctl:
@@ -39,48 +43,30 @@
     - name: fs.inotify.max_user_watches
       value: 204800
   become: true
+  tags: [ hydra-only ]
 
-- name: Install core packages
+- name: Install HAProxy
   ansible.builtin.apt:
     name:
       - haproxy={{ haproxy_package_version }}
-      - cadoles-pod-hydra-v1={{ cadoles_pod_hydra_v1_package_version }}
-      - cadoles-pod-hydra-dispatcher-v1={{ cadoles_pod_hydra_dispatcher_v1_package_version }}
     update_cache: yes
     state: present
   become: true
+  tags: [ hydra-only ]
 
-- name: Configure Hydra local database
-  ansible.builtin.include_tasks: hydra-database.yml
-  when: not hydra_use_external_database  
+- name: Install Hydra
+  include_tasks: 
+    file: ./install-hydra.yml
+    apply:
+      tags: [ hydra-only ]
+  tags: [ hydra-only ]
 
-- name: Configure HAProxy
-  template:
-    src: haproxy.cfg.j2
-    dest: /etc/haproxy/haproxy.cfg
-    validate: "haproxy -c -f %s"
-  notify:
-    - Restart HAProxy
-  become: true
-
-- name: Create hydra-clients
-  template:
-    src: hydra-client.json.j2
-    dest: "/etc/hydra/clients.d/{{ item.client_id }}.json"
-  with_items: "{{ hydra_clients }}"
-  notify:
-    - Reload hydra clients
-  become: true
-
-- name: Configure cadoles-pod-hydra-v1
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  with_items:
-    - src:  cadoles-pod-hydra-v1.conf.j2
-      dest: /etc/cadoles-pod-hydra-v1.conf
-  notify:
-    - Restart cadoles-pod-hydra-v1
+- name: Install hydra-dispatcher
+  ansible.builtin.apt:
+    name:
+      - cadoles-pod-hydra-dispatcher-v1={{ cadoles_pod_hydra_dispatcher_v1_package_version }}
+    update_cache: yes
+    state: present
   become: true
 
 - name: Configure cadoles-pod-hydra-dispatcher-v1
@@ -117,8 +103,18 @@
 
 - name: Start OIDC Test app if enabled
   ansible.builtin.include_tasks: start-oidc-test.yml
-  when: enable_oidc_test_app
+  when: enable_oidc_test_app and not install_only
 
 - name: Stop OIDC Test app if disabled
   ansible.builtin.include_tasks: stop-oidc-test.yml
-  when: not enable_oidc_test_app
+  when: not enable_oidc_test_app and not install_only
+
+- name: Configure HAProxy
+  template:
+    src: haproxy.cfg.j2
+    dest: /etc/haproxy/haproxy.cfg
+    validate: "haproxy -c -f %s"
+  notify:
+    - Restart HAProxy
+  become: true
+  tags: [ hydra-only ]

tasks/update-hydra-dispatcher.yml

@@ -0,0 +1,25 @@
+---
+# Simple task to update the package/container cadoles-pod-hydra-dispatcher only.
+- name: Install hydra-dispatcher package
+  ansible.builtin.apt:
+    name:
+      - cadoles-pod-hydra-dispatcher-v1={{ cadoles_pod_hydra_dispatcher_v1_package_version }}
+    update_cache: yes
+    state: present
+  become: true
+
+- name: Configure cadoles-pod-hydra-dispatcher-v1
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - src:  cadoles-pod-hydra-dispatcher-v1.conf.j2
+      dest: /etc/cadoles-pod-hydra-dispatcher-v1.conf
+      mode: u=rw,g=r
+    - src:  hydra-dispatcher-apps.yml.j2
+      dest: /etc/hydra-dispatcher/conf.d/apps.yml
+      mode: u=rw,g=r,o=r
+  notify:
+    - Restart cadoles-pod-hydra-dispatcher-v1
+  become: true

tasks/update-hydra-sp.yml

@@ -0,0 +1,22 @@
+---
+# Simple task to update the package/container cadoles-pod-shibboleth-sp only.
+- name: Install hydra-shibboleth package
+  ansible.builtin.apt:
+    name:
+      - cadoles-pod-shibboleth-sp-v3={{ cadoles_pod_shibboleth_sp_v3_package_version }}
+    update_cache: yes
+    state: present
+  become: true
+
+- name: Configure cadoles-pod-shibboleth-sp-v3
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - src: cadoles-pod-shibboleth-sp-v3.conf.j2
+      dest: /etc/cadoles-pod-shibboleth-sp-v3.conf
+      mode: u=rw,g=r
+  notify:
+    - Restart cadoles-pod-shibboleth-sp-v3
+  become: true

tasks/update-hydra.yml

@@ -0,0 +1,31 @@
+---
+# Simple task to update the package/container cadoles-pod-hydra only.
+- name: Install hydra package
+  ansible.builtin.apt:
+    name:
+      - cadoles-pod-hydra-v1={{ cadoles_pod_hydra_v1_package_version }}
+    update_cache: yes
+    state: present
+  become: true
+
+- name: Configure cadoles-pod-hydra-v1
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - src:  cadoles-pod-hydra-v1.conf.j2
+      dest: /etc/cadoles-pod-hydra-v1.conf
+      mode: u=rw,g=r
+  notify:
+    - Restart cadoles-pod-hydra-v1
+  become: true
+
+- name: Create hydra-clients
+  template:
+    src: hydra-client.json.j2
+    dest: "/etc/hydra/clients.d/{{ item.client_id }}.json"
+  with_items: "{{ hydra_clients }}"
+  notify:
+     - Reload hydra clients
+  become: true

templates/cadoles-pod-goweb-oidc-v1.conf.j2

@@ -0,0 +1,14 @@
+# {{ ansible_managed }}
+PODMAN_ARGS="\
+    --name 'cadoles-pod-goweb-oidc-demo-v1' \
+    --replace \
+    -p 80:3002 \
+    -e LOG_LEVEL=0 \
+    -e HTTP_ADDRESS=0.0.0.0:3002 \
+    -e OIDC_CLIENT_ID=mse-demo \
+    -e OIDC_CLIENT_SECRET={{ hydra_clients|selectattr('client_id', 'equalto', 'mse-demo')|map(attribute='client_secret')|first }} \
+    -e OIDC_ISSUER_URL=https://pp.messervices.etudiant.gouv.fr/auth/ \
+    -e OIDC_REDIRECT_URL=https://auth.lescrous.fr/oauth2/callback \
+    -e OIDC_POST_LOGOUT_REDIRECT_URL=https://auth.lescrous.fr \
+    -e OIDC_ACR_VALUES= \
+"

templates/cadoles-pod-hydra-dispatcher-v1.conf.j2

@@ -20,6 +20,7 @@ PODMAN_ARGS="\
     -e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \
     -e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \
     -e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \
+    -e 'DISABLE_APP_AUTO_SELECT={{ hydra_dispatcher_disable_app_auto_select }}' \
     -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \
     {% for item in hydra_dispatcher_mounts %}
     -v {{ item.host }}:{{ item.container }} \

templates/cadoles-pod-hydra-v1.conf.j2

@@ -18,6 +18,11 @@ PODMAN_ARGS="\
     -e 'HYDRA_URL_POST_LOGOUT={{ hydra_url_post_logout }}' \
     -e 'HYDRA_ALLOW_INSECURE=yes' \
     -e 'HYDRA_LEVEL={{ hydra_log_level }}' \
+    -e 'TTL_REFRESH_TOKEN={{ hydra_ttl_refresh_token }}'\
+    {% if hydra_public_cors_allowed_origins | default([]) | length > 0 %}
+    -e 'SERVE_PUBLIC_CORS_ENABLED=true' \
+    -e 'SERVE_PUBLIC_CORS_ALLOWED_ORIGINS={{ hydra_public_cors_allowed_origins | join(',') }}' \
+    {% endif %}
     -e 'HYDRA_SECRETS_SYSTEM={{ lookup('ansible.builtin.password', '/dev/null length=32 seed=hydra_secrets_seed') }}' \
     -e 'HYDRA_OIDC_SUBJECT_IDENTIFIERS_PAIRWISE_SALT={{ lookup('ansible.builtin.password', '/dev/null length=32 seed=hydra_secrets_seed') }}' \
     -v /etc/hydra/clients.d:/etc/hydra/clients.d \

templates/cadoles-pod-shibboleth-sp-v3.conf.j2

@@ -4,7 +4,7 @@ PODMAN_ARGS="\
     --network=slirp4netns:allow_host_loopback=true \
     --replace --name 'cadoles-pod-shibboleth-sp-v3' \
     --tz=local \
-    -e 'SP_ENTITY_ID=http://{{ ansible_fqdn }}{{ haproxy_hydra_saml_base_path }}' \
+    -e 'SP_ENTITY_ID={{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}' \
     -e 'SP_LOG_LEVEL={{ hydra_saml_sp_log_level }}' \
     -e 'IDP_ENTITY_ID={{ hydra_saml_idp_entity_id }}' \
     -e 'IDP_METADATA_URL={{ hydra_saml_idp_metadata_url }}' \
@@ -12,7 +12,7 @@ PODMAN_ARGS="\
     -e 'APACHE_FORCE_HTTPS={{ "true" if haproxy_public_base_url.startswith('https') else "false" }}' \
     -e 'SP_HANDLER_BASE_PATH={{ haproxy_hydra_saml_base_path }}' \
     -e 'SP_SESSIONS_REDIRECT_LIMIT=host+allow' \
-    -e 'SP_SESSIONS_REDIRECT_ALLOW={{ hydra_saml_allowed_redirects | join(',') }}' \
+    -e 'SP_SESSIONS_REDIRECT_ALLOW={{ hydra_saml_allowed_redirects | default([]) | join(' ') }}' \
     -e 'SP_INCLUDE_DEFAULT_ATTRIBUTES_MAPPING={{ hydra_saml_include_sp_default_attributes_mapping }}' \
     -e 'SP_INCLUDE_DEFAULT_ATTRIBUTES_POLICY={{ hydra_saml_include_sp_default_attributes_policy }}' \
     -v '/etc/shibboleth/attribute-map.inc.xml:/etc/shibboleth/attribute-map.inc.xml' \

templates/haproxy.cfg.j2

@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 global
-    log /dev/log	local0
-    log /dev/log	local1 notice
+    log /dev/log	local0 err
+    log /dev/log	local1 err
     chroot /var/lib/haproxy
     stats socket /run/haproxy/admin.sock mode 660 level admin expose-fd listeners
     stats timeout 30s
@@ -39,8 +39,9 @@ frontend http-in
     mode http
     
     maxconn 2000
-
+{% if enable_hydra_dispatcher %}
     acl login_dispatcher path_beg -i {{ haproxy_hydra_dispatcher_base_path }}
+{% endif %}
 {% if enable_hydra_passwordless %}
     acl login_passwordless path_beg -i {{ haproxy_hydra_passwordless_base_path }}
 {% endif %}
@@ -57,7 +58,9 @@ frontend http-in
     acl oidc_test path_beg -i {{ haproxy_oidc_test_base_path }}
 {% endif %}
 
+{% if enable_hydra_dispatcher %}
     use_backend hydra_dispatcher if login_dispatcher
+{% endif %}
 {% if enable_hydra_passwordless %}
     use_backend hydra_passwordless if login_passwordless
 {% endif %}
@@ -86,6 +89,7 @@ backend hydra
     http-request set-path %[path,regsub(^{{ haproxy_hydra_base_path }},)]
     server hydra 127.0.0.1:4444 check
 
+{% if enable_hydra_dispatcher %}
 # Backend Hydra Dispatcher
 backend hydra_dispatcher
     balance roundrobin
@@ -94,6 +98,7 @@ backend hydra_dispatcher
     http-request set-header X-Forwarded-Prefix {{ haproxy_hydra_dispatcher_base_path }}
 
     server hydra-login-dispatcher 127.0.0.1:3000 check
+{%- endif %}
 
 {% if enable_hydra_passwordless %}
 # Backend Hydra Passwordless
@@ -141,4 +146,4 @@ backend oidc_test
     http-request set-header X-Forwarded-Prefix {{ haproxy_oidc_test_base_path }}
 
     server oidc-test 127.0.0.1:8080 check
-{% endif %}
+{% endif %}

templates/hydra-client.json.j2

@@ -9,6 +9,6 @@
 	"redirect_uris": {{ item.redirect_uris | default([]) | to_json }},
 	"response_types": {{ item.response_types | default(["code"]) | to_json }},
 	"logo_uri": {{ item.logo_uri | default("") | to_json }},
-	"scope": {{ item.scope | default("openid profile email roles") | to_json }},
+	"scope": {{ item.scope | default("openid profile email webhook") | to_json }},
 	"token_endpoint_auth_method": {{ item.token_endpoint_auth_method | default("client_secret_post") | to_json }}
-}
+}

templates/hydra-dispatcher-apps.yml.j2

@@ -4,60 +4,72 @@ hydra:
 {% if enable_hydra_passwordless %}
     - id: {{ hydra_passwordless_identity_provider_id | default("passwordless") }}
       title:
-        fr: "{{ hydra_passwordless_app_title }}"
+        fr: "{{ hydra_passwordless_app_title.fr }}"
+        en: "{{ hydra_passwordless_app_title.en | default(hydra_passwordless_app_title.fr)  }}"
       description:
-        fr: "{{ hydra_passwordless_app_description }}"
+        fr: "{{ hydra_passwordless_app_description.fr }}"
+        en: "{{ hydra_passwordless_app_description.en | default(hydra_passwordless_app_description.fr)  }}"
       login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/login"
       consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/consent"
       logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_passwordless_base_path }}/logout"
-      attributes_rewrite_rules: {{ hydra_passwordless_attributes_rewrite_rules | to_json }}
+      attributes_rewrite_configuration: {{ hydra_passwordless_attributes_rewrite_configuration | default({}) | to_json }}
       icon_url: "{{ hydra_passwordless_app_icon_url }}"
 {% endif %}
 {% if enable_hydra_saml %}
     - id: {{ hydra_saml_identity_provider_id | default("saml") }}
       title:
         fr: "{{ hydra_saml_app_title.fr }}"
-        en: "{{ hydra_saml_app_title.en | default("{{ hydra_saml_app_title.fr }}")  }}"
+        en: "{{ hydra_saml_app_title.en | default(hydra_saml_app_title.fr)  }}"
       description:
         fr: "{{ hydra_saml_app_description.fr }}"
-        en: "{{ hydra_saml_app_description.en | default("{{ hydra_saml_app_description.fr }}")  }}"
+        en: "{{ hydra_saml_app_description.en | default(hydra_saml_app_description.fr)  }}"
       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"
-      attributes_rewrite_rules: {{ hydra_saml_attributes_rewrite_rules | to_json }}
+      attributes_rewrite_configuration: {{ hydra_saml_attributes_rewrite_configuration  | default({}) | to_json }}
       icon_url: "{{ hydra_saml_app_icon_url }}"
       options:
         icon_url:
           fr: "{{ hydra_saml_app_options.icon_url.fr }}"
-          en: "{{ hydra_saml_app_options.icon_url.en | default("{{ hydra_saml_app_options.icon_url.fr }}") }}"
+          en: "{{ hydra_saml_app_options.icon_url.en | default( hydra_saml_app_options.icon_url.fr) }}"
 {% endif %}
 {% if enable_hydra_oidc %}
     - id: {{ hydra_oidc_identity_provider_id | default("oidc") }}
       title:
         fr: "{{ hydra_oidc_app_title.fr }}"
-        en: "{{ hydra_oidc_app_title.en | default("{{ hydra_oidc_app_title.fr }}")  }}"
+        en: "{{ hydra_oidc_app_title.en | default(hydra_oidc_app_title.fr)  }}"
       description:
         fr: "{{ hydra_oidc_app_description.fr }}"
-        en: "{{ hydra_oidc_app_description.en | default("{{ hydra_oidc_app_description.fr }}")  }}"
+        en: "{{ hydra_oidc_app_description.en | default(hydra_oidc_app_description.fr)  }}"
       login_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/login"
       consent_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent"
       logout_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout"
-      attributes_rewrite_rules: {{ hydra_oidc_attributes_rewrite_rules | to_json }}
+      attributes_rewrite_configuration: {{ hydra_oidc_attributes_rewrite_configuration  | default({}) | to_json }}
       icon_url: "{{ hydra_oidc_app_icon_url }}"
       options:
         icon_url:
           fr: "{{ hydra_oidc_app_options.icon_url.fr }}"
-          en: "{{ hydra_oidc_app_options.icon_url.en | default("{{ hydra_oidc_app_options.icon_url.fr }}") }}"
+          en: "{{ hydra_oidc_app_options.icon_url.en | default(hydra_oidc_app_options.icon_url.fr) }}"
 {% endif %}
 {% if enable_hydra_ldap %}
     - id: ldap
       title:
-        fr: "{{ hydra_ldap_app_title }}"
+        fr: "{{ hydra_ldap_app_title.fr }}"
+        en: "{{ hydra_ldap_app_title.en | default(hydra_ldap_app_title.fr)  }}"
       description:
-        fr: "{{ hydra_ldap_app_description }}"
+        fr: "{{ hydra_ldap_app_description.fr }}"
+        en: "{{ hydra_ldap_app_description.en | default(hydra_ldap_app_description.fr)  }}"
       login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/login"
       consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/consent"
       logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_ldap_base_path }}/auth/logout"
-      attributes_rewrite_rules: {{ hydra_ldap_attributes_rewrite_rules | to_json }}
+      attributes_rewrite_configuration: {{ hydra_ldap_attributes_rewrite_configuration  | default({}) | to_json }}
       icon_url: "{{ hydra_ldap_app_icon_url }}"
 {% endif %}
+  webhook:
+    enabled: {{ hydra_dispatcher_webhook }}
+    api_url: {{ hydra_dispatcher_webhook_api_url }}
+    api_key: {{ hydra_dispatcher_webhook_api_key }}
+    api_method: POST
+  firewall:
+    additional_properties: true
+    rules: {{ hydra_dispatcher_webhook_rules | to_json }}