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

charts/stable/guacamole-client/Chart.yaml

@@ -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

charts/stable/guacamole-client/questions.yaml

@@ -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"

charts/stable/guacamole-client/templates/_configmap.tpl

@@ -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 -}}

charts/stable/guacamole-client/values.yaml

@@ -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"