Merge branch 'main' into feat/disable-workload-rbac

Author: ChrisJBurns

cmd/thv-operator/api/v1alpha1/mcpexternalauthconfig_types.go

@@ -331,6 +331,40 @@ type OAuth2UpstreamConfig struct {
 	// Scopes are the OAuth scopes to request from the upstream IDP.
 	// +optional
 	Scopes []string `json:"scopes,omitempty"`
+
+	// TokenResponseMapping configures custom field extraction from non-standard token responses.
+	// Some OAuth providers (e.g., GovSlack) nest token fields under non-standard paths
+	// instead of returning them at the top level. When set, ToolHive performs the token
+	// exchange HTTP call directly and extracts fields using the configured dot-notation paths.
+	// If nil, standard OAuth 2.0 token response parsing is used.
+	// +optional
+	TokenResponseMapping *TokenResponseMapping `json:"tokenResponseMapping,omitempty"`
+}
+
+// TokenResponseMapping maps non-standard token response fields to standard OAuth 2.0 fields
+// using dot-notation JSON paths. This supports upstream providers like GovSlack that nest
+// the access token under paths like "authed_user.access_token".
+type TokenResponseMapping struct {
+	// AccessTokenPath is the dot-notation path to the access token in the response.
+	// Example: "authed_user.access_token"
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength=1
+	AccessTokenPath string `json:"accessTokenPath"`
+
+	// ScopePath is the dot-notation path to the scope string in the response.
+	// If not specified, defaults to "scope".
+	// +optional
+	ScopePath string `json:"scopePath,omitempty"`
+
+	// RefreshTokenPath is the dot-notation path to the refresh token in the response.
+	// If not specified, defaults to "refresh_token".
+	// +optional
+	RefreshTokenPath string `json:"refreshTokenPath,omitempty"`
+
+	// ExpiresInPath is the dot-notation path to the expires_in value (in seconds).
+	// If not specified, defaults to "expires_in".
+	// +optional
+	ExpiresInPath string `json:"expiresInPath,omitempty"`
 }
 
 // UserInfoConfig contains configuration for fetching user information from an upstream provider.

cmd/thv-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -519,6 +519,15 @@ func buildUpstreamRunConfig(
 			if provider.OAuth2Config.UserInfo != nil {
 				config.OAuth2Config.UserInfo = buildUserInfoRunConfig(provider.OAuth2Config.UserInfo)
 			}
+			if provider.OAuth2Config.TokenResponseMapping != nil {
+				m := provider.OAuth2Config.TokenResponseMapping
+				config.OAuth2Config.TokenResponseMapping = &authserver.TokenResponseMappingRunConfig{
+					AccessTokenPath:  m.AccessTokenPath,
+					ScopePath:        m.ScopePath,
+					RefreshTokenPath: m.RefreshTokenPath,
+					ExpiresInPath:    m.ExpiresInPath,
+				}
+			}
 		}
 	}
 

cmd/thv-operator/pkg/controllerutil/authserver.go

@@ -15,6 +15,13 @@ import (
 )
 
 func main() {
+	// Bind TOOLHIVE_DEBUG env var early, before logger initialization.
+	// This must happen before viper.GetBool("debug") so the env var
+	// is available when configuring the log level.
+	if err := viper.BindEnv("debug", "TOOLHIVE_DEBUG"); err != nil {
+		slog.Error("failed to bind TOOLHIVE_DEBUG env var", "error", err)
+	}
+
 	// Initialize the logger
 	var opts []logging.Option
 	if viper.GetBool("debug") {

cmd/thv-proxyrunner/main.go

@@ -23,6 +23,13 @@ import (
 )
 
 func main() {
+	// Bind TOOLHIVE_DEBUG env var early, before logger initialization.
+	// This must happen before viper.GetBool("debug") so the env var
+	// is available when configuring the log level.
+	if err := viper.BindEnv("debug", "TOOLHIVE_DEBUG"); err != nil {
+		slog.Error("failed to bind TOOLHIVE_DEBUG env var", "error", err)
+	}
+
 	// Initialize the logger
 	var opts []logging.Option
 	if viper.GetBool("debug") {

cmd/thv/main.go

@@ -441,6 +441,38 @@ spec:
                                 token endpoint.
                               pattern: ^https?://.*$
                               type: string
+                            tokenResponseMapping:
+                              description: |-
+                                TokenResponseMapping configures custom field extraction from non-standard token responses.
+                                Some OAuth providers (e.g., GovSlack) nest token fields under non-standard paths
+                                instead of returning them at the top level. When set, ToolHive performs the token
+                                exchange HTTP call directly and extracts fields using the configured dot-notation paths.
+                                If nil, standard OAuth 2.0 token response parsing is used.
+                              properties:
+                                accessTokenPath:
+                                  description: |-
+                                    AccessTokenPath is the dot-notation path to the access token in the response.
+                                    Example: "authed_user.access_token"
+                                  minLength: 1
+                                  type: string
+                                expiresInPath:
+                                  description: |-
+                                    ExpiresInPath is the dot-notation path to the expires_in value (in seconds).
+                                    If not specified, defaults to "expires_in".
+                                  type: string
+                                refreshTokenPath:
+                                  description: |-
+                                    RefreshTokenPath is the dot-notation path to the refresh token in the response.
+                                    If not specified, defaults to "refresh_token".
+                                  type: string
+                                scopePath:
+                                  description: |-
+                                    ScopePath is the dot-notation path to the scope string in the response.
+                                    If not specified, defaults to "scope".
+                                  type: string
+                              required:
+                              - accessTokenPath
+                              type: object
                             userInfo:
                               description: |-
                                 UserInfo contains configuration for fetching user information from the upstream provider.

deploy/charts/operator-crds/files/crds/toolhive.stacklok.dev_mcpexternalauthconfigs.yaml

@@ -444,6 +444,38 @@ spec:
                                 token endpoint.
                               pattern: ^https?://.*$
                               type: string
+                            tokenResponseMapping:
+                              description: |-
+                                TokenResponseMapping configures custom field extraction from non-standard token responses.
+                                Some OAuth providers (e.g., GovSlack) nest token fields under non-standard paths
+                                instead of returning them at the top level. When set, ToolHive performs the token
+                                exchange HTTP call directly and extracts fields using the configured dot-notation paths.
+                                If nil, standard OAuth 2.0 token response parsing is used.
+                              properties:
+                                accessTokenPath:
+                                  description: |-
+                                    AccessTokenPath is the dot-notation path to the access token in the response.
+                                    Example: "authed_user.access_token"
+                                  minLength: 1
+                                  type: string
+                                expiresInPath:
+                                  description: |-
+                                    ExpiresInPath is the dot-notation path to the expires_in value (in seconds).
+                                    If not specified, defaults to "expires_in".
+                                  type: string
+                                refreshTokenPath:
+                                  description: |-
+                                    RefreshTokenPath is the dot-notation path to the refresh token in the response.
+                                    If not specified, defaults to "refresh_token".
+                                  type: string
+                                scopePath:
+                                  description: |-
+                                    ScopePath is the dot-notation path to the scope string in the response.
+                                    If not specified, defaults to "scope".
+                                  type: string
+                              required:
+                              - accessTokenPath
+                              type: object
                             userInfo:
                               description: |-
                                 UserInfo contains configuration for fetching user information from the upstream provider.