feat(guacamole-client); Add saml auth for upcoming image update (#1887)

This commit is contained in:
Stavros Kois 2022-02-13 12:50:45 +02:00 committed by GitHub
parent 4f2d725dbb
commit 9185f3de53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 111 additions and 10 deletions

View File

@ -25,7 +25,7 @@ sources:
- https://hub.docker.com/r/guacamole/guacamole
- http://guacamole.incubator.apache.org/doc/gug/introduction.html
type: application
version: 1.0.11
version: 1.0.12
annotations:
truecharts.org/catagories: |
- utilities

View File

@ -662,6 +662,65 @@ questions:
schema:
type: string
default: ""
- variable: saml
group: "App Configuration"
label: "SAML Configuration"
schema:
additional_attrs: true
type: dict
attrs:
- variable: saml_enabled
label: "Enable SAML"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: SAML_IDP_METADATA_URL
label: "SAML IDP Metadata URL"
schema:
type: string
default: ""
- variable: SAML_IDP_URL
label: "SAML IDP URL"
schema:
type: string
default: ""
- variable: SAML_ENTITY_ID
label: "SAML Entity ID"
schema:
type: string
default: ""
- variable: SAML_CALLBACK_URL
label: "SAML Callback URL"
schema:
type: string
default: ""
- variable: SAML_STRICT
label: "SAML Strict"
schema:
type: boolean
default: true
- variable: SAML_DEBUG
label: "SAML Debug"
schema:
type: boolean
default: false
- variable: SAML_COMPRESS_REQUEST
label: "SAML Compress Request"
schema:
type: boolean
default: true
- variable: SAML_COMPRESS_RESPONSE
label: "SAML Compress Response"
schema:
type: boolean
default: true
- variable: SAML_GROUP_ATTRIBUTE
label: "SAML Group Attribute (Leave empty for default)"
schema:
type: string
default: ""
- variable: service
group: "Networking and Services"

View File

@ -6,11 +6,11 @@ kind: ConfigMap
metadata:
name: guacamole-client-env
data:
{{/* GENERAL */}}
{{/* GENERAL */}}
{{- if .Values.general.EXTENSION_PRIORITY }}
EXTENSION_PRIORITY: {{ .Values.general.EXTENSION_PRIORITY | quote }}
{{- end }}
{{/* API */}}
{{/* API */}}
{{- if .Values.api.API_SESSION_TIMEOUT }}
API_SESSION_TIMEOUT: {{ .Values.api.API_SESSION_TIMEOUT | quote }}
{{- end }}
@ -30,28 +30,28 @@ data:
TOTP_MODE: {{ .Values.totp.TOTP_MODE | quote }}
{{- end }}
{{- end }}
{{/* HEADER */}}
{{/* HEADER */}}
{{- if eq .Values.header.HEADER_ENABLED true }}
HEADER_ENABLED: {{ .Values.header.HEADER_ENABLED | quote }}
{{- if .Values.header.HTTP_AUTH_HEADER }}
HTTP_AUTH_HEADER: {{ .Values.header.HTTP_AUTH_HEADER | quote }}
{{- end }}
{{- end }}
{{/* JSON */}}
{{/* JSON */}}
{{- if .Values.json.JSON_SECRET_KEY }}
JSON_SECRET_KEY: {{ .Values.json.JSON_SECRET_KEY | quote }}
{{- if .Values.json.JSON_TRUSTED_NETWORKS }}
JSON_TRUSTED_NETWORKS: {{ .Values.json.JSON_TRUSTED_NETWORKS | quote }}
{{- end }}
{{- end }}
{{/* DUO */}}
{{/* DUO */}}
{{- if and .Values.duo.DUO_API_HOSTNAME .Values.duo.DUO_INTEGRATION_KEY .Values.duo.DUO_SECRET_KEY .Values.duo.DUO_APPLICATION_KEY }}
DUO_API_HOSTNAME: {{ .Values.duo.DUO_API_HOSTNAME | quote }}
DUO_INTEGRATION_KEY: {{ .Values.duo.DUO_INTEGRATION_KEY | quote }}
DUO_SECRET_KEY: {{ .Values.duo.DUO_SECRET_KEY | quote }}
DUO_APPLICATION_KEY: {{ .Values.duo.DUO_APPLICATION_KEY | quote }}
{{- end }}
{{/* CAS */}}
{{/* CAS */}}
{{- if and .Values.cas.CAS_AUTHORIZATION_ENDPOINT .Values.cas.CAS_REDIRECT_URI }}
CAS_AUTHORIZATION_ENDPOINT: {{ .Values.cas.CAS_AUTHORIZATION_ENDPOINT | quote }}
CAS_REDIRECT_URI: {{ .Values.cas.CAS_REDIRECT_URI | quote }}
@ -73,7 +73,7 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{/* OpenID */}}
{{/* OpenID */}}
{{- if and .Values.openid.OPENID_AUTHORIZATION_ENDPOINT .Values.openid.OPENID_JWKS_ENDPOINT .Values.openid.OPENID_ISSUER .Values.openid.OPENID_CLIENT_ID .Values.openid.OPENID_REDIRECT_URI }}
OPENID_AUTHORIZATION_ENDPOINT: {{ .Values.openid.OPENID_AUTHORIZATION_ENDPOINT | quote }}
OPENID_JWKS_ENDPOINT: {{ .Values.openid.OPENID_JWKS_ENDPOINT | quote }}
@ -90,7 +90,7 @@ data:
OPENID_MAX_TOKEN_VALIDITY: {{ .Values.openid.OPENID_MAX_TOKEN_VALIDITY | quote }}
{{- end }}
{{- end }}
{{/* RADIUS */}}
{{/* RADIUS */}}
{{- if and .Values.radius.RADIUS_SHARED_SECRET .Values.radius.RADIUS_AUTH_PROTOCOL }}
RADIUS_SHARED_SECRET: {{ .Values.radius.RADIUS_SHARED_SECRET | quote }}
RADIUS_AUTH_PROTOCOL: {{ .Values.radius.RADIUS_AUTH_PROTOCOL | quote }}
@ -131,7 +131,7 @@ data:
RADIUS_EAP_TTLS_INNER_PROTOCOL: {{ .Values.radius.RADIUS_EAP_TTLS_INNER_PROTOCOL | quote }}
{{- end }}
{{- end }}
{{/* LDAP */}}
{{/* LDAP */}}
{{- if and .Values.ldap.LDAP_HOSTNAME .Values.ldap.LDAP_USER_BASE_DN }}
LDAP_HOSTNAME: {{ .Values.ldap.LDAP_HOSTNAME | quote }}
LDAP_USER_BASE_DN: {{ .Values.ldap.LDAP_USER_BASE_DN | quote }}
@ -190,4 +190,34 @@ data:
LDAP_OPERATION_TIMEOUT: {{ .Values.ldap.LDAP_OPERATION_TIMEOUT | quote }}
{{- end }}
{{- end }}
{{/* SAML */}}
{{- if or .Values.saml.SAML_IDP_METADATA_URL ( and ( .Values.saml.SAML_ENTITY_ID ) ( .Values.saml.SAML_CALLBACK_URL ) ) }}
{{- if .Values.saml.SAML_IDP_METADATA_URL }}
SAML_IDP_METADATA_URL: {{ .Values.saml.SAML_IDP_METADATA_URL | quote }}
{{- end }}
{{- if .Values.saml.SAML_ENTITY_ID }}
SAML_ENTITY_ID: {{ .Values.saml.SAML_ENTITY_ID | quote }}
{{- end }}
{{- if .Values.saml.SAML_CALLBACK_URL }}
SAML_CALLBACK_URL: {{ .Values.saml.SAML_CALLBACK_URL | quote }}
{{- end }}
{{- if .Values.saml.SAML_IDP_URL }}
SAML_IDP_URL: {{ .Values.saml.SAML_IDP_URL | quote }}
{{- end }}
{{- if .Values.saml.SAML_STRICT }}
SAML_STRICT: {{ .Values.saml.SAML_STRICT | quote }}
{{- end }}
{{- if .Values.saml.SAML_DEBUG }}
SAML_DEBUG: {{ .Values.saml.SAML_DEBUG | quote }}
{{- end }}
{{- if .Values.saml.SAML_COMPRESS_REQUEST }}
SAML_COMPRESS_REQUEST: {{ .Values.saml.SAML_COMPRESS_REQUEST | quote }}
{{- end }}
{{- if .Values.saml.SAML_COMPRESS_RESPONSE }}
SAML_COMPRESS_RESPONSE: {{ .Values.saml.SAML_COMPRESS_RESPONSE | quote }}
{{- end }}
{{- if .Values.saml.SAML_GROUP_ATTRIBUTE }}
SAML_GROUP_ATTRIBUTE: {{ .Values.saml.SAML_GROUP_ATTRIBUTE | quote }}
{{- end }}
{{- end }}
{{- end -}}

View File

@ -112,6 +112,18 @@ ldap: {}
# LDAP_MAX_REFERRAL_HOPS: "5"
# LDAP_OPERATION_TIMEOUT: "30"
saml: {}
# SAML_IDP_METADATA_URL: ""
# SAML_IDP_URL:
# SAML_ENTITY_ID:
# SAML_CALLBACK_URL:
# SAML_STRICT:
# SAML_DEBUG:
# SAML_COMPRESS_REQUEST:
# SAML_COMPRESS_RESPONSE:
# SAML_GROUP_ATTRIBUTE:
postgresql:
enabled: true
existingSecret: "dbcreds"