Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: include version in jwt for auth sessions after updaing the server (#724)
Kyle Mendellc298d8233e06
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex 67d46a53d..724a275ad 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -11,5 +11,6 @@"prettier.documentSelectors": ["**/*.svelte"],"tasks.statusbar.default.hide": true,"tasks.statusbar.limit": 8,- "findUnusedExports.detectCircularImports": true+ "findUnusedExports.detectCircularImports": true,+ "github.copilot.chat.summarizeAgentConversationHistory.enabled": false}diff --git a/backend/internal/middleware/auth_middleware.go b/backend/internal/middleware/auth_middleware.goindex d08422e24..968db9c11 100644--- a/backend/internal/middleware/auth_middleware.go+++ b/backend/internal/middleware/auth_middleware.go@@ -1,6 +1,7 @@package middlewareimport (+ "errors""log/slog""net/http""strings"@@ -112,6 +113,16 @@ func (m *AuthMiddleware) managerAuth(c *gin.Context) {user, err := m.authService.VerifyToken(c.Request.Context(), token)if err != nil {+ if errors.Is(err, services.ErrTokenVersionMismatch) {+ cookie.ClearTokenCookie(c)+ c.JSON(http.StatusUnauthorized, models.APIError{+ Code: models.APIErrorCodeUnauthorized,+ Message: "Application has been updated. Please log in again.",+ })+ c.Abort()+ return+ }+if m.options.SuccessOptional {c.Next()returndiff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 17e3420f4..1b6c61d64 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -18,12 +18,13 @@ import ()var (- ErrInvalidCredentials = errors.New("invalid credentials")- ErrUserNotFound = errors.New("user not found")- ErrInvalidToken = errors.New("invalid token")- ErrExpiredToken = errors.New("token expired")- ErrLocalAuthDisabled = errors.New("local authentication is disabled")- ErrOidcAuthDisabled = errors.New("OIDC authentication is disabled")+ ErrInvalidCredentials = errors.New("invalid credentials")+ ErrUserNotFound = errors.New("user not found")+ ErrInvalidToken = errors.New("invalid token")+ ErrExpiredToken = errors.New("token expired")+ ErrTokenVersionMismatch = errors.New("token version mismatch")+ ErrLocalAuthDisabled = errors.New("local authentication is disabled")+ ErrOidcAuthDisabled = errors.New("OIDC authentication is disabled"))type TokenPair struct {@@ -46,6 +47,7 @@ type UserClaims struct {Email string `json:"email,omitempty"`DisplayName string `json:"display_name,omitempty"`Roles []string `json:"roles"`+ AppVersion string `json:"app_version,omitempty"`}type AuthService struct {@@ -479,6 +481,14 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*modreturn nil, errors.New("missing user ID in token")}+ if claims.AppVersion != "" && claims.AppVersion != config.Version {+ slog.InfoContext(ctx, "Token version mismatch detected",+ "tokenVersion", claims.AppVersion,+ "currentVersion", config.Version,+ "user", claims.Username)+ return nil, ErrTokenVersionMismatch+ }+user := &models.User{BaseModel: models.BaseModel{ID: claims.ID},Username: claims.Username,@@ -531,9 +541,10 @@ func (s *AuthService) generateTokenPair(ctx context.Context, user *models.User)IssuedAt: jwt.NewNumericDate(time.Now()),ExpiresAt: jwt.NewNumericDate(accessTokenExpiry),},- UserID: user.ID,- Username: user.Username,- Roles: []string(user.Roles),+ UserID: user.ID,+ Username: user.Username,+ Roles: []string(user.Roles),+ AppVersion: config.Version,}if user.Email != nil {diff --git a/backend/internal/services/auth_service_test.go b/backend/internal/services/auth_service_test.goindex a7a979427..32a5ea4aa 100644--- a/backend/internal/services/auth_service_test.go+++ b/backend/internal/services/auth_service_test.go@@ -46,6 +46,7 @@ func makeAccessToken(t *testing.T, secret []byte, subject string, id string, useRoles: roles,Email: email,DisplayName: displayName,+ AppVersion: config.Version,}tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)signed, err := tok.SignedString(secret)@@ -173,6 +174,23 @@ func TestPersistOidcTokens_SetsFields(t *testing.T) {}}+func TestVerifyToken_VersionMismatch(t *testing.T) {+ s := newTestAuthService("")+ exp := time.Now().Add(5 * time.Minute)++ oldVersion := config.Version+ config.Version = "1.0.0"+ token := makeAccessToken(t, s.jwtSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)+ config.Version = "2.0.0"++ _, err := s.VerifyToken(context.Background(), token)+ if !errors.Is(err, ErrTokenVersionMismatch) {+ t.Errorf("want ErrTokenVersionMismatch, got %v", err)+ }++ config.Version = oldVersion+}+func TestGetOidcConfigurationStatus(t *testing.T) {// Disableds := newTestAuthService("")diff --git a/frontend/src/lib/services/api-service.ts b/frontend/src/lib/services/api-service.tsindex 6e2901975..15a5d716d 100644--- a/frontend/src/lib/services/api-service.ts+++ b/frontend/src/lib/services/api-service.ts@@ -1,4 +1,20 @@import axios, { type AxiosResponse } from 'axios';+import { toast } from 'svelte-sonner';++function extractServerMessage(data: any, includeErrors = false): string | undefined {+ const inner = (data && typeof data === 'object' ? ((data as any).data ?? data) : data) as any;+ if (typeof inner === 'string') {+ return inner;+ }+ if (inner) {+ const msg = inner.error || inner.message || inner.error_description;+ if (msg) return msg;+ if (includeErrors && Array.isArray(inner.errors) && inner.errors.length) {+ return inner.errors[0]?.message || inner.errors[0];+ }+ }+ return undefined;+}abstract class BaseAPIService {api = axios.create({@@ -17,6 +33,9 @@ abstract class BaseAPIService {console.log(error);const status = error?.response?.status;if (status === 401 && typeof window !== 'undefined') {+ const serverMsg = extractServerMessage(error?.response?.data);+ const isVersionMismatch = serverMsg?.toLowerCase().includes('application has been updated');+let reqUrl: string = error?.config?.url ?? '';const baseURL: string = error?.config?.baseURL ?? this.api.defaults.baseURL ?? '';try {@@ -24,7 +43,6 @@ abstract class BaseAPIService {const u = new URL(reqUrl);reqUrl = u.pathname;} else if (baseURL && /^https?:\/\//i.test(baseURL)) {- // if baseURL is absolute and url is relative, construct full url then extract pathnameconst u = new URL(reqUrl, baseURL);reqUrl = u.pathname;}@@ -50,27 +68,18 @@ abstract class BaseAPIService {const isOnAuthPage = pathname.startsWith('/auth');if (!isAuthApi && !isOnAuthPage) {+ if (isVersionMismatch) {+ toast.info('Application has been updated. Please log in again.');+ }const redirectTo = encodeURIComponent(pathname);- // Hard replace to avoid history pollutionwindow.location.replace(`/auth/login?redirect=${redirectTo}`);- // Stop further promise chainreturn new Promise(() => {});}}try {- const data = error?.response?.data;- const inner = (data && typeof data === 'object' ? ((data as any).data ?? data) : data) as any;- let serverMsg: string | undefined;- if (typeof inner === 'string') {- serverMsg = inner;- } else if (inner) {- serverMsg = inner.error || inner.message || inner.error_description;- if (!serverMsg && Array.isArray(inner.errors) && inner.errors.length) {- serverMsg = inner.errors[0]?.message || inner.errors[0];- }- }- if (serverMsg && typeof serverMsg === 'string') {+ const serverMsg = extractServerMessage(error?.response?.data, true);+ if (serverMsg) {error.message = serverMsg;}} catch {