Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: make sure oidc uses refresh tokens
Kyle Mendell9f185eba457f
diff --git a/backend/internal/api/auth_handler.go b/backend/internal/api/auth_handler.goindex 6a3a5a2d0..98cee9a46 100644--- a/backend/internal/api/auth_handler.go+++ b/backend/internal/api/auth_handler.go@@ -129,7 +129,6 @@ func (h *AuthHandler) Login(c *gin.Context) {return}- // Handle authentication errorsif err != nil {var statusCode intvar errorMsg stringdiff --git a/backend/internal/api/oidc_handler.go b/backend/internal/api/oidc_handler.goindex 507cc4095..1c45a2f8b 100644--- a/backend/internal/api/oidc_handler.go+++ b/backend/internal/api/oidc_handler.go@@ -108,13 +108,13 @@ func (h *OidcHandler) HandleOidcCallback(c *gin.Context) {c.SetCookie("oidc_state", "", -1, "/", "", c.Request.TLS != nil, true)- userInfo, err := h.oidcService.HandleCallback(c.Request.Context(), req.Code, req.State, encodedStateFromCookie)+ userInfo, tokenResp, err := h.oidcService.HandleCallback(c.Request.Context(), req.Code, req.State, encodedStateFromCookie)if err != nil {c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})return}- user, tokenPair, err := h.authService.OidcLogin(c.Request.Context(), *userInfo)+ user, tokenPair, err := h.authService.OidcLogin(c.Request.Context(), *userInfo, tokenResp)if err != nil {c.JSON(http.StatusInternalServerError, gin.H{"error": "Authentication failed"})returndiff --git a/backend/internal/models/user.go b/backend/internal/models/user.goindex d22e4b311..4c7517238 100644--- a/backend/internal/models/user.go+++ b/backend/internal/models/user.go@@ -13,6 +13,11 @@ type User struct {RequirePasswordChange bool `json:"requirePasswordChange" gorm:"column:require_password_change;default:false"`OidcSubjectId *string `json:"oidcSubjectId,omitempty" gorm:"column:oidc_subject_id"`LastLogin *time.Time `json:"lastLogin,omitempty" gorm:"column:last_login"`++ // OIDC provider tokens+ OidcAccessToken *string `json:"-" gorm:"type:text"`+ OidcRefreshToken *string `json:"-" gorm:"type:text"`+ OidcAccessTokenExpiresAt *time.Time `json:"-" gorm:"index"`BaseModel}diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 1ecb5e73e..b1f224ea4 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -206,10 +206,8 @@ func (s *AuthService) Login(ctx context.Context, username, password string) (*moreturn nil, nil, ErrInvalidCredentials}- // Check if password needs upgrade from bcrypt to Argon2if s.userService.NeedsPasswordUpgrade(user.PasswordHash) {if err := s.userService.UpgradePasswordHash(ctx, user.ID, password); err != nil {- // Log the error but don't fail the loginfmt.Printf("Warning: Failed to upgrade password hash for user %s: %v\n", user.ID, err)} else {fmt.Printf("Successfully upgraded password hash for user %s from bcrypt to Argon2\n", user.Username)@@ -243,43 +241,20 @@ func (s *AuthService) Login(ctx context.Context, username, password string) (*moreturn user, tokenPair, nil}-func (s *AuthService) OidcLogin(ctx context.Context, userInfo dto.OidcUserInfo) (*models.User, *TokenPair, error) {- oidcEnabled, err := s.IsOidcEnabled(ctx)- if err != nil {- return nil, nil, err- }-- if !oidcEnabled {- return nil, nil, ErrOidcAuthDisabled- }-+func (s *AuthService) OidcLogin(ctx context.Context, userInfo dto.OidcUserInfo, tokenResp *dto.OidcTokenResponse) (*models.User, *TokenPair, error) {if userInfo.Subject == "" {return nil, nil, errors.New("missing OIDC subject identifier")}user, err := s.userService.GetUserByOidcSubjectId(ctx, userInfo.Subject)-if err != nil && !errors.Is(err, ErrUserNotFound) {return nil, nil, err}isNewUser := false- if user != nil {- if userInfo.Name != "" && user.DisplayName == nil {- user.DisplayName = &userInfo.Name- }- if userInfo.Email != "" && user.Email == nil {- user.Email = &userInfo.Email- }-- now := time.Now()- user.LastLogin = &now+ now := time.Now()- if _, err := s.userService.UpdateUser(ctx, user); err != nil {- return nil, nil, err- }- } else {- isNewUser = true+ if user == nil {username := generateUsernameFromEmail(userInfo.Email, userInfo.Subject)var displayName string@@ -301,11 +276,54 @@ func (s *AuthService) OidcLogin(ctx context.Context, userInfo dto.OidcUserInfo)Email: &email,Roles: models.StringSlice{"user"},OidcSubjectId: &userInfo.Subject,+ LastLogin: &now,+ }++ // Persist provider tokens if present+ if tokenResp != nil {+ if tokenResp.AccessToken != "" {+ user.OidcAccessToken = &tokenResp.AccessToken+ }+ if tokenResp.RefreshToken != "" {+ user.OidcRefreshToken = &tokenResp.RefreshToken+ }+ if tokenResp.ExpiresIn > 0 {+ expiresAt := time.Now().Add(time.Duration(tokenResp.ExpiresIn) * time.Second)+ user.OidcAccessTokenExpiresAt = &expiresAt+ }}if _, err := s.userService.CreateUser(ctx, user); err != nil {return nil, nil, err}+ isNewUser = true+ } else {+ // Update optional fields when missing+ if userInfo.Name != "" && user.DisplayName == nil {+ user.DisplayName = &userInfo.Name+ }+ if userInfo.Email != "" && user.Email == nil {+ user.Email = &userInfo.Email+ }++ // Persist provider tokens if present+ if tokenResp != nil {+ if tokenResp.AccessToken != "" {+ user.OidcAccessToken = &tokenResp.AccessToken+ }+ if tokenResp.RefreshToken != "" {+ user.OidcRefreshToken = &tokenResp.RefreshToken+ }+ if tokenResp.ExpiresIn > 0 {+ expiresAt := time.Now().Add(time.Duration(tokenResp.ExpiresIn) * time.Second)+ user.OidcAccessTokenExpiresAt = &expiresAt+ }+ }++ user.LastLogin = &now+ if _, err := s.userService.UpdateUser(ctx, user); err != nil {+ return nil, nil, err+ }}tokenPair, err := s.generateTokenPair(ctx, user)@@ -318,7 +336,7 @@ func (s *AuthService) OidcLogin(ctx context.Context, userInfo dto.OidcUserInfo)"method": "oidc","newUser": isNewUser,"subject": userInfo.Subject,- "ipAddress": "",+ "ipAddress": getClientIP(ctx),}if logErr := s.eventService.LogUserEvent(ctx, models.EventTypeUserLogin, user.ID, user.Username, metadata); logErr != nil {fmt.Printf("Could not log OIDC user login action: %s\n", logErr)diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex ebc0c011a..c1b82c932 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -157,37 +157,74 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string) (sreturn authURL.String(), encodedState, nil}-func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState string) (*dto.OidcUserInfo, error) {+func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState string) (*dto.OidcUserInfo, *dto.OidcTokenResponse, error) {stateData, err := s.decodeState(storedState)if err != nil {- return nil, fmt.Errorf("failed to decode state: %w", err)+ return nil, nil, fmt.Errorf("failed to decode state: %w", err)}if state != stateData.State {- return nil, errors.New("invalid state parameter")+ return nil, nil, errors.New("invalid state parameter")}// Check if state is not too old (10 minutes max)if time.Since(stateData.CreatedAt) > 10*time.Minute {- return nil, errors.New("state has expired")+ return nil, nil, errors.New("state has expired")}config, err := s.getEffectiveConfig(ctx)if err != nil {- return nil, err+ return nil, nil, err}tokenResponse, err := s.exchangeCodeForTokens(ctx, config, code, stateData.CodeVerifier)if err != nil {- return nil, fmt.Errorf("failed to exchange code for tokens: %w", err)+ return nil, nil, fmt.Errorf("failed to exchange code for tokens: %w", err)}userInfo, err := s.getUserInfo(ctx, config, tokenResponse.AccessToken)if err != nil {- return nil, fmt.Errorf("failed to get user info: %w", err)+ return nil, nil, fmt.Errorf("failed to get user info: %w", err)+ }++ return userInfo, tokenResponse, nil+}++func (s *OidcService) RefreshToken(ctx context.Context, refreshToken string) (*dto.OidcTokenResponse, error) {+ config, err := s.getEffectiveConfig(ctx)+ if err != nil {+ return nil, err+ }++ data := url.Values{}+ data.Set("grant_type", "refresh_token")+ data.Set("refresh_token", refreshToken)+ data.Set("client_id", config.ClientID)+ data.Set("client_secret", config.ClientSecret)++ req, err := http.NewRequestWithContext(ctx, http.MethodPost, config.TokenEndpoint, strings.NewReader(data.Encode()))+ if err != nil {+ return nil, err+ }+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")+ req.Header.Set("Accept", "application/json")++ resp, err := s.httpClient.Do(req)+ if err != nil {+ return nil, err}+ defer resp.Body.Close()- return userInfo, nil+ if resp.StatusCode != http.StatusOK {+ bodyBytes, _ := io.ReadAll(resp.Body)+ return nil, fmt.Errorf("token endpoint returned %d on refresh: %s", resp.StatusCode, string(bodyBytes))+ }++ var tokenResponse dto.OidcTokenResponse+ if err := json.NewDecoder(resp.Body).Decode(&tokenResponse); err != nil {+ return nil, err+ }+ return &tokenResponse, nil}func (s *OidcService) exchangeCodeForTokens(ctx context.Context, config *models.OidcConfig, code, codeVerifier string) (*dto.OidcTokenResponse, error) {diff --git a/backend/resources/migrations/postgres/007_add_user_oidc_tokens.down.sql b/backend/resources/migrations/postgres/007_add_user_oidc_tokens.down.sqlnew file mode 100644index 000000000..4f67284c0--- /dev/null+++ b/backend/resources/migrations/postgres/007_add_user_oidc_tokens.down.sql@@ -0,0 +1,4 @@+ALTER TABLE IF EXISTS users+ DROP COLUMN IF EXISTS oidc_access_token,+ DROP COLUMN IF EXISTS oidc_refresh_token,+ DROP COLUMN IF EXISTS oidc_access_token_expires_at;\ No newline at end of filediff --git a/backend/resources/migrations/postgres/007_add_user_oidc_tokens.up.sql b/backend/resources/migrations/postgres/007_add_user_oidc_tokens.up.sqlnew file mode 100644index 000000000..85948648a--- /dev/null+++ b/backend/resources/migrations/postgres/007_add_user_oidc_tokens.up.sql@@ -0,0 +1,4 @@+ALTER TABLE IF EXISTS users+ ADD COLUMN IF NOT EXISTS oidc_access_token TEXT,+ ADD COLUMN IF NOT EXISTS oidc_refresh_token TEXT,+ ADD COLUMN IF NOT EXISTS oidc_access_token_expires_at TIMESTAMPTZ;\ No newline at end of filediff --git a/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.down.sql b/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.down.sqlnew file mode 100644index 000000000..cd2fc759a--- /dev/null+++ b/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.down.sql@@ -0,0 +1,2 @@+-- SQLite cannot DROP COLUMN directly. No-op down migration.+-- To rollback manually, recreate the users table without these columns and copy data back.\ No newline at end of filediff --git a/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.up.sql b/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.up.sqlnew file mode 100644index 000000000..7312312f9--- /dev/null+++ b/backend/resources/migrations/sqlite/007_add_user_oidc_tokens.up.sql@@ -0,0 +1,3 @@+ALTER TABLE users ADD COLUMN oidc_access_token TEXT;+ALTER TABLE users ADD COLUMN oidc_refresh_token TEXT;+ALTER TABLE users ADD COLUMN oidc_access_token_expires_at DATETIME;\ No newline at end of filediff --git a/frontend/src/lib/services/api/auth-api-service.ts b/frontend/src/lib/services/api/auth-api-service.tsindex 961ba64a3..d09d868b7 100644--- a/frontend/src/lib/services/api/auth-api-service.ts+++ b/frontend/src/lib/services/api/auth-api-service.ts@@ -18,6 +18,11 @@ export class AuthService extends BaseAPIService {userStore.setUser(user);+ if (browser) {+ await invalidateAll();+ goto('/auth/login');+ }+return user;} catch (error: any) {const errorMessage = error.response?.data?.error || 'Login failed';@@ -44,12 +49,9 @@ export class AuthService extends BaseAPIService {async getCurrentUser(): Promise<User | null> {try {const response = await this.api.get('/auth/me');- const user = response.data.data;+ const user = (response.data.user as User) || (response.data.data as User);- // Store user in the store- if (user) {- userStore.setUser(user);- }+ userStore.setUser(user);return user;} catch (error) {diff --git a/frontend/src/lib/utils/redirect.util.ts b/frontend/src/lib/utils/redirect.util.tsindex e7fb92084..915d94670 100644--- a/frontend/src/lib/utils/redirect.util.ts+++ b/frontend/src/lib/utils/redirect.util.ts@@ -19,12 +19,16 @@ const PROTECTED_RE = new RegExp(`^/(?:${PROTECTED_PREFIXES.map(escapeRe).join('|const isProtectedPath = (path: string) => {const result = PROTECTED_RE.test(path);+ console.log(`Testing path: "${path}" against regex | Result: ${result}`);+ console.log(`Regex pattern: ${PROTECTED_RE.source}`);return result;};export function getAuthRedirectPath(path: string, user: User | null, settings: Settings | null) {const isSignedIn = !!user;+ console.log(`Path: ${path}, isProtected: ${isProtectedPath(path)}, isSignedIn: ${isSignedIn}`);+const isUnauthenticatedOnlyPath =path === '/auth/login' ||path.startsWith('/auth/login/') ||diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.tsindex 41afe2e45..eda72dba2 100644--- a/frontend/src/routes/+layout.ts+++ b/frontend/src/routes/+layout.ts@@ -48,7 +48,6 @@ export const load = async () => {return {user,- isAuthenticated: !!user,settings,versionInformation,updateCheckDisableddiff --git a/frontend/src/routes/auth/login/+page.svelte b/frontend/src/routes/auth/login/+page.svelteindex 950e0dda0..3073d1f98 100644--- a/frontend/src/routes/auth/login/+page.svelte+++ b/frontend/src/routes/auth/login/+page.svelte@@ -46,7 +46,7 @@const redirectTo = data.redirectTo || '/dashboard';toast.success(`Welcome Back, ${user.displayName}`);await invalidateAll();- goto(redirectTo);+ goto(redirectTo, { replaceState: true });} catch (err) {error = err instanceof Error ? err.message : 'Login failed';} finally {diff --git a/frontend/src/routes/auth/login/+page.ts b/frontend/src/routes/auth/login/+page.tsindex f262c7228..3b20789cb 100644--- a/frontend/src/routes/auth/login/+page.ts+++ b/frontend/src/routes/auth/login/+page.ts@@ -3,8 +3,7 @@ import { redirect } from '@sveltejs/kit';export const load = async ({ parent, url }) => {const data = await parent();- // If already authenticated, redirect to dashboard- if (data.user && data.isAuthenticated) {+ if (data.user) {throw redirect(302, '/dashboard');}