From f70212694c8383ad04bd154c1e931791969d51c9 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Mon, 15 Apr 2024 07:49:36 +0300 Subject: [PATCH] fix(authelia): token_endpoint_auth_method is a string (#20790) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # https://www.authelia.com/configuration/identity-providers/openid-connect/clients/#token_endpoint_auth_method **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning - [ ] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/premium/authelia/Chart.yaml | 2 +- charts/premium/authelia/questions.yaml | 22 +++++++++++-------- .../premium/authelia/templates/_configmap.tpl | 7 ++---- charts/premium/authelia/values.yaml | 4 +--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/charts/premium/authelia/Chart.yaml b/charts/premium/authelia/Chart.yaml index b0b2465b89b..75bf802c0a6 100644 --- a/charts/premium/authelia/Chart.yaml +++ b/charts/premium/authelia/Chart.yaml @@ -51,4 +51,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/premium/authelia - https://ghcr.io/authelia/authelia type: application -version: 23.13.0 +version: 23.13.1 diff --git a/charts/premium/authelia/questions.yaml b/charts/premium/authelia/questions.yaml index e887aa38086..877e920006e 100644 --- a/charts/premium/authelia/questions.yaml +++ b/charts/premium/authelia/questions.yaml @@ -1146,15 +1146,19 @@ questions: description: "The supported client authentication methods this client supports." label: "token_endpoint_auth_method" schema: - type: list - default: [] - items: - - variable: methodEntry - label: "Method" - schema: - type: string - default: "client_secret_basic" - required: true + type: string + default: "" + enum: + - value: "client_secret_basic" + description: "client_secret_basic" + - value: "client_secret_post" + description: "client_secret_post" + - value: "client_secret_jwt" + description: "client_secret_jwt" + - value: "private_key_jwt" + description: "private_key_jwt" + - value: "none" + description: "none" - variable: require_pkce label: "Require PKCE" description: "This configuration option enforces the use of PKCE for this registered client." diff --git a/charts/premium/authelia/templates/_configmap.tpl b/charts/premium/authelia/templates/_configmap.tpl index f12bec74c61..6c2c0c99e25 100644 --- a/charts/premium/authelia/templates/_configmap.tpl +++ b/charts/premium/authelia/templates/_configmap.tpl @@ -279,11 +279,8 @@ data: - {{ . }} {{- end }} {{- end }} - {{- if $client.token_endpoint_auth_method }} - token_endpoint_auth_method: - {{- range $client.token_endpoint_auth_method }} - - {{ . }} - {{- end }} + {{- with $client.token_endpoint_auth_method }} + token_endpoint_auth_method: {{ . }} {{- end }} userinfo_signing_algorithm: {{ $client.userinfo_signing_algorithm | default "none" }} {{- if $client.require_pkce }} diff --git a/charts/premium/authelia/values.yaml b/charts/premium/authelia/values.yaml index f5f28cbd0c7..143eb55a091 100644 --- a/charts/premium/authelia/values.yaml +++ b/charts/premium/authelia/values.yaml @@ -572,9 +572,7 @@ identity_providers: ## Client Authentication Method configures which client authentication methods this client supports. ## It's not recommended to configure this unless you know what you're doing. -# token_endpoint_auth_method: -# - client_secret_basic -# - client_secret_post +# token_endpoint_auth_method: client_secret_basic ## The algorithm used to sign userinfo endpoint responses for this client, either none or RS256. # userinfo_signing_algorithm: none