Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: allow skipping tls verification for oidc endpoints (#1300)
Kyle Mendell86796a8f4033
diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex acfc5b0c9..8bea4672f 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -660,22 +660,6 @@ func (e *OidcConfigError) Error() string {return "Failed to get OIDC configuration"}-type SkipOnboardingError struct {- Err error-}--func (e *SkipOnboardingError) Error() string {- return fmt.Sprintf("Failed to skip onboarding: %v", e.Err)-}--type ResetOnboardingError struct {- Err error-}--func (e *ResetOnboardingError) Error() string {- return fmt.Sprintf("Failed to reset onboarding: %v", e.Err)-}-type ProjectListError struct {Err error}diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 7f68128a8..3b46edfb6 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -23,13 +23,14 @@ type Config struct {JWTSecret stringEncryptionKey string- OidcEnabled bool- OidcClientID string- OidcClientSecret string- OidcIssuerURL string- OidcScopes string- OidcAdminClaim string- OidcAdminValue string+ OidcEnabled bool+ OidcClientID string+ OidcClientSecret string+ OidcIssuerURL string+ OidcScopes string+ OidcAdminClaim string+ OidcAdminValue string+ OidcSkipTlsVerify boolDockerHost stringLogJson bool@@ -53,13 +54,14 @@ func Load() *Config {JWTSecret: getEnvOrDefault("JWT_SECRET", "default-jwt-secret-change-me"),EncryptionKey: getEnvOrDefault("ENCRYPTION_KEY", "arcane-dev-key-32-characters!!!"),- OidcEnabled: getBoolEnvOrDefault("OIDC_ENABLED", false),- OidcClientID: getEnvOrDefault("OIDC_CLIENT_ID", ""),- OidcClientSecret: getEnvOrDefault("OIDC_CLIENT_SECRET", ""),- OidcIssuerURL: getEnvOrDefault("OIDC_ISSUER_URL", ""),- OidcScopes: getEnvOrDefault("OIDC_SCOPES", "openid email profile"),- OidcAdminClaim: getEnvOrDefault("OIDC_ADMIN_CLAIM", ""),- OidcAdminValue: getEnvOrDefault("OIDC_ADMIN_VALUE", ""),+ OidcEnabled: getBoolEnvOrDefault("OIDC_ENABLED", false),+ OidcClientID: getEnvOrDefault("OIDC_CLIENT_ID", ""),+ OidcClientSecret: getEnvOrDefault("OIDC_CLIENT_SECRET", ""),+ OidcIssuerURL: getEnvOrDefault("OIDC_ISSUER_URL", ""),+ OidcScopes: getEnvOrDefault("OIDC_SCOPES", "openid email profile"),+ OidcAdminClaim: getEnvOrDefault("OIDC_ADMIN_CLAIM", ""),+ OidcAdminValue: getEnvOrDefault("OIDC_ADMIN_VALUE", ""),+ OidcSkipTlsVerify: getBoolEnvOrDefault("OIDC_SKIP_TLS_VERIFY", false),DockerHost: getEnvOrDefault("DOCKER_HOST", "unix:///var/run/docker.sock"),LogJson: getBoolEnvOrDefault("LOG_JSON", false),diff --git a/backend/internal/huma/handlers/settings.go b/backend/internal/huma/handlers/settings.goindex b4c4ccaee..5497f9edc 100644--- a/backend/internal/huma/handlers/settings.go+++ b/backend/internal/huma/handlers/settings.go@@ -247,7 +247,8 @@ func (h *SettingsHandler) UpdateSettings(ctx context.Context, input *UpdateSettireq.AuthOidcConfig != nil || req.OidcClientId != nil ||req.OidcClientSecret != nil || req.OidcIssuerUrl != nil ||req.OidcScopes != nil || req.OidcAdminClaim != nil ||- req.OidcAdminValue != nil || req.OidcMergeAccounts != nil {+ req.OidcAdminValue != nil || req.OidcMergeAccounts != nil ||+ req.OidcSkipTlsVerify != nil {return nil, huma.Error403Forbidden((&common.AuthSettingsUpdateError{}).Error())}diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 2b784367c..774ffc5b2 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -74,6 +74,7 @@ type Settings struct {OidcScopes SettingVariable `key:"oidcScopes,public,envOverride" meta:"label=OIDC Scopes;type=text;keywords=oidc,scopes,oauth,openid,permissions;category=security;description=OIDC scopes to request"`OidcAdminClaim SettingVariable `key:"oidcAdminClaim,public,envOverride" meta:"label=OIDC Admin Claim;type=text;keywords=oidc,admin,claim,role,group;category=security;description=Claim name for admin role mapping"`OidcAdminValue SettingVariable `key:"oidcAdminValue,public,envOverride" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=security;description=Claim value that grants admin access"`+ OidcSkipTlsVerify SettingVariable `key:"oidcSkipTlsVerify,public,envOverride" meta:"label=OIDC Skip TLS Verify;type=boolean;keywords=oidc,tls,verify,skip,insecure;category=security;description=Skip TLS verification for OIDC provider"`OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public,envOverride" meta:"label=OIDC Account Merging;type=boolean;keywords=oidc,merge,link,accounts,email,match,existing,users,combine;category=security;description=Allow OIDC logins to merge with existing accounts by email"`// Appearance category@@ -258,4 +259,6 @@ type OidcConfig struct {// - adminClaim: "realm_access.roles", adminValue: "admin" (Keycloak)AdminClaim string `json:"adminClaim,omitempty"`AdminValue string `json:"adminValue,omitempty"`++ SkipTlsVerify bool `json:"skipTlsVerify"`}diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 6c2b84946..c97963ea9 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -85,12 +85,13 @@ func (s *AuthService) getAuthSettings(ctx context.Context) (*AuthSettings, errorif authSettings.OidcEnabled {oidcConfig := &models.OidcConfig{- ClientID: settings.OidcClientId.Value,- ClientSecret: settings.OidcClientSecret.Value,- IssuerURL: settings.OidcIssuerUrl.Value,- Scopes: settings.OidcScopes.Value,- AdminClaim: settings.OidcAdminClaim.Value,- AdminValue: settings.OidcAdminValue.Value,+ ClientID: settings.OidcClientId.Value,+ ClientSecret: settings.OidcClientSecret.Value,+ IssuerURL: settings.OidcIssuerUrl.Value,+ Scopes: settings.OidcScopes.Value,+ AdminClaim: settings.OidcAdminClaim.Value,+ AdminValue: settings.OidcAdminValue.Value,+ SkipTlsVerify: settings.OidcSkipTlsVerify.IsTrue(),}if oidcConfig.ClientID != "" || oidcConfig.IssuerURL != "" {diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex 73684d5bb..b004513ca 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -2,6 +2,7 @@ package servicesimport ("context"+ "crypto/tls""encoding/base64""encoding/json""errors"@@ -14,6 +15,7 @@ import ("log/slog""github.com/coreos/go-oidc/v3/oidc"+ "golang.org/x/net/http2""golang.org/x/oauth2""golang.org/x/sync/singleflight"@@ -24,13 +26,15 @@ import ()type OidcService struct {- authService *AuthService- config *config.Config- httpClient *http.Client- providerCache *oidc.Provider- providerMutex sync.RWMutex- cachedIssuer string- sfGroup singleflight.Group+ authService *AuthService+ config *config.Config+ httpClient *http.Client+ insecureHttpClient *http.Client+ providerCache *oidc.Provider+ providerMutex sync.RWMutex+ cachedIssuer string+ cachedSkipTls bool+ sfGroup singleflight.Group}type OidcState struct {@@ -69,6 +73,52 @@ func (s *OidcService) getEffectiveConfig(ctx context.Context) (*models.OidcConfireturn config, nil}+func (s *OidcService) getHttpClient(skipTlsVerify bool) *http.Client {+ if skipTlsVerify {+ return s.getInsecureHttpClient()+ }+ return s.httpClient+}++func (s *OidcService) getInsecureHttpClient() *http.Client {+ s.providerMutex.RLock()+ if s.insecureHttpClient != nil {+ s.providerMutex.RUnlock()+ return s.insecureHttpClient+ }+ s.providerMutex.RUnlock()++ s.providerMutex.Lock()+ defer s.providerMutex.Unlock()++ if s.insecureHttpClient != nil {+ return s.insecureHttpClient+ }++ // Create insecure client+ insecureClient := *s.httpClient+ if transport, ok := insecureClient.Transport.(*http.Transport); ok {+ insecureTransport := transport.Clone()+ if insecureTransport.TLSClientConfig == nil {+ // #nosec G402 - This is explicitly an insecure client for OIDC discovery when TLS verification is skipped+ insecureTransport.TLSClientConfig = &tls.Config{+ MinVersion: tls.VersionTLS12,+ }+ }+ insecureTransport.TLSClientConfig.InsecureSkipVerify = true+ // Force HTTP/2 even with custom TLS config to avoid "malformed HTTP response" errors+ // when the server speaks HTTP/2 but the client disabled it due to custom TLS config.+ if err := http2.ConfigureTransport(insecureTransport); err != nil {+ slog.Warn("getInsecureHttpClient: failed to configure http2 transport", "error", err)+ }+ insecureClient.Transport = insecureTransport+ } else {+ slog.Warn("getInsecureHttpClient: Transport is not *http.Transport, cannot skip TLS verification")+ }+ s.insecureHttpClient = &insecureClient+ return s.insecureHttpClient+}+func (s *OidcService) ensureOpenIDScope(scopes []string) []string {hasOpenID := falsefor _, scope := range scopes {@@ -106,7 +156,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, orreturn "", "", err}- provider, err := s.getOrDiscoverProvider(ctx, config.IssuerURL)+ provider, err := s.getOrDiscoverProvider(ctx, config)if err != nil {slog.Error("GenerateAuthURL: provider discovery failed", "issuer", config.IssuerURL, "error", err)return "", "", fmt.Errorf("failed to discover provider: %w", err)@@ -150,20 +200,24 @@ func (s *OidcService) GetOidcRedirectURL(origin string) string {return baseUrl + "/auth/oidc/callback"}-func (s *OidcService) getOrDiscoverProvider(ctx context.Context, issuer string) (*oidc.Provider, error) {+func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.OidcConfig) (*oidc.Provider, error) {+ issuer := cfg.IssuerURL+ skipTls := cfg.SkipTlsVerify+s.providerMutex.RLock()- if s.providerCache != nil && s.cachedIssuer == issuer {+ if s.providerCache != nil && s.cachedIssuer == issuer && s.cachedSkipTls == skipTls {provider := s.providerCaches.providerMutex.RUnlock()return provider, nil}s.providerMutex.RUnlock()- // Use singleflight to prevent thundering herd- v, err, _ := s.sfGroup.Do(issuer, func() (interface{}, error) {+ // Use singleflight to prevent thundering herd. Include skipTls in key to handle toggling.+ sfKey := fmt.Sprintf("%s|%v", issuer, skipTls)+ v, err, _ := s.sfGroup.Do(sfKey, func() (interface{}, error) {// Double check inside the lock/singleflights.providerMutex.RLock()- if s.providerCache != nil && s.cachedIssuer == issuer {+ if s.providerCache != nil && s.cachedIssuer == issuer && s.cachedSkipTls == skipTls {provider := s.providerCaches.providerMutex.RUnlock()return provider, nil@@ -178,19 +232,20 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, issuer string)defer cancel()// Use the custom HTTP client with the new context- providerCtx := oidc.ClientContext(discoveryCtx, s.httpClient)+ providerCtx := oidc.ClientContext(discoveryCtx, s.getHttpClient(skipTls))provider, err := oidc.NewProvider(providerCtx, issuer)if err != nil {- slog.ErrorContext(ctx, "getOrDiscoverProvider: discovery failed", "issuer", issuer, "error", err)+ slog.ErrorContext(ctx, "getOrDiscoverProvider: discovery failed", "issuer", issuer, "skipTls", skipTls, "error", err)return nil, fmt.Errorf("failed to discover provider at %s: %w", issuer, err)}s.providerMutex.Lock()s.providerCache = providers.cachedIssuer = issuer+ s.cachedSkipTls = skipTlss.providerMutex.Unlock()- slog.DebugContext(ctx, "getOrDiscoverProvider: provider cached", "issuer", issuer)+ slog.DebugContext(ctx, "getOrDiscoverProvider: provider cached", "issuer", issuer, "skipTls", skipTls)return provider, nil})@@ -204,7 +259,7 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, issuer string)func (s *OidcService) exchangeToken(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, code string, verifier string, origin string) (*oauth2.Token, error) {oauth2Config := s.getOauth2Config(cfg, provider, origin)- providerCtx := oidc.ClientContext(ctx, s.httpClient)+ providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))token, err := oauth2Config.Exchange(providerCtx, code, oauth2.VerifierOption(verifier))if err != nil {slog.Error("exchangeToken: token exchange failed", "token_endpoint", oauth2Config.Endpoint.TokenURL, "error", err)@@ -215,8 +270,8 @@ func (s *OidcService) exchangeToken(ctx context.Context, cfg *models.OidcConfig,return token, nil}-func (s *OidcService) fetchClaims(ctx context.Context, provider *oidc.Provider, token *oauth2.Token, idToken *oidc.IDToken) (map[string]any, error) {- providerCtx := oidc.ClientContext(ctx, s.httpClient)+func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, token *oauth2.Token, idToken *oidc.IDToken) (map[string]any, error) {+ providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))var claims map[string]anyif idToken != nil {@@ -273,7 +328,7 @@ func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedStareturn nil, nil, err}- provider, err := s.getOrDiscoverProvider(ctx, cfg.IssuerURL)+ provider, err := s.getOrDiscoverProvider(ctx, cfg)if err != nil {return nil, nil, err}@@ -288,7 +343,7 @@ func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedStareturn nil, nil, err}- return s.buildUserInfo(ctx, provider, token, idToken, rawIDToken)+ return s.buildUserInfo(ctx, provider, cfg, token, idToken, rawIDToken)}func (s *OidcService) validateState(state, storedState string) (*OidcState, error) {@@ -332,7 +387,7 @@ func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.Provider}verifier := provider.Verifier(verifierConfig)- providerCtx := oidc.ClientContext(ctx, s.httpClient)+ providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))idToken, err := verifier.Verify(providerCtx, rawIDToken)if err != nil {@@ -358,8 +413,8 @@ func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.Providerreturn idToken, rawIDToken, nil}-func (s *OidcService) buildUserInfo(ctx context.Context, provider *oidc.Provider, token *oauth2.Token, idToken *oidc.IDToken, rawIDToken string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {- claims, err := s.fetchClaims(ctx, provider, token, idToken)+func (s *OidcService) buildUserInfo(ctx context.Context, provider *oidc.Provider, cfg *models.OidcConfig, token *oauth2.Token, idToken *oidc.IDToken, rawIDToken string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {+ claims, err := s.fetchClaims(ctx, cfg, provider, token, idToken)if err != nil {slog.Error("HandleCallback: failed to fetch claims", "error", err)return nil, nil, fmt.Errorf("failed to fetch user claims: %w", err)diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex fe9d3078d..7be21de7b 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -101,6 +101,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {OidcScopes: models.SettingVariable{Value: "openid email profile"},OidcAdminClaim: models.SettingVariable{Value: ""},OidcAdminValue: models.SettingVariable{Value: ""},+ OidcSkipTlsVerify: models.SettingVariable{Value: "false"},OidcMergeAccounts: models.SettingVariable{Value: "false"},MobileNavigationMode: models.SettingVariable{Value: "floating"},MobileNavigationShowLabels: models.SettingVariable{Value: "true"},diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 984b0d08e..7bf93b265 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1211,6 +1211,8 @@"oidc_admin_claim_placeholder": "e.g., roles, groups, realm_access.roles, admin","oidc_admin_value_placeholder": "e.g., admin (comma-separated)","oidc_admin_value_help": "Leave empty for boolean claims (admin=true).",+ "oidc_skip_tls_verify_label": "Skip TLS Verification",+ "oidc_skip_tls_verify_description": "Disable TLS certificate verification for OIDC endpoints. Proceed with CAUTION.","oidc_redirect_uri_title": "Redirect URI Configuration","oidc_redirect_uri_description": "Configure this redirect URI in your OIDC provider:","_comment_prune": "=== PRUNE ===",diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.tsindex fea00d6f5..b76bc69cf 100644--- a/frontend/src/lib/types/settings.type.ts+++ b/frontend/src/lib/types/settings.type.ts@@ -28,6 +28,7 @@ export type Settings = {oidcScopes: string;oidcAdminClaim: string;oidcAdminValue: string;+ oidcSkipTlsVerify: boolean;oidcMergeAccounts: boolean;mobileNavigationMode: 'floating' | 'docked';diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelteindex aeb43b906..617b88294 100644--- a/frontend/src/routes/(app)/settings/security/+page.svelte+++ b/frontend/src/routes/(app)/settings/security/+page.svelte@@ -34,6 +34,7 @@authPasswordPolicy: z.enum(['basic', 'standard', 'strong']),oidcEnabled: z.boolean(),oidcMergeAccounts: z.boolean(),+ oidcSkipTlsVerify: z.boolean(),oidcClientId: z.string(),oidcClientSecret: z.string(),oidcIssuerUrl: z.string(),@@ -60,6 +61,7 @@authPasswordPolicy: currentSettings.authPasswordPolicy,oidcEnabled: currentSettings.oidcEnabled,oidcMergeAccounts: currentSettings.oidcMergeAccounts,+ oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,oidcClientId: currentSettings.oidcClientId,oidcClientSecret: '',oidcIssuerUrl: currentSettings.oidcIssuerUrl,@@ -79,6 +81,7 @@authPasswordPolicy: ($settingsStore || data.settings!).authPasswordPolicy,oidcEnabled: ($settingsStore || data.settings!).oidcEnabled,oidcMergeAccounts: ($settingsStore || data.settings!).oidcMergeAccounts,+ oidcSkipTlsVerify: ($settingsStore || data.settings!).oidcSkipTlsVerify,oidcClientId: ($settingsStore || data.settings!).oidcClientId,oidcClientSecret: '',oidcIssuerUrl: ($settingsStore || data.settings!).oidcIssuerUrl,@@ -97,6 +100,7 @@$formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy ||$formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||$formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||+ $formInputs.oidcSkipTlsVerify.value !== currentSettings.oidcSkipTlsVerify ||$formInputs.oidcClientId.value !== currentSettings.oidcClientId ||$formInputs.oidcIssuerUrl.value !== currentSettings.oidcIssuerUrl ||$formInputs.oidcScopes.value !== currentSettings.oidcScopes ||@@ -131,6 +135,7 @@authPasswordPolicy: formData.authPasswordPolicy,oidcEnabled: formData.oidcEnabled,oidcMergeAccounts: formData.oidcMergeAccounts,+ oidcSkipTlsVerify: formData.oidcSkipTlsVerify,oidcClientId: formData.oidcClientId,oidcIssuerUrl: formData.oidcIssuerUrl,oidcScopes: formData.oidcScopes,@@ -380,6 +385,24 @@</div></div>+ <div class="border-t pt-4">+ <div class="flex items-center gap-2">+ <Switch+ id="oidcSkipTlsVerifySwitch"+ disabled={isOidcEnvForced}+ bind:checked={$formInputs.oidcSkipTlsVerify.value}+ />+ <div class="grid gap-1.5 leading-none">+ <Label for="oidcSkipTlsVerifySwitch" class="font-normal">+ {m.oidc_skip_tls_verify_label()}+ </Label>+ <p class="text-muted-foreground text-xs">+ {m.oidc_skip_tls_verify_description()}+ </p>+ </div>+ </div>+ </div>+<div class="bg-muted/30 rounded-lg border p-4"><div class="mb-2 flex items-center gap-2"><InfoIcon class="size-4 text-blue-600" />diff --git a/types/settings/settings.go b/types/settings/settings.goindex 6bfcd48cb..e06c1c234 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -166,6 +166,11 @@ type Update struct {// Required: falseOidcAdminValue *string `json:"oidcAdminValue,omitempty"`+ // OidcSkipTlsVerify indicates if TLS verification should be skipped for OIDC.+ //+ // Required: false+ OidcSkipTlsVerify *string `json:"oidcSkipTlsVerify,omitempty"`+// MobileNavigationMode is the navigation mode for mobile devices.//// Required: false