From 503ee903b509d35f72c0773f15439c63b69991ee Mon Sep 17 00:00:00 2001
From: Akash-Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Mon, 8 Apr 2024 19:17:38 +0530
Subject: [PATCH] feat: Add provision for OIDC Confidential client
 configurations

---
 charts/openmetadata/README.md              | 21 +++++-
 charts/openmetadata/templates/_helpers.tpl | 16 +++++
 charts/openmetadata/templates/secrets.yaml | 16 +++++
 charts/openmetadata/values.schema.json     | 79 ++++++++++++++++++++++
 charts/openmetadata/values.yaml            | 22 ++++++
 5 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/charts/openmetadata/README.md b/charts/openmetadata/README.md
index d48427b1..40292d0f 100644
--- a/charts/openmetadata/README.md
+++ b/charts/openmetadata/README.md
@@ -34,6 +34,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | Key | Type | Default | Conf/Openmetadata.yaml |
 |-----|------|---------| ---------------------- |
 | openmetadata.config.authentication.enabled | bool | `true` | |
+| openmetadata.config.authentication.clientType | string | `public` | AUTHENTICATION_CLIENT_TYPE |
 | openmetadata.config.authentication.provider | string | `basic` | AUTHENTICATION_PROVIDER |
 | openmetadata.config.authentication.publicKeys | list | `[http://openmetadata:8585/api/v1/system/config/jwks]` | AUTHENTICATION_PUBLIC_KEYS |
 | openmetadata.config.authentication.authority | string | `https://accounts.google.com` | AUTHENTICATION_AUTHORITY |
@@ -70,6 +71,24 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.hostNameConfig.acceptableHostNames | string | `[Empty String]` | AUTHENTICATION_LDAP_ALLOWED_HOSTNAMES |
 | openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.jvmDefaultConfig.verifyHostname | string | `Empty String` | AUTHENTICATION_LDAP_SSL_VERIFY_CERT_HOST |
 | openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.trustAllConfig.examineValidityDates | bool | `true` | AUTHENTICATION_LDAP_EXAMINE_VALIDITY_DATES |
+| openmetadata.config.authentication.oidcConfiguration.callbackUrl | string | `http://openmetadata:8585/callback` | OIDC_CALLBACK |
+| openmetadata.config.authentication.oidcConfiguration.clientAuthenticationMethod | string | `client_secret_post` | OIDC_CLIENT_AUTH_METHOD |
+| openmetadata.config.authentication.oidcConfiguration.clientId.secretKey | string | `openmetadata-oidc-client-id` | OIDC_CLIENT_ID |
+| openmetadata.config.authentication.oidcConfiguration.clientId.secretRef | string | `oidc-secrets` | OIDC_CLIENT_ID |
+| openmetadata.config.authentication.oidcConfiguration.clientSecret.secretKey | string | `openmetadata-oidc-client-secret` | OIDC_CLIENT_SECRET |
+| openmetadata.config.authentication.oidcConfiguration.clientSecret.secretRef | string | `oidc-secrets` | OIDC_CLIENT_SECRET |
+| openmetadata.config.authentication.oidcConfiguration.customParams | string | `Empty` | OIDC_CUSTOM_PARAMS |
+| openmetadata.config.authentication.oidcConfiguration.disablePkce | bool | true | OIDC_DISABLE_PKCE |
+| openmetadata.config.authentication.oidcConfiguration.discoveryUri | string | `Empty` | OIDC_DISCOVERY_URI |
+| openmetadata.config.authentication.oidcConfiguration.enabled | bool | false | |
+| openmetadata.config.authentication.oidcConfiguration.maxClockSkew | string | `Empty` | OIDC_MAX_CLOCK_SKEW |
+| openmetadata.config.authentication.oidcConfiguration.oidcType | string | `Empty` | OIDC_TYPE |
+| openmetadata.config.authentication.oidcConfiguration.preferredJwsAlgorithm | string | `RS256` | OIDC_PREFERRED_JWS |
+| openmetadata.config.authentication.oidcConfiguration.responseType | string | `code` | OIDC_RESPONSE_TYPE |
+| openmetadata.config.authentication.oidcConfiguration.scope | string | `openid email profile` | OIDC_SCOPE |
+| openmetadata.config.authentication.oidcConfiguration.serverUrl | string | `http://openmetadata:8585` | OIDC_SERVER_URL |
+| openmetadata.config.authentication.oidcConfiguration.tenant | string | `Empty` | OIDC_TENANT |
+| openmetadata.config.authentication.oidcConfiguration.useNonce | bool | `true` | OIDC_USE_NONCE |
 | openmetadata.config.authentication.saml.debugMode | bool | false | SAML_DEBUG_MODE |
 | openmetadata.config.authentication.saml.idp.entityId | string | `Empty` | SAML_IDP_ENTITY_ID |
 | openmetadata.config.authentication.saml.idp.ssoLoginUrl |  string | `Empty` | SAML_IDP_SSO_LOGIN_URL |
