Skip to content

Modern Docker Management, Designed for Everyone

fix: remove oidc client secret from api reponses

Kyle Mendell4ab9a9d9ecbb
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 39e824c02..8bee0658f 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -1,6 +1,7 @@
package models
import (
+ "encoding/json"
"errors"
"fmt"
"reflect"
@@ -89,7 +90,22 @@ func (s *Settings) ToSettingVariableSlice(showAll bool, redactSensitiveValues bo
// Redact sensitive values if requested
if value != "" && redactSensitiveValues && attrs == "sensitive" {
- value = "XXXXXXXXXX"
+ if key == "authOidcConfig" {
+ // Redact only the clientSecret field while keeping the rest visible
+ var cfg OidcConfig
+ if err := json.Unmarshal([]byte(value), &cfg); err == nil {
+ cfg.ClientSecret = ""
+ if redacted, err := json.Marshal(cfg); err == nil {
+ value = string(redacted)
+ } else {
+ value = "XXXXXXXXXX"
+ }
+ } else {
+ value = "XXXXXXXXXX"
+ }
+ } else {
+ value = "XXXXXXXXXX"
+ }
}
settingVariable := SettingVariable{
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index 1b16697be..9d23fb456 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -227,6 +227,40 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates dto.Update
return nil, err
}
+ // Merge OIDC config to avoid clearing secret when not provided
+ if updates.AuthOidcConfig != nil {
+ newCfgStr := *updates.AuthOidcConfig
+
+ var incoming models.OidcConfig
+ if err := json.Unmarshal([]byte(newCfgStr), &incoming); err != nil {
+ return nil, fmt.Errorf("invalid authOidcConfig JSON: %w", err)
+ }
+
+ // Get current settings to preserve existing secret if empty
+ current, err := s.GetSettings(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to load current settings: %w", err)
+ }
+
+ if current.AuthOidcConfig.Value != "" {
+ var existing models.OidcConfig
+ if err := json.Unmarshal([]byte(current.AuthOidcConfig.Value), &existing); err == nil {
+ if incoming.ClientSecret == "" {
+ incoming.ClientSecret = existing.ClientSecret
+ }
+ }
+ }
+
+ mergedBytes, err := json.Marshal(incoming)
+ if err != nil {
+ return nil, fmt.Errorf("failed to marshal merged OIDC config: %w", err)
+ }
+
+ if err := s.UpdateSetting(ctx, "authOidcConfig", string(mergedBytes)); err != nil {
+ return nil, fmt.Errorf("failed to update authOidcConfig: %w", err)
+ }
+ }
+
settings, err := s.GetSettings(ctx)
if err != nil {
return nil, fmt.Errorf("failed to retrieve updated settings: %w", err)