Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: allow oidc endpoints to be defined manually (#1510)
Kyle Mendella7d25db93e6b
diff --git a/backend/internal/huma/handlers/oidc.go b/backend/internal/huma/handlers/oidc.goindex b3622f1ce..b8e6b2d9b 100644--- a/backend/internal/huma/handlers/oidc.go+++ b/backend/internal/huma/handlers/oidc.go@@ -2,6 +2,7 @@ package handlersimport ("context"+ "log/slog""net/http""time"@@ -218,6 +219,7 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC// Process OIDC callbackuserInfo, tokenResp, err := h.oidcService.HandleCallback(ctx, input.Body.Code, input.Body.State, input.OidcStateCookie, origin)if err != nil {+ slog.WarnContext(ctx, "OIDC callback failed", "error", err, "origin", origin, "state_present", input.Body.State != "", "code_present", input.Body.Code != "")return nil, huma.Error400BadRequest((&common.OidcCallbackError{Err: err}).Error())}diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex c2838585e..a85031217 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -72,19 +72,23 @@ type Settings struct {DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=internal;description=URI for Docker daemon"`// Security category- AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`- AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=security;description=How long user sessions remain active"`- AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=security;description=Set password strength requirements"`- AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration (deprecated - use individual fields)"`- OidcEnabled SettingVariable `key:"oidcEnabled,public,envOverride" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=security;description=Enable OpenID Connect (OIDC) authentication"`- OidcClientId SettingVariable `key:"oidcClientId,public,envOverride" meta:"label=OIDC Client ID;type=text;keywords=oidc,client,id,oauth,openid;category=security;description=OIDC provider client ID"`- OidcClientSecret SettingVariable `key:"oidcClientSecret,sensitive,envOverride" meta:"label=OIDC Client Secret;type=password;keywords=oidc,client,secret,oauth,openid;category=security;description=OIDC provider client secret"`- OidcIssuerUrl SettingVariable `key:"oidcIssuerUrl,public,envOverride" meta:"label=OIDC Issuer URL;type=text;keywords=oidc,issuer,url,oauth,openid,provider;category=security;description=OIDC provider issuer URL"`- 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"`+ AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`+ AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=security;description=How long user sessions remain active"`+ AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=security;description=Set password strength requirements"`+ AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration (deprecated - use individual fields)"`+ OidcEnabled SettingVariable `key:"oidcEnabled,public,envOverride" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=security;description=Enable OpenID Connect (OIDC) authentication"`+ OidcClientId SettingVariable `key:"oidcClientId,public,envOverride" meta:"label=OIDC Client ID;type=text;keywords=oidc,client,id,oauth,openid;category=security;description=OIDC provider client ID"`+ OidcClientSecret SettingVariable `key:"oidcClientSecret,sensitive,envOverride" meta:"label=OIDC Client Secret;type=password;keywords=oidc,client,secret,oauth,openid;category=security;description=OIDC provider client secret"`+ OidcIssuerUrl SettingVariable `key:"oidcIssuerUrl,public,envOverride" meta:"label=OIDC Issuer URL;type=text;keywords=oidc,issuer,url,oauth,openid,provider;category=security;description=OIDC provider issuer URL"`+ OidcAuthorizationEndpoint SettingVariable `key:"oidcAuthorizationEndpoint,envOverride" meta:"label=OIDC Authorization Endpoint;type=text;keywords=oidc,authorization,endpoint,oauth,openid;category=security;description=Override OIDC authorization endpoint"`+ OidcTokenEndpoint SettingVariable `key:"oidcTokenEndpoint,envOverride" meta:"label=OIDC Token Endpoint;type=text;keywords=oidc,token,endpoint,oauth,openid;category=security;description=Override OIDC token endpoint"`+ OidcUserinfoEndpoint SettingVariable `key:"oidcUserinfoEndpoint,envOverride" meta:"label=OIDC Userinfo Endpoint;type=text;keywords=oidc,userinfo,endpoint,oauth,openid;category=security;description=Override OIDC userinfo endpoint"`+ OidcJwksEndpoint SettingVariable `key:"oidcJwksEndpoint,envOverride" meta:"label=OIDC JWKS Endpoint;type=text;keywords=oidc,jwks,keys,endpoint,oauth,openid;category=security;description=Override OIDC JWKS endpoint"`+ 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 categoryMobileNavigationMode SettingVariable `key:"mobileNavigationMode,public,local" meta:"label=Mobile Navigation Mode;type=select;keywords=mode,style,type,floating,docked,position,layout,design,appearance,bottom;category=appearance;description=Choose between floating or docked navigation on mobile" catmeta:"id=appearance;title=Appearance;icon=appearance;url=/settings/appearance;description=Customize navigation, theme, and interface behavior"`diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 924706cfa..9475a241f 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -86,13 +86,17 @@ 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,- SkipTlsVerify: settings.OidcSkipTlsVerify.IsTrue(),+ ClientID: settings.OidcClientId.Value,+ ClientSecret: settings.OidcClientSecret.Value,+ IssuerURL: settings.OidcIssuerUrl.Value,+ AuthorizationEndpoint: settings.OidcAuthorizationEndpoint.Value,+ TokenEndpoint: settings.OidcTokenEndpoint.Value,+ UserinfoEndpoint: settings.OidcUserinfoEndpoint.Value,+ JwksURI: settings.OidcJwksEndpoint.Value,+ Scopes: settings.OidcScopes.Value,+ AdminClaim: settings.OidcAdminClaim.Value,+ AdminValue: settings.OidcAdminValue.Value,+ SkipTlsVerify: settings.OidcSkipTlsVerify.IsTrue(),}if oidcConfig.ClientID != "" || oidcConfig.IssuerURL != "" {@@ -279,45 +283,80 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo auth.Oireturn nil, false, err}- if user == nil {- // Check if merge accounts is enabled in settings- settings, settingsErr := s.settingsService.GetSettings(ctx)- mergeEnabled := settingsErr == nil && settings.OidcMergeAccounts.IsTrue()-- // If merge accounts is enabled, try to find existing user by email- if mergeEnabled && userInfo.Email != "" {- existingUser, emailErr := s.userService.GetUserByEmail(ctx, userInfo.Email)- if emailErr == nil && existingUser != nil {- // Only require email verification when we are actually merging into an existing account.- // Some providers omit `email_verified` for first-time users; that should not prevent user creation.- if !userInfo.EmailVerified {- return nil, false, errors.New("email not verified by OIDC provider; cannot merge accounts")- }-- // Found existing user with matching email - merge the accounts- slog.Info("Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)- if mergeErr := s.mergeOidcWithExistingUser(ctx, existingUser, userInfo, tokenResp); mergeErr != nil {- return nil, false, mergeErr- }- return existingUser, false, nil- }- }+ if user != nil {+ return s.updateExistingOidcUser(ctx, user, userInfo, tokenResp)+ }- // No existing user found, create new OIDC user- created, err := s.createOidcUser(ctx, userInfo, tokenResp)- if err != nil {- return nil, false, err- }- return created, true, nil+ mergedUser, merged, err := s.tryMergeOidcUser(ctx, userInfo, tokenResp)+ if err != nil {+ return nil, false, err+ }+ if merged {+ return mergedUser, false, nil}- if err := s.updateOidcUser(ctx, user, userInfo, tokenResp); err != nil {+ created, err := s.createOidcUser(ctx, userInfo, tokenResp)+ if err != nil {return nil, false, err}+ return created, true, nil+}+func (s *AuthService) updateExistingOidcUser(ctx context.Context, user *models.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*models.User, bool, error) {+ if err := s.updateOidcUser(ctx, user, userInfo, tokenResp); err != nil {+ return nil, false, err+ }return user, false, nil}+func (s *AuthService) tryMergeOidcUser(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*models.User, bool, error) {+ if userInfo.Email == "" || !s.isOidcMergeEnabled(ctx) {+ return nil, false, nil+ }++ existingUser, emailErr := s.userService.GetUserByEmail(ctx, userInfo.Email)+ if emailErr != nil {+ if errors.Is(emailErr, ErrUserNotFound) {+ return nil, false, nil+ }+ return nil, false, emailErr+ }+ if existingUser == nil {+ return nil, false, nil+ }++ if err := s.validateMergeEmailVerification(userInfo); err != nil {+ return nil, false, err+ }++ slog.Info("Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)+ if mergeErr := s.mergeOidcWithExistingUser(ctx, existingUser, userInfo, tokenResp); mergeErr != nil {+ return nil, false, mergeErr+ }+ return existingUser, true, nil+}++func (s *AuthService) isOidcMergeEnabled(ctx context.Context) bool {+ settings, settingsErr := s.settingsService.GetSettings(ctx)+ return settingsErr == nil && settings.OidcMergeAccounts.IsTrue()+}++func (s *AuthService) validateMergeEmailVerification(userInfo auth.OidcUserInfo) error {+ emailVerifiedPresent := false+ if userInfo.Extra != nil {+ if _, ok := userInfo.Extra["email_verified"]; ok {+ emailVerifiedPresent = true+ }+ }+ if emailVerifiedPresent && !userInfo.EmailVerified {+ return errors.New("email not verified by OIDC provider; cannot merge accounts")+ }+ if !emailVerifiedPresent {+ slog.Warn("OIDC email_verified claim missing; allowing merge", "email", userInfo.Email, "subject", userInfo.Subject)+ }+ return nil+}+func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*models.User, error) {now := time.Now()diff --git a/backend/internal/services/auth_service_test.go b/backend/internal/services/auth_service_test.goindex 89f1d5f1c..1e5fef43d 100644--- a/backend/internal/services/auth_service_test.go+++ b/backend/internal/services/auth_service_test.go@@ -341,6 +341,9 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_WithExistingUser_RetSubject: "sub-merge",Email: email,EmailVerified: false,+ Extra: map[string]any{+ "email_verified": false,+ },}_, _, err = authSvc.findOrCreateOidcUser(ctx, userInfo, &auth.OidcTokenResponse{AccessToken: "at"})@@ -351,3 +354,48 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_WithExistingUser_Retrequire.NoError(t, err)require.True(t, fetched.OidcSubjectId == nil || *fetched.OidcSubjectId == "")}++func TestFindOrCreateOidcUser_MergeEnabled_EmailVerificationMissing_WithExistingUser_Merges(t *testing.T) {+ ctx := context.Background()+ db := setupAuthServiceTestDB(t)++ settingsSvc, err := NewSettingsService(ctx, db)+ require.NoError(t, err)+ require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))+ require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))++ userSvc := NewUserService(db)+ // Seed an existing local user with matching email+ email := "[email protected]"+ existing := &models.User{+ BaseModel: models.BaseModel{ID: "u1"},+ Username: "existing",+ Email: &email,+ Roles: models.StringSlice{"user"},+ }+ _, err = userSvc.CreateUser(ctx, existing)+ require.NoError(t, err)++ authSvc := newTestAuthService("")+ authSvc.userService = userSvc+ authSvc.settingsService = settingsSvc++ userInfo := auth.OidcUserInfo{+ Subject: "sub-merge-missing-verified",+ Email: email,+ EmailVerified: false,+ Extra: map[string]any{},+ }++ mergedUser, isNew, err := authSvc.findOrCreateOidcUser(ctx, userInfo, &auth.OidcTokenResponse{AccessToken: "at"})+ require.NoError(t, err)+ require.False(t, isNew)+ require.NotNil(t, mergedUser)+ require.Equal(t, existing.ID, mergedUser.ID)++ // Ensure existing user is linked+ fetched, err := userSvc.GetUserByID(ctx, existing.ID)+ require.NoError(t, err)+ require.NotNil(t, fetched.OidcSubjectId)+ require.Equal(t, userInfo.Subject, *fetched.OidcSubjectId)+}diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex 1605baf67..4c0165aaa 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -144,20 +144,37 @@ func (s *OidcService) ensureOpenIDScope(scopes []string) []string {return scopes}-func (s *OidcService) getOauth2Config(cfg *models.OidcConfig, provider *oidc.Provider, origin string) oauth2.Config {+func (s *OidcService) hasManualEndpoints(cfg *models.OidcConfig) bool {+ return cfg.AuthorizationEndpoint != "" || cfg.TokenEndpoint != "" || cfg.UserinfoEndpoint != ""+}++func (s *OidcService) getOauth2Config(cfg *models.OidcConfig, provider *oidc.Provider, origin string) (oauth2.Config, error) {scopes := strings.Fields(cfg.Scopes)if len(scopes) == 0 {scopes = []string{"email", "profile"}}scopes = s.ensureOpenIDScope(scopes)+ var endpoint oauth2.Endpoint+ if provider != nil {+ endpoint = provider.Endpoint()+ } else {+ endpoint = oauth2.Endpoint{+ AuthURL: cfg.AuthorizationEndpoint,+ TokenURL: cfg.TokenEndpoint,+ }+ }+ if endpoint.AuthURL == "" || endpoint.TokenURL == "" {+ return oauth2.Config{}, errors.New("authorization and token endpoints must be configured")+ }+return oauth2.Config{ClientID: cfg.ClientID,ClientSecret: cfg.ClientSecret,- Endpoint: provider.Endpoint(),+ Endpoint: endpoint,RedirectURL: s.GetOidcRedirectURL(origin),Scopes: scopes,- }+ }, nil}func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, origin string) (string, string, error) {@@ -167,17 +184,25 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, orreturn "", "", err}- 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)+ var provider *oidc.Provider+ if !s.hasManualEndpoints(config) {+ var err error+ 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)+ }}state := stringutils.GenerateRandomString(32)nonce := stringutils.GenerateRandomString(32)codeVerifier := stringutils.GenerateRandomString(128)- oauth2Config := s.getOauth2Config(config, provider, origin)+ oauth2Config, err := s.getOauth2Config(config, provider, origin)+ if err != nil {+ slog.Error("GenerateAuthURL: invalid OIDC endpoints", "error", err)+ return "", "", err+ }authURL := oauth2Config.AuthCodeURL(state,oauth2.SetAuthURLParam("nonce", nonce),@@ -244,7 +269,7 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oid// Use the custom HTTP client with the new contextproviderCtx := oidc.ClientContext(discoveryCtx, s.getHttpClient(skipTls))- provider, err := oidc.NewProvider(providerCtx, issuer)+ provider, discoveredIssuer, err := s.discoverProvider(providerCtx, issuer)if err != nil {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)@@ -252,11 +277,13 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oids.providerMutex.Lock()s.providerCache = provider+ // Cache based on the configured issuer to avoid repeated discovery on+ // trailing-slash-only mismatches.s.cachedIssuer = issuers.cachedSkipTls = skipTlss.providerMutex.Unlock()- slog.DebugContext(ctx, "getOrDiscoverProvider: provider cached", "issuer", issuer, "skipTls", skipTls)+ slog.DebugContext(ctx, "getOrDiscoverProvider: provider cached", "issuer", issuer, "effectiveIssuer", discoveredIssuer, "skipTls", skipTls)return provider, nil})@@ -267,8 +294,32 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oidreturn v.(*oidc.Provider), nil}+func (s *OidcService) discoverProvider(ctx context.Context, issuer string) (*oidc.Provider, string, error) {+ provider, err := oidc.NewProvider(ctx, issuer)+ if err == nil {+ return provider, issuer, nil+ }++ altIssuer := strings.TrimRight(issuer, "/")+ if altIssuer == issuer {+ altIssuer = issuer + "/"+ }++ slog.WarnContext(ctx, "getOrDiscoverProvider: retrying discovery with alternate issuer", "configured", issuer, "alternate", altIssuer)+ provider, altErr := oidc.NewProvider(ctx, altIssuer)+ if altErr == nil {+ return provider, altIssuer, nil+ }++ slog.ErrorContext(ctx, "getOrDiscoverProvider: discovery failed with alternate issuer", "issuer", altIssuer, "error", altErr)+ return nil, issuer, err+}+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)+ oauth2Config, err := s.getOauth2Config(cfg, provider, origin)+ if err != nil {+ return nil, err+ }providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))token, err := oauth2Config.Exchange(providerCtx, code, oauth2.VerifierOption(verifier))@@ -293,26 +344,42 @@ func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, p}}- userInfo, err := provider.UserInfo(providerCtx, oauth2.StaticTokenSource(token))- if err != nil {- slog.Debug("fetchClaims: userinfo endpoint call failed", "error", err)- if claims != nil {- return claims, nil- }- return nil, fmt.Errorf("failed to fetch userinfo: %w", err)- }-var userInfoClaims map[string]any- if err := userInfo.Claims(&userInfoClaims); err != nil {- slog.Warn("fetchClaims: failed to decode userinfo claims", "error", err)- if claims != nil {- return claims, nil+ switch {+ case provider != nil:+ userInfo, err := provider.UserInfo(providerCtx, oauth2.StaticTokenSource(token))+ if err != nil {+ slog.Debug("fetchClaims: userinfo endpoint call failed", "error", err)+ if claims != nil {+ return claims, nil+ }+ return nil, fmt.Errorf("failed to fetch userinfo: %w", err)+ }+ if err := userInfo.Claims(&userInfoClaims); err != nil {+ slog.Warn("fetchClaims: failed to decode userinfo claims", "error", err)+ if claims != nil {+ return claims, nil+ }+ return nil, fmt.Errorf("failed to decode userinfo claims: %w", err)+ }+ slog.Debug("fetchClaims: fetched userinfo claims successfully")+ case cfg.UserinfoEndpoint != "":+ manualClaims, err := s.fetchUserInfoClaims(providerCtx, cfg, token)+ if err != nil {+ slog.Debug("fetchClaims: userinfo endpoint call failed", "error", err)+ if claims != nil {+ return claims, nil+ }+ return nil, fmt.Errorf("failed to fetch userinfo: %w", err)}- return nil, fmt.Errorf("failed to decode userinfo claims: %w", err)+ userInfoClaims = manualClaims+ slog.Debug("fetchClaims: fetched userinfo claims successfully")+ case claims != nil:+ return claims, nil+ default:+ return nil, errors.New("userinfo endpoint not configured")}- slog.Debug("fetchClaims: fetched userinfo claims successfully")-if claims == nil {claims = make(map[string]any)}@@ -325,6 +392,46 @@ func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, preturn claims, nil}+func (s *OidcService) fetchUserInfoClaims(ctx context.Context, cfg *models.OidcConfig, token *oauth2.Token) (map[string]any, error) {+ if cfg.UserinfoEndpoint == "" {+ return nil, errors.New("userinfo endpoint not configured")+ }+ if token == nil || token.AccessToken == "" {+ return nil, errors.New("missing access token for userinfo request")+ }++ request, err := http.NewRequestWithContext(ctx, http.MethodGet, cfg.UserinfoEndpoint, nil)+ if err != nil {+ return nil, err+ }++ tokenType := token.TokenType+ if tokenType == "" {+ tokenType = "Bearer"+ }+ request.Header.Set("Authorization", fmt.Sprintf("%s %s", tokenType, token.AccessToken))+ request.Header.Set("Accept", "application/json")++ client := s.getHttpClient(cfg.SkipTlsVerify)+ resp, err := client.Do(request)+ if err != nil {+ return nil, err+ }+ defer resp.Body.Close()++ if resp.StatusCode < 200 || resp.StatusCode >= 300 {+ return nil, fmt.Errorf("userinfo endpoint returned status %d", resp.StatusCode)+ }++ var claims map[string]any+ decoder := json.NewDecoder(resp.Body)+ if err := decoder.Decode(&claims); err != nil {+ return nil, err+ }++ return claims, nil+}+func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState, origin string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {slog.Debug("HandleCallback: processing callback", "code_present", code != "", "state_present", state != "")@@ -339,9 +446,12 @@ func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedStareturn nil, nil, err}- provider, err := s.getOrDiscoverProvider(ctx, cfg)- if err != nil {- return nil, nil, err+ var provider *oidc.Provider+ if !s.hasManualEndpoints(cfg) {+ provider, err = s.getOrDiscoverProvider(ctx, cfg)+ if err != nil {+ return nil, nil, err+ }}token, err := s.exchangeToken(ctx, cfg, provider, code, stateData.CodeVerifier, origin)@@ -397,8 +507,17 @@ func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.ProviderverifierConfig.Now = time.Now}- verifier := provider.Verifier(verifierConfig)providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))+ var verifier *oidc.IDTokenVerifier+ if provider != nil {+ verifier = provider.Verifier(verifierConfig)+ } else {+ if cfg.JwksURI == "" {+ return nil, "", errors.New("jwks URI must be configured when using manual OIDC endpoints")+ }+ keySet := oidc.NewRemoteKeySet(providerCtx, cfg.JwksURI)+ verifier = oidc.NewVerifier(cfg.IssuerURL, keySet, verifierConfig)+ }idToken, err := verifier.Verify(providerCtx, rawIDToken)if err != nil {diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex d0a56ec61..30df942f2 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -112,6 +112,10 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {OidcClientId: models.SettingVariable{Value: ""},OidcClientSecret: models.SettingVariable{Value: ""},OidcIssuerUrl: models.SettingVariable{Value: ""},+ OidcAuthorizationEndpoint: models.SettingVariable{Value: ""},+ OidcTokenEndpoint: models.SettingVariable{Value: ""},+ OidcUserinfoEndpoint: models.SettingVariable{Value: ""},+ OidcJwksEndpoint: models.SettingVariable{Value: ""},OidcScopes: models.SettingVariable{Value: "openid email profile"},OidcAdminClaim: models.SettingVariable{Value: ""},OidcAdminValue: models.SettingVariable{Value: ""},diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelteindex ecfd62f93..d86c1fe7e 100644--- a/frontend/src/routes/(auth)/login/+page.svelte+++ b/frontend/src/routes/(auth)/login/+page.svelte@@ -151,6 +151,8 @@{m.auth_oidc_token_error()}{:else if data.error === 'user_processing_failed'}{m.auth_user_processing_failed()}+ {:else if data.errorMessage}+ {data.errorMessage}{:else}{m.auth_unexpected_error()}{/if}@@ -158,6 +160,14 @@</Alert.Root>{/if}+ {#if data.errorMessage && !data.error}+ <Alert.Root variant="destructive" class="bg-card/60 border backdrop-blur-2xl">+ <AlertIcon class="size-4" />+ <Alert.Title>{m.auth_login_problem_title()}</Alert.Title>+ <Alert.Description>{data.errorMessage}</Alert.Description>+ </Alert.Root>+ {/if}+{#if error}<Alert.Root variant="destructive" class="bg-card/60 border backdrop-blur-2xl"><AlertIcon class="size-4" />diff --git a/frontend/src/routes/(auth)/login/+page.ts b/frontend/src/routes/(auth)/login/+page.tsindex 3c83fd685..61ba0a612 100644--- a/frontend/src/routes/(auth)/login/+page.ts+++ b/frontend/src/routes/(auth)/login/+page.ts@@ -10,11 +10,14 @@ export const load = async ({ parent, url }) => {const redirectTo = url.searchParams.get('redirect') || '/dashboard';const error = url.searchParams.get('error');+ const errorMessage =+ url.searchParams.get('message') || url.searchParams.get('error_message') || url.searchParams.get('errorMessage');return {settings: data.settings,redirectTo,error,+ errorMessage,versionInformation: data.versionInformation};};diff --git a/frontend/src/routes/(auth)/oidc/callback/+page.svelte b/frontend/src/routes/(auth)/oidc/callback/+page.svelteindex ae76a2e56..f3b936790 100644--- a/frontend/src/routes/(auth)/oidc/callback/+page.svelte+++ b/frontend/src/routes/(auth)/oidc/callback/+page.svelte@@ -13,6 +13,14 @@let isProcessing = $state(true);let error = $state('');+ const buildLoginRedirect = (errorCode: string, message?: string) => {+ const params = new URLSearchParams({ error: errorCode });+ if (message) {+ params.set('message', message);+ }+ return `/login?${params.toString()}`;+ };+onMount(async () => {try {const code = page.url.searchParams.get('code');@@ -32,14 +40,14 @@}error = errorDescription || userMessage;- setTimeout(() => goto('/login?error=oidc_provider_error'), 3000);+ setTimeout(() => goto(buildLoginRedirect('oidc_provider_error', error)), 3000);isProcessing = false;return;}if (!code || !stateFromUrl) {error = m.auth_oidc_invalid_response();- setTimeout(() => goto('/login?error=oidc_invalid_response'), 3000);+ setTimeout(() => goto(buildLoginRedirect('oidc_invalid_response', error)), 3000);isProcessing = false;return;}@@ -54,8 +62,8 @@userMessage = m.auth_oidc_session_expired();}- error = userMessage;- setTimeout(() => goto('/login?error=oidc_auth_failed'), 3000);+ error = authResult.error || userMessage;+ setTimeout(() => goto(buildLoginRedirect('oidc_auth_failed', error)), 3000);isProcessing = false;return;}@@ -89,7 +97,7 @@finalizeLogin();} else {error = m.auth_oidc_user_info_missing();- setTimeout(() => goto('/login?error=oidc_user_info_missing'), 3000);+ setTimeout(() => goto(buildLoginRedirect('oidc_user_info_missing', error)), 3000);isProcessing = false;}} catch (err: any) {@@ -100,8 +108,9 @@userMessage = m.auth_oidc_network_error();}- error = userMessage;- setTimeout(() => goto('/login?error=oidc_callback_error'), 3000);+ const serverMessage = err?.message && !err.message.includes('Request failed') ? err.message : '';+ error = serverMessage || userMessage;+ setTimeout(() => goto(buildLoginRedirect('oidc_callback_error', error)), 3000);isProcessing = false;}});