@@ -235,7 +254,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | fullnameOverride | string | `"openmetadata"` |
 | image.pullPolicy | string | `"Always"` |
 | image.repository | string | `"docker.getcollate.io/openmetadata/server"` |
-| image.tag | string | `1.3.1` |
+| image.tag | string | `1.3.2` |
 | imagePullSecrets | list | `[]` |
 | ingress.annotations | object | `{}` |
 | ingress.className | string | `""` |
diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl
index 52b7ad39..814b0927 100644
--- a/charts/openmetadata/templates/_helpers.tpl
+++ b/charts/openmetadata/templates/_helpers.tpl
@@ -184,6 +184,22 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
+{{- if and (eq .Values.openmetadata.config.authentication.clientType "confidential") (.Values.openmetadata.config.authentication.oidcConfiguration.enabled) }}
+{{- with .Values.openmetadata.config.authentication.oidcConfiguration.clientId }}
+- name: OIDC_CLIENT_ID
+  valueFrom:
+    secretKeyRef:
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
+{{- end }}
+{{- with .Values.openmetadata.config.authentication.oidcConfiguration.clientSecret }}
+- name: OIDC_CLIENT_SECRET
+  valueFrom:
+    secretKeyRef:
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
+{{- end }}
+{{- end }}
 {{- if eq .Values.openmetadata.config.authentication.provider "ldap" }}
 {{- if .Values.openmetadata.config.authentication.ldapConfiguration.dnAdminPassword.secretRef }}
 {{- with .Values.openmetadata.config.authentication.ldapConfiguration.dnAdminPassword }}
diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml
index 0ce16149..0350b126 100644
--- a/charts/openmetadata/templates/secrets.yaml
+++ b/charts/openmetadata/templates/secrets.yaml
@@ -217,8 +217,24 @@ data:
   AUTHENTICATION_RESPONSE_TYPE: {{ .responseType | quote | b64enc }}
   AUTHENTICATION_AUTHORITY: {{ .authority | quote | b64enc }}
   AUTHENTICATION_CLIENT_ID: {{ .clientId | quote | b64enc }}
+  AUTHENTICATION_CLIENT_TYPE: {{ .clientType | quote | b64enc }}
   AUTHENTICATION_CALLBACK_URL: {{ .callbackUrl | quote | b64enc }}
   AUTHENTICATION_ENABLE_SELF_SIGNUP: {{ .enableSelfSignup | quote | b64enc }}
+{{- if and (eq .clientType "confidential") (.oidcConfiguration.enabled) }}
+  OIDC_TYPE: {{ .oidcConfiguration.oidcType | quote | b64enc }}
+  OIDC_SCOPE: {{ .oidcConfiguration.scope | quote | b64enc }}
+  OIDC_DISCOVERY_URI: {{ .oidcConfiguration.discoveryUri | quote | b64enc }}
+  OIDC_USE_NONCE: {{  .oidcConfiguration.useNonce | quote | b64enc }}
+  OIDC_PREFERRED_JWS: {{ .oidcConfiguration.preferredJwsAlgorithm | quote | b64enc }}
+  OIDC_RESPONSE_TYPE: {{ .oidcConfiguration.responseType | quote | b64enc }}
+  OIDC_DISABLE_PKCE: {{ .oidcConfiguration.disablePkce | quote | b64enc }}
+  OIDC_CALLBACK: {{ .oidcConfiguration.callbackUrl | quote | b64enc }}
+  OIDC_SERVER_URL: {{ .oidcConfiguration.serverUrl | quote | b64enc }}
+  OIDC_CLIENT_AUTH_METHOD: {{ .oidcConfiguration.clientAuthenticationMethod | quote | b64enc }}
+  OIDC_TENANT: {{ .oidcConfiguration.tenant | quote | b64enc }}
+  OIDC_MAX_CLOCK_SKEW: {{ .oidcConfiguration.maxClockSkew | quote | b64enc }}
+  OIDC_CUSTOM_PARAMS: {{ .oidcConfiguration.customParams | quote | b64enc }}
+{{ end }}
 {{- if eq .provider "ldap" }}
   AUTHENTICATION_LDAP_HOST: {{ .ldapConfiguration.host | b64enc }}
   AUTHENTICATION_LDAP_PORT: {{ .ldapConfiguration.port | quote | b64enc }}
diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json
index 1d7777e7..732183b8 100644
--- a/charts/openmetadata/values.schema.json
+++ b/charts/openmetadata/values.schema.json
@@ -246,6 +246,13 @@
                                 "clientId": {
                                     "type": "string"
                                 },
+                                "clientType": {
+                                    "type": "string",
+                                    "enum": [
+                                        "public",
+                                        "confidential"
+                                    ]
+                                },
                                 "enableSelfSignup": {
                                     "type": "boolean"
                                 },
@@ -284,6 +291,78 @@
                                 "responseType": {
                                     "type": "string"
                                 },
+                                "oidcConfiguration": {
+                                    "type": "object",
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "enabled": {
+                                            "type": "boolean"
+                                        },
+                                        "oidcType": {
+                                            "type": "string"
+                                        },
+                                        "clientId": {
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "secretRef": {
+                                                    "type": "string"
+                                                },
+                                                "secretKey": {
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        "clientSecret": {
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "secretRef": {
+                                                    "type": "string"
+                                                },
+                                                "secretKey": {
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        "scope": {
+                                            "type": "string"
+                                        },
+                                        "discoveryUri": {
+                                            "type": "string"
+                                        },
+                                        "useNonce": {
+                                            "type": "boolean"
+                                        },
+                                        "preferredJwsAlgorithm": {
+                                            "type": "string"
+                                        },
+                                        "responseType": {
+                                            "type": "string"
+                                        },
+                                        "disablePkce": {
+                                            "type": "boolean"
+                                        },
+                                        "callbackUrl": {
+                                            "type": "string"
+                                        },
+                                        "serverUrl": {
+                                            "type": "string"
+                                        },
+                                        "clientAuthenticationMethod": {
+                                            "type": "string"
+                                        },
+                                        "tenant": {
+                                            "type": "string"
+                                        },
+                                        "maxClockSkew": {
+                                            "type": "string"
+                                        },
+                                        "customParams": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
                                 "ldapConfiguration": {
                                     "type": "object",
                                     "additionalProperties": false,
diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
index 47128167..88f86aa9 100644
--- a/charts/openmetadata/values.yaml
+++ b/charts/openmetadata/values.yaml
@@ -96,6 +96,7 @@ openmetadata:
       enableSecureSocketConnection: false
     authentication:
       enabled: true
+      clientType: public
       provider: "basic"
       publicKeys:
       - "http://openmetadata:8585/api/v1/system/config/jwks"
@@ -108,6 +109,27 @@ openmetadata:
       - "preferred_username"
       - "sub"
       enableSelfSignup: true
+      oidcConfiguration:
+        enabled: false
+        oidcType: ""
+        clientId:
+          secretRef: oidc-secrets
+          secretKey: openmetadata-oidc-client-id
+        clientSecret:
+          secretRef: oidc-secrets
+          secretKey: openmetadata-oidc-client-secret
+        scope: "openid email profile"
+        discoveryUri: ""
+        useNonce: true
+        preferredJwsAlgorithm: RS256
+        responseType: code
+        disablePkce: true
+        callbackUrl: http://openmetadata:8585/callback
+        serverUrl: http://openmetadata:8585
+        clientAuthenticationMethod: client_secret_post
+        tenant: ""
+        maxClockSkew: ""
+        customParams: ""
       ldapConfiguration:
         host: localhost
         port: 10636