DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases 1 Wiki Activity

fix(authelia): fix configmap (#9724)

Browse Source 
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->

- Changed formatting of `default "something" $value` to `$value |
default "something"` as it reads better
- Changed `not eq` to `ne`
- Changed `if eq 0 len $list` to `if not $list`
- Removed all `toYaml` functions, as it messes with the configmap
formatting. (When a single `toYaml` is used, all configmap content is
converted in a single line with `\n`s)

⚒️ Fixes  #9678
⚒️ Fixes #8861

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 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?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [x] ⚖️ My code follows the style guidelines of this project
- [x] 👀 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
- [x] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ 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._
This commit is contained in:
Stavros Kois
2023-06-17 13:44:00 +02:00
committed by GitHub
parent dbdd91a9a4
commit 0f0ae60ccb
2 changed files with 175 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/enterprise/authelia/Chart.yaml
+1 -1
View File
@@ -35,7 +35,7 @@ sources:
- https://github.com/authelia/chartrepo - https://github.com/authelia/chartrepo
- https://github.com/authelia/authelia - https://github.com/authelia/authelia
type: application type: application
version: 15.1.28 version: 15.1.29
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- security - security
charts/enterprise/authelia/templates/_configmap.tpl
+174 -79
View File
@@ -32,41 +32,41 @@ enabled: true
data: data:
configuration.yaml: | configuration.yaml: |
--- ---
theme: {{ default "light" .Values.theme }} theme: {{ .Values.theme | default "light" }}
default_redirection_url: {{ default (printf "https://www.%s" .Values.domain) .Values.default_redirection_url }} default_redirection_url: {{ default (printf "https://www.%s" .Values.domain) .Values.default_redirection_url }}
ntp: ntp:
address: {{ default "time.cloudflare.com:123" .Values.ntp.address }} address: {{ .Values.ntp.address | default "time.cloudflare.com:123" }}
version: {{ default 4 .Values.ntp.version }} version: {{ .Values.ntp.version | default 4 }}
max_desync: {{ default "3s" .Values.ntp.max_desync }} max_desync: {{ .Values.ntp.max_desync | default "3s" }}
disable_startup_check: {{ default false .Values.ntp.disable_startup_check }} disable_startup_check: {{ .Values.ntp.disable_startup_check | default false }}
disable_failure: {{ default true .Values.ntp.disable_failure }} disable_failure: {{ .Values.ntp.disable_failure | default true }}
server: server:
host: 0.0.0.0 host: 0.0.0.0
port: {{ default 9091 .Values.server.port }} port: {{ .Values.server.port | default 9091 }}
{{- if not (eq "" (default "" .Values.server.path)) }} {{- if ne "" (.Values.server.path | default "") }}
path: {{ .Values.server.path }} path: {{ .Values.server.path }}
{{- end }} {{- end }}
buffers: buffers:
write: {{ default 4096 .Values.server.write_buffer_size }} write: {{ .Values.server.write_buffer_size | default 4096 }}
read: {{ default 4096 .Values.server.read_buffer_size }} read: {{ .Values.server.read_buffer_size | default 4096 }}
enable_pprof: {{ default false .Values.server.enable_pprof }} enable_pprof: {{ .Values.server.enable_pprof | default false }}
enable_expvars: {{ default false .Values.server.enable_expvars }} enable_expvars: {{ .Values.server.enable_expvars | default false }}
log: log:
level: {{ default "info" .Values.log.level }} level: {{ .Values.log.level | default "info" }}
format: {{ default "text" .Values.log.format }} format: {{ .Values.log.format | default "text" }}
{{- if not (eq "" (default "" .Values.log.file_path)) }} {{- if ne "" (.Values.log.file_path | default "") }}
file_path: {{ .Values.log.file_path }} file_path: {{ .Values.log.file_path }}
keep_stdout: true keep_stdout: true
{{- end }} {{- end }}
totp: totp:
issuer: {{ default .Values.domain .Values.totp.issuer }} issuer: {{ .Values.totp.issuer | default .Values.domain }}
period: {{ default 30 .Values.totp.period }} period: {{ .Values.totp.period | default 30 }}
skew: {{ default 1 .Values.totp.skew }} skew: {{ .Values.totp.skew | default 1 }}
{{- if .Values.duo_api.enabled }} {{- if .Values.duo_api.enabled }}
duo_api: duo_api:
hostname: {{ .Values.duo_api.hostname }} hostname: {{ .Values.duo_api.hostname }}
integration_key: {{ .Values.duo_api.integration_key }} integration_key: {{ .Values.duo_api.integration_key }}
{{- end }} {{- end -}}
{{- with $auth := .Values.authentication_backend }} {{- with $auth := .Values.authentication_backend }}
authentication_backend: authentication_backend:
password_reset: password_reset:
@@ -74,95 +74,121 @@ data:
{{- if $auth.file.enabled }} {{- if $auth.file.enabled }}
file: file:
path: {{ $auth.file.path }} path: {{ $auth.file.path }}
password: {{ toYaml $auth.file.password | nindent 10 }} password:
{{- end }} {{- $p := $auth.file.password -}}
{{- if $p.algorithm }}
algorithm: {{ $p.algorithm }}
{{- end -}}
{{- if $p.iterations }}
iterations: {{ $p.iterations }}
{{- end -}}
{{- if $p.key_length }}
key_length: {{ $p.key_length }}
{{- end -}}
{{- if $p.salt_length }}
salt_length: {{ $p.salt_length }}
{{- end -}}
{{- if $p.memory }}
memory: {{ $p.memory }}
{{- end -}}
{{- if $p.parallelism }}
parallelism: {{ $p.parallelism }}
{{- end -}}
{{- end -}}
{{- if $auth.ldap.enabled }} {{- if $auth.ldap.enabled }}
ldap: ldap:
implementation: {{ default "custom" $auth.ldap.implementation }} implementation: {{ $auth.ldap.implementation | default "custom" }}
url: {{ $auth.ldap.url }} url: {{ $auth.ldap.url }}
timeout: {{ default "5s" $auth.ldap.timeout }} timeout: {{ $auth.ldap.timeout | default "5s" }}
start_tls: {{ $auth.ldap.start_tls }} start_tls: {{ $auth.ldap.start_tls }}
tls: tls:
{{- if hasKey $auth.ldap.tls "server_name" }} {{- if hasKey $auth.ldap.tls "server_name" }}
server_name: {{ default $auth.ldap.host $auth.ldap.tls.server_name }} server_name: {{ $auth.ldap.tls.server_name | default $auth.ldap.host }}
{{- end }} {{- end }}
minimum_version: {{ default "TLS1.2" $auth.ldap.tls.minimum_version }} minimum_version: {{ $auth.ldap.tls.minimum_version | default "TLS1.2" }}
skip_verify: {{ default false $auth.ldap.tls.skip_verify }} skip_verify: {{ $auth.ldap.tls.skip_verify | default false }}
{{- if $auth.ldap.base_dn }} {{- if $auth.ldap.base_dn }}
base_dn: {{ $auth.ldap.base_dn }} base_dn: {{ $auth.ldap.base_dn }}
{{- end }} {{- end -}}
{{- if $auth.ldap.username_attribute }} {{- if $auth.ldap.username_attribute }}
username_attribute: {{ $auth.ldap.username_attribute }} username_attribute: {{ $auth.ldap.username_attribute }}
{{- end }} {{- end -}}
{{- if $auth.ldap.additional_users_dn }} {{- if $auth.ldap.additional_users_dn }}
additional_users_dn: {{ $auth.ldap.additional_users_dn }} additional_users_dn: {{ $auth.ldap.additional_users_dn }}
{{- end }} {{- end -}}
{{- if $auth.ldap.users_filter }} {{- if $auth.ldap.users_filter }}
users_filter: {{ $auth.ldap.users_filter }} users_filter: {{ $auth.ldap.users_filter }}
{{- end }} {{- end -}}
{{- if $auth.ldap.additional_groups_dn }} {{- if $auth.ldap.additional_groups_dn }}
additional_groups_dn: {{ $auth.ldap.additional_groups_dn }} additional_groups_dn: {{ $auth.ldap.additional_groups_dn }}
{{- end }} {{- end -}}
{{- if $auth.ldap.groups_filter }} {{- if $auth.ldap.groups_filter }}
groups_filter: {{ $auth.ldap.groups_filter }} groups_filter: {{ $auth.ldap.groups_filter }}
{{- end }} {{- end -}}
{{- if $auth.ldap.group_name_attribute }} {{- if $auth.ldap.group_name_attribute }}
group_name_attribute: {{ $auth.ldap.group_name_attribute }} group_name_attribute: {{ $auth.ldap.group_name_attribute }}
{{- end }} {{- end -}}
{{- if $auth.ldap.mail_attribute }} {{- if $auth.ldap.mail_attribute }}
mail_attribute: {{ $auth.ldap.mail_attribute }} mail_attribute: {{ $auth.ldap.mail_attribute }}
{{- end }} {{- end -}}
{{- if $auth.ldap.display_name_attribute }} {{- if $auth.ldap.display_name_attribute }}
display_name_attribute: {{ $auth.ldap.display_name_attribute }} display_name_attribute: {{ $auth.ldap.display_name_attribute }}
{{- end }} {{- end }}
user: {{ $auth.ldap.user }} user: {{ $auth.ldap.user }}
{{- end }} {{- end -}}
{{- end }} {{- end -}}
{{- with $session := .Values.session }} {{- with $session := .Values.session }}
session: session:
name: {{ default "authelia_session" $session.name }} name: {{ $session.name | default "authelia_session" }}
domain: {{ required "A valid .Values.domain entry required!" $.Values.domain }} domain: {{ required "A valid .Values.domain entry required!" $.Values.domain }}
same_site: {{ default "lax" $session.same_site }} same_site: {{ $session.same_site | default "lax" }}
expiration: {{ default "1M" $session.expiration }} expiration: {{ $session.expiration | default "1M" }}
inactivity: {{ default "5m" $session.inactivity }} inactivity: {{ $session.inactivity | default "5m" }}
remember_me_duration: {{ default "1M" $session.remember_me_duration }} remember_me_duration: {{ $session.remember_me_duration | default "1M" }}
{{- end }} {{- end }}
redis: redis:
host: {{ .Values.redis.creds.plain }} host: {{ .Values.redis.creds.plain }}
{{- with $redis := .Values.redisProvider }} {{- with $redis := .Values.redisProvider }}
port: {{ default 6379 $redis.port }} port: {{ $redis.port | default 6379 }}
{{- if not (eq $redis.username "") }} {{- if not (eq $redis.username "") }}
username: {{ $redis.username }} username: {{ $redis.username }}
{{- end }} {{- end }}
maximum_active_connections: {{ default 8 $redis.maximum_active_connections }} maximum_active_connections: {{ $redis.maximum_active_connections | default 8 }}
minimum_idle_connections: {{ default 0 $redis.minimum_idle_connections }} minimum_idle_connections: {{ $redis.minimum_idle_connections | default 0 }}
{{- if $redis.tls.enabled }} {{- if $redis.tls.enabled }}
tls: tls:
server_name: {{ $redis.tls.server_name }} server_name: {{ $redis.tls.server_name }}
minimum_version: {{ default "TLS1.2" $redis.tls.minimum_version }} minimum_version: {{ $redis.tls.minimum_version | default "TLS1.2" }}
skip_verify: {{ $redis.tls.skip_verify }} skip_verify: {{ $redis.tls.skip_verify }}
{{- end }} {{- end }}
{{- if $redis.high_availability.enabled }} {{- if $redis.high_availability.enabled }}
high_availability: high_availability:
sentinel_name: {{ $redis.high_availability.sentinel_name }} sentinel_name: {{ $redis.high_availability.sentinel_name }}
{{- if $redis.high_availability.nodes }} {{- if $redis.high_availability.nodes }}
nodes: {{ toYaml $redis.high_availability.nodes | nindent 10 }} nodes:
{{- range $node := $redis.high_availability.nodes }}
- host: {{ $node.host }}
port: {{ $node.port | default 26379 }}
{{- end -}}
{{- end }} {{- end }}
route_by_latency: {{ $redis.high_availability.route_by_latency }} route_by_latency: {{ $redis.high_availability.route_by_latency }}
route_randomly: {{ $redis.high_availability.route_randomly }} route_randomly: {{ $redis.high_availability.route_randomly }}
{{- end }} {{- end }}
{{- end }} {{- end }}
regulation: {{ toYaml .Values.regulation | nindent 6 }} regulation:
max_retries: {{ .Values.regulation.max_retries | default 3 }}
find_time: {{ .Values.regulation.find_time | default "1m" }}
ban_time: {{ .Values.regulation.ban_time | default "5m" }}
storage: storage:
postgres: postgres:
host: {{ $.Values.cnpg.main.creds.host }} host: {{ $.Values.cnpg.main.creds.host }}
{{- with $storage := .Values.storage }} {{- with $storage := .Values.storage }}
port: {{ default 5432 $storage.postgres.port }} port: {{ $storage.postgres.port | default 5432 }}
database: {{ default "authelia" $storage.postgres.database }} database: {{ $storage.postgres.database | default "authelia" }}
username: {{ default "authelia" $storage.postgres.username }} username: {{ $storage.postgres.username | default "authelia" }}
timeout: {{ default "5s" $storage.postgres.timeout }} timeout: {{ $storage.postgres.timeout | default "5s" }}
ssl: ssl:
mode: {{ default "disable" $storage.postgres.sslmode }} mode: {{ $storage.postgres.sslmode | default "disable" }}
{{- end }} {{- end }}
{{- with $notifier := .Values.notifier }} {{- with $notifier := .Values.notifier }}
notifier: notifier:
@@ -174,8 +200,8 @@ data:
{{- if $notifier.smtp.enabled }} {{- if $notifier.smtp.enabled }}
smtp: smtp:
host: {{ $notifier.smtp.host }} host: {{ $notifier.smtp.host }}
port: {{ default 25 $notifier.smtp.port }} port: {{ $notifier.smtp.port | default 25 }}
timeout: {{ default "5s" $notifier.smtp.timeout }} timeout: {{ $notifier.smtp.timeout | default "5s" }}
{{- with $notifier.smtp.username }} {{- with $notifier.smtp.username }}
username: {{ . }} username: {{ . }}
{{- end }} {{- end }}
@@ -186,50 +212,65 @@ data:
disable_require_tls: {{ $notifier.smtp.disable_require_tls }} disable_require_tls: {{ $notifier.smtp.disable_require_tls }}
disable_html_emails: {{ $notifier.smtp.disable_html_emails }} disable_html_emails: {{ $notifier.smtp.disable_html_emails }}
tls: tls:
server_name: {{ default $notifier.smtp.host $notifier.smtp.tls.server_name }} server_name: {{ $notifier.smtp.tls.server_name | default $notifier.smtp.host }}
minimum_version: {{ default "TLS1.2" $notifier.smtp.tls.minimum_version }} minimum_version: {{ $notifier.smtp.tls.minimum_version | default "TLS1.2" }}
skip_verify: {{ default false $notifier.smtp.tls.skip_verify }} skip_verify: {{ $notifier.smtp.tls.skip_verify | default false }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.identity_providers.oidc.enabled }} {{- if .Values.identity_providers.oidc.enabled }}
identity_providers: identity_providers:
oidc: oidc:
access_token_lifespan: {{ default "1h" .Values.identity_providers.oidc.access_token_lifespan }} access_token_lifespan: {{ .Values.identity_providers.oidc.access_token_lifespan | default "1h" }}
authorize_code_lifespan: {{ default "1m" .Values.identity_providers.oidc.authorize_code_lifespan }} authorize_code_lifespan: {{ .Values.identity_providers.oidc.authorize_code_lifespan | default "1m" }}
id_token_lifespan: {{ default "1h" .Values.identity_providers.oidc.id_token_lifespan }} id_token_lifespan: {{ .Values.identity_providers.oidc.id_token_lifespan | default "1h" }}
refresh_token_lifespan: {{ default "90m" .Values.identity_providers.oidc.refresh_token_lifespan }} refresh_token_lifespan: {{ .Values.identity_providers.oidc.refresh_token_lifespan | default "90m" }}
enable_client_debug_messages: {{ default false .Values.identity_providers.oidc.enable_client_debug_messages }} enable_client_debug_messages: {{ .Values.identity_providers.oidc.enable_client_debug_messages | default false }}
minimum_parameter_entropy: {{ default 8 .Values.identity_providers.oidc.minimum_parameter_entropy }} minimum_parameter_entropy: {{ .Values.identity_providers.oidc.minimum_parameter_entropy | default 8 }}
{{- if gt (len .Values.identity_providers.oidc.clients) 0 }} {{- if .Values.identity_providers.oidc.clients }}
clients: clients:
{{- range $client := .Values.identity_providers.oidc.clients }} {{- range $client := .Values.identity_providers.oidc.clients }}
- id: {{ $client.id }} - id: {{ $client.id }}
description: {{ default $client.id $client.description }} description: {{ $client.description | default $client.id }}
secret: {{ default (randAlphaNum 128) $client.secret }} secret: {{ $client.secret | default (randAlphaNum 128) }}
{{- if $client.public }} {{- if $client.public }}
public: {{ $client.public }} public: {{ $client.public }}
{{- end }} {{- end }}
authorization_policy: {{ default "two_factor" $client.authorization_policy }} authorization_policy: {{ $client.authorization_policy | default "two_factor" }}
consent_mode: {{ default "auto" $client.consent_mode}} consent_mode: {{ $client.consent_mode | default "auto" }}
redirect_uris: redirect_uris:
{{- range $client.redirect_uris }} {{- range $client.redirect_uris }}
- {{ . }} - {{ . }}
{{- end }} {{- end }}
{{- if $client.audience }} {{- if $client.audience }}
audience: {{ toYaml $client.audience | nindent 10 }} audience:
{{- range $client.audience }}
- {{ . }}
{{- end }}
{{- end }}
scopes:
{{- range ($client.scopes | default (list "openid" "profile" "email" "groups")) }}
- {{ . }}
{{- end }}
grant_types:
{{- range ($client.grant_types | default (list "refresh_token" "authorization_code")) }}
- {{ . }}
{{- end }}
response_types:
{{- range ($client.response_types | default (list "code")) }}
- {{ . }}
{{- end }} {{- end }}
scopes: {{ toYaml (default (list "openid" "profile" "email" "groups") $client.scopes) | nindent 10 }}
grant_types: {{ toYaml (default (list "refresh_token" "authorization_code") $client.grant_types) | nindent 10 }}
response_types: {{ toYaml (default (list "code") $client.response_types) | nindent 10 }}
{{- if $client.response_modes }} {{- if $client.response_modes }}
response_modes: {{ toYaml $client.response_modes | nindent 10 }} response_modes:
{{- range $client.response_modes }}
- {{ . }}
{{- end }} {{- end }}
userinfo_signing_algorithm: {{ default "none" $client.userinfo_signing_algorithm }} {{- end }}
userinfo_signing_algorithm: {{ $client.userinfo_signing_algorithm | default "none" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
access_control: access_control:
{{- if (eq (len .Values.access_control.rules) 0) }} {{- if not .Values.access_control.rules }}
{{- if (eq .Values.access_control.default_policy "bypass") }} {{- if (eq .Values.access_control.default_policy "bypass") }}
default_policy: one_factor default_policy: one_factor
{{- else if (eq .Values.access_control.default_policy "deny") }} {{- else if (eq .Values.access_control.default_policy "deny") }}
@@ -240,15 +281,69 @@ data:
{{- else }} {{- else }}
default_policy: {{ .Values.access_control.default_policy }} default_policy: {{ .Values.access_control.default_policy }}
{{- end }} {{- end }}
{{- if (eq (len .Values.access_control.networks) 0) }}
{{- if not .Values.access_control.networks }}
networks: [] networks: []
{{- else }} {{- else }}
networks: {{ toYaml .Values.access_control.networks | nindent 6 }} networks:
{{- range $net := .Values.access_control.networks }}
- name: {{ $net.name }}
networks:
{{- range $net.networks }}
- {{ . | squote }}
{{- end }}
{{- end }} {{- end }}
{{- if (eq (len .Values.access_control.rules) 0) }} {{- end }}
{{- if not .Values.access_control.rules }}
rules: [] rules: []
{{- else }} {{- else }}
rules: {{ toYaml .Values.access_control.rules | nindent 6 }} rules:
{{- range $rule := .Values.access_control.rules }}
{{- if $rule.domain }}
- domain:
{{- if kindIs "string" $rule.domain }}
- {{ $rule.domain | squote }}
{{- else -}}
{{- range $rule.domain }}
- {{ . | squote }}
{{- end }}
{{- end }}
{{- end -}}
{{- with $rule.policy }}
policy: {{ . }}
{{- end -}}
{{- if $rule.networks }}
networks:
{{- if kindIs "string" $rule.networks }}
- {{ $rule.networks | squote }}
{{- else -}}
{{- range $rule.networks }}
- {{ . | squote }}
{{- end }}
{{- end }}
{{- end }}
{{- if $rule.subject }}
subject:
{{- if kindIs "string" $rule.subject }}
- {{ $rule.subject | squote }}
{{- else -}}
{{- range $rule.subject }}
- {{ . | squote }}
{{- end }}
{{- end }}
{{- end }}
{{- if $rule.resources }}
resources:
{{- if kindIs "string" $rule.resources }}
- {{ $rule.resources | squote }}
{{- else -}}
{{- range $rule.resources }}
- {{ . | squote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }} {{- end }}
... ...
{{- end -}} {{- end -}}