Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: store user sessions in database with proper jti (#2590)
Kyle Mendella22c548e3e9c
diff --git a/backend/api/buildables.go b/backend/api/buildables.goindex 04d71fb37..5bffca36f 100644--- a/backend/api/buildables.go+++ b/backend/api/buildables.go@@ -63,7 +63,10 @@ func registerAutoLoginRoutes(apiGroup *echo.Group, authService *services.AuthSerreturn c.JSON(http.StatusInternalServerError, base.ErrorResponse{Error: "auto-login password not configured"})}- userModel, tokenPair, err := authService.Login(c.Request().Context(), autoLoginConfig.Username, password)+ userModel, tokenPair, err := authService.Login(c.Request().Context(), autoLoginConfig.Username, password, auth.SessionMeta{+ UserAgent: c.Request().UserAgent(),+ IPAddress: c.RealIP(),+ })if err != nil {switch {case errors.Is(err, services.ErrInvalidCredentials):diff --git a/backend/api/handlers/auth.go b/backend/api/handlers/auth.goindex 4e80eaca5..b75c4cb8b 100644--- a/backend/api/handlers/auth.go+++ b/backend/api/handlers/auth.go@@ -3,6 +3,7 @@ package handlersimport ("context""errors"+ "log/slog""net/http""time"@@ -27,7 +28,8 @@ type AuthHandler struct {// These wrap the types from the types package for Huma's input/output handling.type LoginInput struct {- Body auth.Login+ UserAgent string `header:"User-Agent"`+ Body auth.Login}type LoginOutput struct {@@ -41,7 +43,8 @@ type LogoutOutput struct {}type RefreshTokenInput struct {- Body auth.Refresh+ UserAgent string `header:"User-Agent"`+ Body auth.Refresh}type RefreshTokenOutput struct {@@ -140,7 +143,7 @@ func (h *AuthHandler) Login(ctx context.Context, input *LoginInput) (*LoginOutpureturn nil, huma.Error400BadRequest((&common.LocalAuthDisabledError{}).Error())}- userModel, tokenPair, err := h.authService.Login(ctx, input.Body.Username, input.Body.Password)+ userModel, tokenPair, err := h.authService.Login(ctx, input.Body.Username, input.Body.Password, sessionMetaFromContextInternal(ctx, input.UserAgent))if err != nil {switch {case errors.Is(err, services.ErrInvalidCredentials):@@ -177,6 +180,11 @@ func (h *AuthHandler) Login(ctx context.Context, input *LoginInput) (*LoginOutpu// Logout clears the authentication session.func (h *AuthHandler) Logout(ctx context.Context, input *struct{}) (*LogoutOutput, error) {if h.authService != nil {+ if sessionID, exists := humamw.GetCurrentSessionIDFromContext(ctx); exists {+ if err := h.authService.RevokeSession(ctx, sessionID); err != nil {+ slog.ErrorContext(ctx, "Failed to revoke session on logout; clearing cookie anyway", "sessionID", sessionID, "error", err)+ }+ }if userModel, exists := humamw.GetCurrentUserFromContext(ctx); exists {h.authService.LogLogout(ctx, userModel)}@@ -228,10 +236,10 @@ func (h *AuthHandler) RefreshToken(ctx context.Context, input *RefreshTokenInputreturn nil, huma.Error500InternalServerError("service not available")}- tokenPair, err := h.authService.RefreshToken(ctx, input.Body.RefreshToken)+ tokenPair, err := h.authService.RefreshToken(ctx, input.Body.RefreshToken, sessionMetaFromContextInternal(ctx, input.UserAgent))if err != nil {switch {- case errors.Is(err, services.ErrInvalidToken), errors.Is(err, services.ErrExpiredToken):+ case errors.Is(err, services.ErrInvalidToken), errors.Is(err, services.ErrExpiredToken), common.IsTokenValidationError(err), common.IsSessionRevokedError(err), errors.Is(err, services.ErrTokenVersionMismatch):return nil, huma.Error401Unauthorized((&common.InvalidTokenError{}).Error())default:return nil, huma.Error500InternalServerError((&common.TokenRefreshError{Err: err}).Error())@@ -254,6 +262,13 @@ func (h *AuthHandler) RefreshToken(ctx context.Context, input *RefreshTokenInput}, nil}+func sessionMetaFromContextInternal(ctx context.Context, userAgent string) auth.SessionMeta {+ return auth.SessionMeta{+ UserAgent: userAgent,+ IPAddress: humamw.GetRemoteAddrFromContext(ctx),+ }+}+// ChangePassword changes the current user's password.func (h *AuthHandler) ChangePassword(ctx context.Context, input *ChangePasswordInput) (*ChangePasswordOutput, error) {if h.authService == nil {diff --git a/backend/api/handlers/oidc.go b/backend/api/handlers/oidc.goindex a07135f9b..d508deba5 100644--- a/backend/api/handlers/oidc.go+++ b/backend/api/handlers/oidc.go@@ -32,6 +32,7 @@ type OidcHeaders struct {XForwardedHost string `header:"X-Forwarded-Host"`XForwardedProto string `header:"X-Forwarded-Proto"`Host string `header:"Host"`+ UserAgent string `header:"User-Agent"`}type GetOidcStatusInput struct{}@@ -76,7 +77,8 @@ type InitiateDeviceAuthOutput struct {}type ExchangeDeviceTokenInput struct {- Body auth.OidcDeviceTokenRequest+ UserAgent string `header:"User-Agent"`+ Body auth.OidcDeviceTokenRequest}type ExchangeDeviceTokenOutput struct {@@ -281,7 +283,7 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC}// Complete login- userModel, tokenPair, err := h.authService.OidcLogin(ctx, *userInfo, tokenResp)+ userModel, tokenPair, err := h.authService.OidcLogin(ctx, *userInfo, tokenResp, sessionMetaFromContextInternal(ctx, input.UserAgent))if err != nil {return nil, huma.Error500InternalServerError((&common.AuthFailedError{Err: err}).Error())}@@ -369,7 +371,7 @@ func (h *OidcHandler) ExchangeDeviceToken(ctx context.Context, input *ExchangeDe}}- userModel, tokenPair, err := h.authService.OidcLogin(ctx, *userInfo, tokenResp)+ userModel, tokenPair, err := h.authService.OidcLogin(ctx, *userInfo, tokenResp, sessionMetaFromContextInternal(ctx, input.UserAgent))if err != nil {return nil, huma.Error500InternalServerError((&common.AuthFailedError{Err: err}).Error())}diff --git a/backend/api/handlers/templates_test.go b/backend/api/handlers/templates_test.goindex afa1552ba..274dee874 100644--- a/backend/api/handlers/templates_test.go+++ b/backend/api/handlers/templates_test.go@@ -123,7 +123,7 @@ func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client) *echo.Echdb, err := gorm.Open(glsqlite.Open("file:"+t.Name()+"?mode=memory&cache=shared"), &gorm.Config{})require.NoError(t, err)- require.NoError(t, db.AutoMigrate(&models.User{}))+ require.NoError(t, db.AutoMigrate(&models.User{}, &models.UserSession{}))databaseDB := &database.DB{DB: db}userService := services.NewUserService(databaseDB)@@ -133,8 +133,15 @@ func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client) *echo.EchRoles: models.StringSlice{"admin"},})require.NoError(t, err)-- authService := services.NewAuthService(userService, nil, nil, "test-secret", &config.Config{})+ require.NoError(t, db.Create(&models.UserSession{+ BaseModel: models.BaseModel{ID: "session-1"},+ UserID: "user-1",+ RefreshTokenHash: "template-test-refresh-hash",+ LastUsedAt: time.Now(),+ ExpiresAt: time.Now().Add(time.Hour),+ }).Error)++ authService := services.NewAuthService(userService, nil, nil, services.NewSessionService(databaseDB), "test-secret", &config.Config{})templateService := services.NewTemplateService(context.Background(), nil, httpClient, nil)router := echo.New()@@ -168,17 +175,16 @@ func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client) *echo.Echfunc makeTemplateFetchToken(t *testing.T, secret string, userID, username string) string {t.Helper()- claims := services.UserClaims{- RegisteredClaims: jwt.RegisteredClaims{- ID: userID,- Subject: "access",- IssuedAt: jwt.NewNumericDate(time.Now()),- ExpiresAt: jwt.NewNumericDate(time.Now().Add(5 * time.Minute)),- },- UserID: userID,- Username: username,- Roles: []string{"admin"},- AppVersion: config.Version,+ claims := jwt.MapClaims{+ "jti": userID,+ "sub": "access",+ "iat": jwt.NewNumericDate(time.Now()).Unix(),+ "exp": jwt.NewNumericDate(time.Now().Add(5 * time.Minute)).Unix(),+ "user_id": userID,+ "sid": "session-1",+ "username": username,+ "roles": []string{"admin"},+ "app_version": config.Version,}token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)diff --git a/backend/api/middleware/auth.go b/backend/api/middleware/auth.goindex 6bd8cff4f..4c4d093b3 100644--- a/backend/api/middleware/auth.go+++ b/backend/api/middleware/auth.go@@ -7,6 +7,7 @@ import ("strings""github.com/danielgtaylor/huma/v2"+ "github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services"@@ -22,6 +23,8 @@ const (ContextKeyUserID ContextKey = "userID"// ContextKeyCurrentUser is the context key for the authenticated user model.ContextKeyCurrentUser ContextKey = "currentUser"+ // ContextKeyCurrentSessionID is the context key for the authenticated session ID.+ ContextKeyCurrentSessionID ContextKey = "currentSessionID"// ContextKeyUserIsAdmin is the context key for whether the user is an admin.ContextKeyUserIsAdmin ContextKey = "userIsAdmin"// ContextKeyRemoteAddr is the context key for the request remote address.@@ -40,6 +43,12 @@ func GetCurrentUserFromContext(ctx context.Context) (*models.User, bool) {return u, ok}+// GetCurrentSessionIDFromContext retrieves the current session ID from the context.+func GetCurrentSessionIDFromContext(ctx context.Context) (string, bool) {+ sessionID, ok := ctx.Value(ContextKeyCurrentSessionID).(string)+ return sessionID, ok+}+// IsAdminFromContext checks if the current user is an admin.func IsAdminFromContext(ctx context.Context) bool {isAdmin, ok := ctx.Value(ContextKeyUserIsAdmin).(bool)@@ -105,16 +114,16 @@ func parseSecurityRequirementsInternal(api huma.API, ctx operationProvider) secu// authenticated user on success, or the underlying error from VerifyToken so// the caller can distinguish a missing/invalid token from a token-version// mismatch (which requires clearing the stale cookie).-func tryBearerAuthInternal(ctx huma.Context, authService *services.AuthService) (*models.User, error) {+func tryBearerAuthInternal(ctx huma.Context, authService *services.AuthService) (*models.User, string, error) {token := extractBearerTokenInternal(ctx)if token == "" {- return nil, nil+ return nil, "", nil}- user, err := authService.VerifyToken(ctx.Context(), token)+ user, sessionID, err := authService.VerifyToken(ctx.Context(), token)if err != nil {- return nil, err+ return nil, "", err}- return user, nil+ return user, sessionID, nil}// tryApiKeyAuthInternal checks if API key authentication should be allowed through.@@ -246,16 +255,11 @@ func NewAuthBridge(api huma.API, authService *services.AuthService, apiKeyServic}if reqs.bearerAuth {- user, err := tryBearerAuthInternal(ctx, authService)- if err == nil && user != nil {- newCtx := setUserInContextInternal(ctx.Context(), user)- ctx = huma.WithContext(ctx, newCtx)- next(ctx)- return- }- if errors.Is(err, services.ErrTokenVersionMismatch) {- ctx.AppendHeader("Set-Cookie", cookie.BuildClearTokenCookieStringFor(ctx.TLS() != nil))- _ = huma.WriteErr(api, ctx, http.StatusUnauthorized, "Application has been updated. Please log in again.")+ nextCtx, handled := handleBearerAuthInternal(api, ctx, authService)+ if handled {+ if nextCtx != nil {+ next(nextCtx)+ }return}}@@ -265,6 +269,21 @@ func NewAuthBridge(api huma.API, authService *services.AuthService, apiKeyServic}}+func handleBearerAuthInternal(api huma.API, ctx huma.Context, authService *services.AuthService) (huma.Context, bool) {+ user, sessionID, err := tryBearerAuthInternal(ctx, authService)+ if err == nil && user != nil {+ newCtx := setUserInContextInternal(ctx.Context(), user)+ newCtx = context.WithValue(newCtx, ContextKeyCurrentSessionID, sessionID)+ return huma.WithContext(ctx, newCtx), true+ }+ if errors.Is(err, services.ErrTokenVersionMismatch) || common.IsSessionRevokedError(err) || common.IsTokenValidationError(err) {+ ctx.AppendHeader("Set-Cookie", cookie.BuildClearTokenCookieStringFor(ctx.TLS() != nil))+ _ = huma.WriteErr(api, ctx, http.StatusUnauthorized, "Session expired. Please log in again.")+ return nil, true+ }+ return nil, false+}+// extractBearerTokenInternal extracts the JWT token from Authorization header or cookie.func extractBearerTokenInternal(ctx huma.Context) string {// Try Authorization header firstdiff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.goindex f5c353384..7d169c203 100644--- a/backend/internal/bootstrap/jobs_bootstrap.go+++ b/backend/internal/bootstrap/jobs_bootstrap.go@@ -34,6 +34,9 @@ func registerJobs(appCtx context.Context, newScheduler *pkg_scheduler.JobScheduleventCleanupJob := pkg_scheduler.NewEventCleanupJob(appServices.Event, appServices.Settings)newScheduler.RegisterJob(eventCleanupJob)+ expiredSessionsCleanupJob := pkg_scheduler.NewExpiredSessionsCleanupJob(appServices.Session, appServices.Settings)+ newScheduler.RegisterJob(expiredSessionsCleanupJob)+scheduledPruneJob := pkg_scheduler.NewScheduledPruneJob(appServices.System, appServices.Settings, appServices.Notification)newScheduler.RegisterJob(scheduledPruneJob)diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.goindex 5074f9ae5..6298c5f95 100644--- a/backend/internal/bootstrap/router_bootstrap.go+++ b/backend/internal/bootstrap/router_bootstrap.go@@ -107,7 +107,7 @@ func createAuthValidatorInternal(appServices *Services) middleware.AuthValidatorreturn false}- user, err := appServices.Auth.VerifyToken(ctx, token)+ user, _, err := appServices.Auth.VerifyToken(ctx, token)return err == nil && user != nil}}diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.goindex 2f71f8d75..c33e90c13 100644--- a/backend/internal/bootstrap/services_bootstrap.go+++ b/backend/internal/bootstrap/services_bootstrap.go@@ -30,6 +30,7 @@ type Services struct {Port *services.PortServiceSwarm *services.SwarmServiceImageUpdate *services.ImageUpdateService+ Session *services.SessionServiceAuth *services.AuthServiceOidc *services.OidcServiceDocker *services.DockerClientService@@ -68,6 +69,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.ConfigdockerClient := services.NewDockerClientService(db, cfg, svcs.Settings)svcs.Docker = dockerClientsvcs.User = services.NewUserService(db)+ svcs.Session = services.NewSessionService(db)svcs.ApiKey = services.NewApiKeyService(db, svcs.User)svcs.ContainerRegistry = services.NewContainerRegistryService(db, func(ctx context.Context) (services.RegistryDaemonClient, error) {return dockerClient.GetClient(ctx)@@ -100,7 +102,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Configsvcs.Port = services.NewPortService(svcs.Docker)svcs.Swarm = services.NewSwarmService(svcs.Docker, svcs.Settings, svcs.KV, svcs.ContainerRegistry, svcs.Environment)svcs.Template = services.NewTemplateService(ctx, db, httpClient, svcs.Settings)- svcs.Auth = services.NewAuthService(svcs.User, svcs.Settings, svcs.Event, cfg.JWTSecret, cfg)+ svcs.Auth = services.NewAuthService(svcs.User, svcs.Settings, svcs.Event, svcs.Session, cfg.JWTSecret, cfg)svcs.Oidc = services.NewOidcService(svcs.Auth, svcs.Settings, cfg, httpClient)svcs.System = services.NewSystemService(db, svcs.Docker, svcs.Container, svcs.Image, svcs.Volume, svcs.Network, svcs.Settings)svcs.SystemUpgrade = services.NewSystemUpgradeService(svcs.Docker, svcs.Version, svcs.Event, svcs.Settings)diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex f27ce6f38..b945c3b6d 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -1,6 +1,9 @@package common-import "fmt"+import (+ "errors"+ "fmt"+)type AuthSettingsCheckError struct {Err error@@ -58,6 +61,57 @@ func (e *InvalidTokenError) Error() string {return "Invalid or expired refresh token"}+type InvalidTokenClaimsError struct{}++func (e *InvalidTokenClaimsError) Error() string {+ return "Invalid token claims"+}++type AccessTokenSubjectError struct{}++func (e *AccessTokenSubjectError) Error() string {+ return "Not an access token"+}++type RefreshTokenSubjectError struct{}++func (e *RefreshTokenSubjectError) Error() string {+ return "Not a refresh token"+}++type MissingTokenUserIDError struct{}++func (e *MissingTokenUserIDError) Error() string {+ return "Missing user ID in token"+}++type MissingRefreshTokenIDError struct{}++func (e *MissingRefreshTokenIDError) Error() string {+ return "Missing refresh token ID"+}++type MissingTokenSessionIDError struct{}++func (e *MissingTokenSessionIDError) Error() string {+ return "Missing session ID in token"+}++type SessionServiceUnavailableError struct{}++func (e *SessionServiceUnavailableError) Error() string {+ return "Session service is not configured"+}++func IsTokenValidationError(err error) bool {+ return isErrorTypeInternal[*InvalidTokenClaimsError](err) ||+ isErrorTypeInternal[*AccessTokenSubjectError](err) ||+ isErrorTypeInternal[*RefreshTokenSubjectError](err) ||+ isErrorTypeInternal[*MissingTokenUserIDError](err) ||+ isErrorTypeInternal[*MissingRefreshTokenIDError](err) ||+ isErrorTypeInternal[*MissingTokenSessionIDError](err)+}+type TokenRefreshError struct {Err error}@@ -66,6 +120,21 @@ func (e *TokenRefreshError) Error() string {return "Failed to refresh token"}+type SessionRevokedError struct{}++func (e *SessionRevokedError) Error() string {+ return "Session has been revoked"+}++func IsSessionRevokedError(err error) bool {+ return isErrorTypeInternal[*SessionRevokedError](err)+}++func isErrorTypeInternal[T error](err error) bool {+ var target T+ return errors.As(err, &target)+}+type PasswordRequiredError struct{}func (e *PasswordRequiredError) Error() string {diff --git a/backend/internal/configschema/schema_test.go b/backend/internal/configschema/schema_test.goindex 09b2ea2f5..378835432 100644--- a/backend/internal/configschema/schema_test.go+++ b/backend/internal/configschema/schema_test.go@@ -298,6 +298,7 @@ var expectedSettingOverrideKeys = []string{"enableGravatar","environmentHealthInterval","eventCleanupInterval",+ "expiredSessionsCleanupInterval","followProjectSymlinks","gitOperationTimeout","gitSyncMaxBinarySizeMb",diff --git a/backend/internal/middleware/auth_middleware.go b/backend/internal/middleware/auth_middleware.goindex a314e4f76..ac59a126d 100644--- a/backend/internal/middleware/auth_middleware.go+++ b/backend/internal/middleware/auth_middleware.go@@ -7,6 +7,7 @@ import ("net/http""strings"+ "github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services"@@ -160,13 +161,13 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c echo.Context, next e})}- user, err := m.authService.VerifyToken(ctx, token)+ user, sessionID, err := m.authService.VerifyToken(ctx, token)if err != nil {- if errors.Is(err, services.ErrTokenVersionMismatch) {+ if errors.Is(err, services.ErrTokenVersionMismatch) || common.IsSessionRevokedError(err) || common.IsTokenValidationError(err) {cookie.ClearTokenCookie(c.Response().Writer, req)return c.JSON(http.StatusUnauthorized, models.APIError{Code: models.APIErrorCodeUnauthorized,- Message: "Application has been updated. Please log in again.",+ Message: "Session expired. Please log in again.",})}@@ -189,6 +190,7 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c echo.Context, next ec.Set("userID", user.ID)c.Set("currentUser", user)+ c.Set("currentSessionID", sessionID)c.Set("userIsAdmin", isAdmin)return next(c)}diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 41b3f7b3d..9e5b5c209 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -82,14 +82,15 @@ type Settings struct {OledMode SettingVariable `key:"oledMode,public,local" meta:"label=OLED Mode;type=boolean;keywords=oled,dark,theme,black,amoled,appearance,display;category=general;description=Use true-black backgrounds for OLED displays (only active in dark mode)"`// Docker category- AutoUpdate SettingVariable `key:"autoUpdate" meta:"label=Auto Update;type=boolean;keywords=auto,update,automatic,upgrade,refresh,restart,deploy;category=internal;description=Automatically update containers when new images are available"`- AutoUpdateInterval SettingVariable `key:"autoUpdateInterval" meta:"label=Auto Update Interval;type=cron;keywords=auto,update,interval,frequency,schedule,automatic,timing;category=internal;description=How often to check for automatic updates (cron expression)"`- AutoUpdateExcludedContainers SettingVariable `key:"autoUpdateExcludedContainers" meta:"label=Excluded Containers;type=text;keywords=exclude,containers,ignore,skip;category=internal;description=Comma-separated list of containers to exclude from auto-update"`- PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=internal;description=Enable automatic checking for image updates"`- PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=cron;keywords=interval,frequency,schedule,time,minutes,period,delay;category=internal;description=How often to check for image updates (cron expression)"`- DockerClientRefreshInterval SettingVariable `key:"dockerClientRefreshInterval" meta:"label=Docker Client Refresh Interval;type=cron;keywords=docker,client,refresh,daemon,api,version,reconnect,renegotiate,schedule;category=internal;description=How often to refresh the cached Docker client API version (cron expression)"`- EventCleanupInterval SettingVariable `key:"eventCleanupInterval" meta:"label=Event Cleanup Interval;type=cron;keywords=events,cleanup,retention,interval,frequency,schedule,history,logs,jobs;description=How often to delete old events (cron expression)"`- AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`+ AutoUpdate SettingVariable `key:"autoUpdate" meta:"label=Auto Update;type=boolean;keywords=auto,update,automatic,upgrade,refresh,restart,deploy;category=internal;description=Automatically update containers when new images are available"`+ AutoUpdateInterval SettingVariable `key:"autoUpdateInterval" meta:"label=Auto Update Interval;type=cron;keywords=auto,update,interval,frequency,schedule,automatic,timing;category=internal;description=How often to check for automatic updates (cron expression)"`+ AutoUpdateExcludedContainers SettingVariable `key:"autoUpdateExcludedContainers" meta:"label=Excluded Containers;type=text;keywords=exclude,containers,ignore,skip;category=internal;description=Comma-separated list of containers to exclude from auto-update"`+ PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=internal;description=Enable automatic checking for image updates"`+ PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=cron;keywords=interval,frequency,schedule,time,minutes,period,delay;category=internal;description=How often to check for image updates (cron expression)"`+ DockerClientRefreshInterval SettingVariable `key:"dockerClientRefreshInterval" meta:"label=Docker Client Refresh Interval;type=cron;keywords=docker,client,refresh,daemon,api,version,reconnect,renegotiate,schedule;category=internal;description=How often to refresh the cached Docker client API version (cron expression)"`+ EventCleanupInterval SettingVariable `key:"eventCleanupInterval" meta:"label=Event Cleanup Interval;type=cron;keywords=events,cleanup,retention,interval,frequency,schedule,history,logs,jobs;description=How often to delete old events (cron expression)"`+ ExpiredSessionsCleanupInterval SettingVariable `key:"expiredSessionsCleanupInterval" meta:"label=Expired Sessions Cleanup Interval;type=cron;keywords=sessions,cleanup,retention,expired,revoked,interval,frequency,schedule,auth,jobs;description=How often to delete expired and old revoked sessions (cron expression)"`+ AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`// Deprecated: Use the granular prune mode settings instead.PruneMode SettingVariable `key:"dockerPruneMode,internal,deprecated" meta:"label=Legacy Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk,legacy;category=internal;description=Legacy prune mode retained for compatibility and migration"`DefaultDeployPullPolicy SettingVariable `key:"defaultDeployPullPolicy" meta:"label=Default Deploy Pull Policy;type=select;keywords=deploy,pull,policy,compose,up,missing,always;category=internal;description=Default image pull policy when deploying projects"`diff --git a/backend/internal/models/user_session.go b/backend/internal/models/user_session.gonew file mode 100644index 000000000..3b6d155d7--- /dev/null+++ b/backend/internal/models/user_session.go@@ -0,0 +1,19 @@+package models++import "time"++type UserSession struct {+ BaseModel+ UserID string `json:"userId" gorm:"column:user_id;not null;index"`+ User *User `json:"user,omitempty" gorm:"foreignKey:UserID;constraint:OnDelete:CASCADE"`+ RefreshTokenHash string `json:"-" gorm:"column:refresh_token_hash;not null;uniqueIndex"`+ UserAgent *string `json:"userAgent,omitempty" gorm:"column:user_agent"`+ IPAddress *string `json:"ipAddress,omitempty" gorm:"column:ip_address"`+ LastUsedAt time.Time `json:"lastUsedAt" gorm:"column:last_used_at;not null"`+ ExpiresAt time.Time `json:"expiresAt" gorm:"column:expires_at;not null;index"`+ RevokedAt *time.Time `json:"revokedAt,omitempty" gorm:"column:revoked_at"`+}++func (UserSession) TableName() string {+ return "user_sessions"+}diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 05d0963eb..6187a0d71 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -8,6 +8,7 @@ import ("strings""time"+ "github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/pkg/utils/jwtclaims"@@ -39,8 +40,9 @@ type AuthSettings struct {Oidc *models.OidcConfig `json:"oidc,omitempty"`}-type UserClaims struct {+type userClaims struct {jwt.RegisteredClaims+ SessionID string `json:"sid,omitempty"`UserID string `json:"user_id"`Username string `json:"username"`Email string `json:"email,omitempty"`@@ -49,20 +51,29 @@ type UserClaims struct {AppVersion string `json:"app_version,omitempty"`}+type refreshClaims struct {+ jwt.RegisteredClaims+ UserID string `json:"user_id"`+ SessionID string `json:"sid,omitempty"`+ AppVersion string `json:"app_version,omitempty"`+}+type AuthService struct {userService *UserServicesettingsService *SettingsServiceeventService *EventService+ sessionService *SessionServicejwtSecret []byterefreshExpiry time.Durationconfig *config.Config}-func NewAuthService(userService *UserService, settingsService *SettingsService, eventService *EventService, jwtSecret string, cfg *config.Config) *AuthService {+func NewAuthService(userService *UserService, settingsService *SettingsService, eventService *EventService, sessionService *SessionService, jwtSecret string, cfg *config.Config) *AuthService {return &AuthService{userService: userService,settingsService: settingsService,eventService: eventService,+ sessionService: sessionService,jwtSecret: jwtclaims.CheckOrGenerateJwtSecret(jwtSecret),refreshExpiry: cfg.JWTRefreshExpiry,config: cfg,@@ -194,7 +205,7 @@ func (s *AuthService) GetOidcConfig(ctx context.Context) (*models.OidcConfig, erreturn authSettings.Oidc, nil}-func (s *AuthService) Login(ctx context.Context, username, password string) (*models.User, *TokenPair, error) {+func (s *AuthService) Login(ctx context.Context, username, password string, meta auth.SessionMeta) (*models.User, *TokenPair, error) {localEnabled, err := s.IsLocalAuthEnabled(ctx)if err != nil {return nil, nil, err@@ -238,7 +249,7 @@ func (s *AuthService) Login(ctx context.Context, username, password string) (*moreturn nil})- tokenPair, err := s.generateTokenPair(ctx, user)+ tokenPair, err := s.createSessionAndTokensInternal(ctx, user, meta)if err != nil {return nil, nil, err}@@ -258,7 +269,7 @@ func (s *AuthService) Login(ctx context.Context, username, password string) (*moreturn user, tokenPair, nil}-func (s *AuthService) OidcLogin(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*models.User, *TokenPair, error) {+func (s *AuthService) OidcLogin(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse, meta auth.SessionMeta) (*models.User, *TokenPair, error) {if userInfo.Subject == "" {return nil, nil, errors.New("missing OIDC subject identifier")}@@ -268,7 +279,7 @@ func (s *AuthService) OidcLogin(ctx context.Context, userInfo auth.OidcUserInfo,return nil, nil, err}- tokenPair, err := s.generateTokenPair(ctx, user)+ tokenPair, err := s.createSessionAndTokensInternal(ctx, user, meta)if err != nil {return nil, nil, err}@@ -562,8 +573,8 @@ func (s *AuthService) persistOidcTokens(user *models.User, tokenResp *auth.OidcT}}-func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string) (*TokenPair, error) {- token, err := jwt.ParseWithClaims(refreshToken, &jwt.RegisteredClaims{},+func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, meta auth.SessionMeta) (*TokenPair, error) {+ token, err := jwt.ParseWithClaims(refreshToken, &refreshClaims{},func(t *jwt.Token) (any, error) {if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])@@ -578,35 +589,59 @@ func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string) (*Treturn nil, ErrInvalidToken}- claims, ok := token.Claims.(*jwt.RegisteredClaims)+ claims, ok := token.Claims.(*refreshClaims)if !ok {- return nil, errors.New("invalid token claims")+ return nil, &common.InvalidTokenClaimsError{}}if claims.Subject != "refresh" {- return nil, errors.New("not a refresh token")+ return nil, &common.RefreshTokenSubjectError{}+ }++ if claims.AppVersion != "" && claims.AppVersion != config.Version {+ slog.InfoContext(ctx, "Refresh token version mismatch detected", "tokenVersion", claims.AppVersion, "currentVersion", config.Version)+ return nil, ErrTokenVersionMismatch}- userId := claims.ID- if userId == "" {- return nil, errors.New("missing user ID in token")+ if claims.UserID == "" {+ return nil, &common.MissingTokenUserIDError{}+ }+ if claims.ID == "" {+ return nil, &common.MissingRefreshTokenIDError{}+ }+ if claims.SessionID == "" {+ return nil, &common.MissingTokenSessionIDError{}+ }+ if s.sessionService == nil {+ return nil, &common.SessionServiceUnavailableError{}+ }++ session, err := s.sessionService.GetSessionByID(ctx, claims.SessionID)+ if err != nil {+ return nil, err+ }+ if session.UserID != claims.UserID {+ return nil, ErrInvalidToken+ }+ if err := validateSessionActiveInternal(session); err != nil {+ return nil, err}- user, err := s.userService.GetUserByID(ctx, userId)+ rotatedSession, refreshJTI, err := s.sessionService.RotateRefreshToken(ctx, claims.SessionID, claims.ID, meta)if err != nil {return nil, err}- tokenPair, err := s.generateTokenPair(ctx, user)+ user, err := s.userService.GetUserByID(ctx, claims.UserID)if err != nil {return nil, err}- return tokenPair, nil+ return s.buildTokenPairInternal(ctx, user, rotatedSession, refreshJTI)}-func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*models.User, error) {- token, err := jwt.ParseWithClaims(accessToken, &UserClaims{},+func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*models.User, string, error) {+ token, err := jwt.ParseWithClaims(accessToken, &userClaims{},func(t *jwt.Token) (any, error) {if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])@@ -615,31 +650,37 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*mod})if err != nil {if strings.Contains(err.Error(), "token is expired") {- return nil, ErrExpiredToken+ return nil, "", ErrExpiredToken}- return nil, ErrInvalidToken+ return nil, "", ErrInvalidToken}if !token.Valid {- return nil, ErrInvalidToken+ return nil, "", ErrInvalidToken}- claims, ok := token.Claims.(*UserClaims)+ claims, ok := token.Claims.(*userClaims)if !ok {- return nil, errors.New("invalid token claims")+ return nil, "", &common.InvalidTokenClaimsError{}}if claims.Subject != "access" {- return nil, errors.New("not an access token")+ return nil, "", &common.AccessTokenSubjectError{}}if claims.ID == "" {- return nil, errors.New("missing user ID in token")+ return nil, "", &common.MissingTokenUserIDError{}}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+ return nil, "", ErrTokenVersionMismatch+ }+ if claims.SessionID == "" {+ return nil, "", &common.MissingTokenSessionIDError{}+ }+ if s.sessionService == nil {+ return nil, "", &common.SessionServiceUnavailableError{}}// Verify user exists in DB@@ -648,15 +689,30 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*moddbUser, err := s.userService.GetUserByID(ctx, claims.ID)if err != nil {if errors.Is(err, ErrUserNotFound) {- return nil, ErrInvalidToken+ return nil, "", ErrInvalidToken}- return nil, err+ return nil, "", err+ }++ session, err := s.sessionService.GetSessionByID(ctx, claims.SessionID)+ if err != nil {+ return nil, "", err+ }+ if session.UserID != dbUser.ID {+ return nil, "", ErrInvalidToken+ }+ if err := validateSessionActiveInternal(session); err != nil {+ return nil, "", err}- return dbUser, nil+ return dbUser, session.ID, nil}func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPassword, newPassword string) error {+ if s.sessionService == nil {+ return &common.SessionServiceUnavailableError{}+ }+user, err := s.userService.GetUserByID(ctx, userID)if err != nil {return err@@ -675,23 +731,44 @@ func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPassworuser.PasswordHash = hashedPassworduser.RequiresPasswordChange = false- _, err = s.userService.UpdateUser(ctx, user)- return err+ if _, err = s.userService.UpdateUser(ctx, user); err != nil {+ return err+ }+ return s.sessionService.RevokeAllUserSessions(ctx, userID)+}++func (s *AuthService) RevokeSession(ctx context.Context, sessionID string) error {+ if s.sessionService == nil {+ return nil+ }+ return s.sessionService.RevokeSession(ctx, sessionID)+}++func (s *AuthService) createSessionAndTokensInternal(ctx context.Context, user *models.User, meta auth.SessionMeta) (*TokenPair, error) {+ if s.sessionService == nil {+ return nil, &common.SessionServiceUnavailableError{}+ }+ refreshExpiry := time.Now().Add(s.refreshExpiry)+ session, refreshJTI, err := s.sessionService.CreateSession(ctx, user.ID, refreshExpiry, meta)+ if err != nil {+ return nil, err+ }+ return s.buildTokenPairInternal(ctx, user, session, refreshJTI)}-func (s *AuthService) generateTokenPair(ctx context.Context, user *models.User) (*TokenPair, error) {+func (s *AuthService) buildTokenPairInternal(ctx context.Context, user *models.User, session *models.UserSession, refreshJTI string) (*TokenPair, error) {sessionTimeout, _ := s.GetSessionTimeout(ctx)accessTokenExpiry := time.Now().Add(time.Duration(sessionTimeout) * time.Minute)- slog.WarnContext(ctx, "accessTokenExpiry", "expiry", accessTokenExpiry)- userClaims := UserClaims{+ userClaims := userClaims{RegisteredClaims: jwt.RegisteredClaims{ID: user.ID,Subject: "access",IssuedAt: jwt.NewNumericDate(time.Now()),ExpiresAt: jwt.NewNumericDate(accessTokenExpiry),},+ SessionID: session.ID,UserID: user.ID,Username: user.Username,Roles: []string(user.Roles),@@ -713,11 +790,16 @@ func (s *AuthService) generateTokenPair(ctx context.Context, user *models.User)return nil, err}- refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.RegisteredClaims{- ID: user.ID,- Subject: "refresh",- IssuedAt: jwt.NewNumericDate(time.Now()),- ExpiresAt: jwt.NewNumericDate(time.Now().Add(s.refreshExpiry)),+ refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, refreshClaims{+ RegisteredClaims: jwt.RegisteredClaims{+ ID: refreshJTI,+ Subject: "refresh",+ IssuedAt: jwt.NewNumericDate(time.Now()),+ ExpiresAt: jwt.NewNumericDate(session.ExpiresAt),+ },+ UserID: user.ID,+ SessionID: session.ID,+ AppVersion: config.Version,})refreshTokenString, err := refreshToken.SignedString(s.jwtSecret)@@ -732,6 +814,19 @@ func (s *AuthService) generateTokenPair(ctx context.Context, user *models.User)}, nil}+func validateSessionActiveInternal(session *models.UserSession) error {+ if session == nil {+ return ErrInvalidToken+ }+ if session.RevokedAt != nil {+ return &common.SessionRevokedError{}+ }+ if time.Now().After(session.ExpiresAt) {+ return ErrExpiredToken+ }+ return nil+}+func generateUsernameFromEmail(email, subject string) string {if email != "" {parts := strings.Split(email, "@")diff --git a/backend/internal/services/auth_service_test.go b/backend/internal/services/auth_service_test.goindex f831dc63e..d8a646b40 100644--- a/backend/internal/services/auth_service_test.go+++ b/backend/internal/services/auth_service_test.go@@ -11,6 +11,7 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"+ "github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"@@ -22,7 +23,7 @@ func setupAuthServiceTestDB(t *testing.T) *database.DB {t.Helper()db, err := gorm.Open(glsqlite.Open(":memory:"), &gorm.Config{})require.NoError(t, err)- require.NoError(t, db.AutoMigrate(&models.SettingVariable{}, &models.User{}))+ require.NoError(t, db.AutoMigrate(&models.SettingVariable{}, &models.User{}, &models.UserSession{}))return &database.DB{DB: db}}@@ -45,15 +46,20 @@ func newTestAuthService(secret string) *AuthService {}}-func makeAccessToken(t *testing.T, secret []byte, subject string, id string, username string, roles []string, email, displayName string, exp time.Time) string {+func makeAccessToken(t *testing.T, secret []byte, subject string, id string, username string, roles []string, email, displayName string, exp time.Time, sessionIDs ...string) string {t.Helper()- claims := UserClaims{+ sessionID := ""+ if len(sessionIDs) > 0 {+ sessionID = sessionIDs[0]+ }+ claims := userClaims{RegisteredClaims: jwt.RegisteredClaims{ID: id,Subject: subject,IssuedAt: jwt.NewNumericDate(time.Now()),ExpiresAt: jwt.NewNumericDate(exp),},+ SessionID: sessionID,UserID: id,Username: username,Roles: roles,@@ -69,13 +75,26 @@ func makeAccessToken(t *testing.T, secret []byte, subject string, id string, usereturn signed}-func makeRefreshToken(t *testing.T, secret []byte, subject string, id string, exp time.Time) string {+func makeRefreshToken(t *testing.T, secret []byte, subject string, id string, exp time.Time, userIDAndSessionID ...string) string {t.Helper()- claims := jwt.RegisteredClaims{- ID: id,- Subject: subject,- IssuedAt: jwt.NewNumericDate(time.Now()),- ExpiresAt: jwt.NewNumericDate(exp),+ userID := id+ sessionID := ""+ if len(userIDAndSessionID) > 0 {+ userID = userIDAndSessionID[0]+ }+ if len(userIDAndSessionID) > 1 {+ sessionID = userIDAndSessionID[1]+ }+ claims := refreshClaims{+ RegisteredClaims: jwt.RegisteredClaims{+ ID: id,+ Subject: subject,+ IssuedAt: jwt.NewNumericDate(time.Now()),+ ExpiresAt: jwt.NewNumericDate(exp),+ },+ UserID: userID,+ SessionID: sessionID,+ AppVersion: config.Version,}tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)signed, err := tok.SignedString(secret)@@ -85,6 +104,17 @@ func makeRefreshToken(t *testing.T, secret []byte, subject string, id string, exreturn signed}+func createTestSession(t *testing.T, db *database.DB, userID string, expiresAt time.Time) (*models.UserSession, string) {+ t.Helper()+ sessionSvc := NewSessionService(db)+ session, refreshJTI, err := sessionSvc.CreateSession(context.Background(), userID, expiresAt, auth.SessionMeta{+ UserAgent: "test-agent",+ IPAddress: "127.0.0.1",+ })+ require.NoError(t, err)+ return session, refreshJTI+}+func makeUnsignedToken(t *testing.T, claims jwt.Claims) string {t.Helper()tok := jwt.NewWithClaims(jwt.SigningMethodNone, claims)@@ -100,6 +130,7 @@ func TestVerifyToken_ValidClaims(t *testing.T) {userSvc := NewUserService(db)s := newTestAuthService("")s.userService = userSvc+ s.sessionService = NewSessionService(db)// Create user in DBuser := &models.User{@@ -113,9 +144,10 @@ func TestVerifyToken_ValidClaims(t *testing.T) {require.NoError(t, err)exp := time.Now().Add(5 * time.Minute)- token := makeAccessToken(t, s.jwtSecret, "access", "u123", "alice", []string{"user", "admin"}, "[email protected]", "Alice", exp)+ session, _ := createTestSession(t, db, "u123", exp)+ token := makeAccessToken(t, s.jwtSecret, "access", "u123", "alice", []string{"user", "admin"}, "[email protected]", "Alice", exp, session.ID)- verifiedUser, err := s.VerifyToken(context.Background(), token)+ verifiedUser, _, err := s.VerifyToken(context.Background(), token)if err != nil {t.Fatalf("VerifyToken error: %v", err)}@@ -139,7 +171,7 @@ func TestVerifyToken_ValidClaims(t *testing.T) {func TestVerifyToken_RejectsNonHMACAlg(t *testing.T) {s := newTestAuthService("")exp := time.Now().Add(5 * time.Minute)- token := makeUnsignedToken(t, UserClaims{+ token := makeUnsignedToken(t, userClaims{RegisteredClaims: jwt.RegisteredClaims{ID: "u1",Subject: "access",@@ -152,7 +184,7 @@ func TestVerifyToken_RejectsNonHMACAlg(t *testing.T) {AppVersion: config.Version,})- _, err := s.VerifyToken(context.Background(), token)+ _, _, err := s.VerifyToken(context.Background(), token)if !errors.Is(err, ErrInvalidToken) {t.Errorf("want ErrInvalidToken, got %v", err)}@@ -163,6 +195,7 @@ func TestVerifyToken_Expired(t *testing.T) {userSvc := NewUserService(db)s := newTestAuthService("")s.userService = userSvc+ s.sessionService = NewSessionService(db)// Create user in DBuser := &models.User{@@ -176,7 +209,7 @@ func TestVerifyToken_Expired(t *testing.T) {exp := time.Now().Add(-1 * time.Minute)token := makeAccessToken(t, s.jwtSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)- _, err = s.VerifyToken(context.Background(), token)+ _, _, err = s.VerifyToken(context.Background(), token)if !errors.Is(err, ErrExpiredToken) {t.Errorf("want ErrExpiredToken, got %v", err)}@@ -187,10 +220,8 @@ func TestVerifyToken_InvalidSubject(t *testing.T) {exp := time.Now().Add(5 * time.Minute)token := makeAccessToken(t, s.jwtSecret, "refresh", "u1", "bob", []string{"user"}, "", "", exp)- _, err := s.VerifyToken(context.Background(), token)- if err == nil || err.Error() != "not an access token" {- t.Errorf("want 'not an access token', got %v", err)- }+ _, _, err := s.VerifyToken(context.Background(), token)+ require.ErrorAs(t, err, new(*common.AccessTokenSubjectError))}func TestVerifyToken_InvalidSignature(t *testing.T) {@@ -202,7 +233,7 @@ func TestVerifyToken_InvalidSignature(t *testing.T) {}token := makeAccessToken(t, otherSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)- _, err := s.VerifyToken(context.Background(), token)+ _, _, err := s.VerifyToken(context.Background(), token)if !errors.Is(err, ErrInvalidToken) {t.Errorf("want ErrInvalidToken, got %v", err)}@@ -213,10 +244,8 @@ func TestVerifyToken_MissingUserID(t *testing.T) {exp := time.Now().Add(5 * time.Minute)token := makeAccessToken(t, s.jwtSecret, "access", "", "bob", []string{"user"}, "", "", exp)- _, err := s.VerifyToken(context.Background(), token)- if err == nil || err.Error() != "missing user ID in token" {- t.Errorf("want 'missing user ID in token', got %v", err)- }+ _, _, err := s.VerifyToken(context.Background(), token)+ require.ErrorAs(t, err, new(*common.MissingTokenUserIDError))}func TestGenerateUsernameFromEmail(t *testing.T) {@@ -272,7 +301,7 @@ func TestVerifyToken_VersionMismatch(t *testing.T) {token := makeAccessToken(t, s.jwtSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)config.Version = "2.0.0"- _, err := s.VerifyToken(context.Background(), token)+ _, _, err := s.VerifyToken(context.Background(), token)if !errors.Is(err, ErrTokenVersionMismatch) {t.Errorf("want ErrTokenVersionMismatch, got %v", err)}@@ -288,6 +317,7 @@ func TestRefreshToken_Valid(t *testing.T) {s := newTestAuthService("")s.userService = userSvcs.settingsService = settingsSvc+ s.sessionService = NewSessionService(db)user := &models.User{BaseModel: models.BaseModel{ID: "u-refresh"},@@ -298,15 +328,173 @@ func TestRefreshToken_Valid(t *testing.T) {require.NoError(t, err)exp := time.Now().Add(5 * time.Minute)- token := makeRefreshToken(t, s.jwtSecret, "refresh", "u-refresh", exp)+ session, refreshJTI := createTestSession(t, db, "u-refresh", exp)+ token := makeRefreshToken(t, s.jwtSecret, "refresh", refreshJTI, exp, "u-refresh", session.ID)- tokenPair, err := s.RefreshToken(context.Background(), token)+ tokenPair, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})require.NoError(t, err)require.NotNil(t, tokenPair)require.NotEmpty(t, tokenPair.AccessToken)require.NotEmpty(t, tokenPair.RefreshToken)}+func TestVerifyToken_RejectsRevokedSession(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ s := newTestAuthService("")+ s.userService = userSvc+ s.sessionService = NewSessionService(db)++ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-revoked"},+ Username: "revoked-user",+ Roles: models.StringSlice{"user"},+ }+ _, err := userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ exp := time.Now().Add(5 * time.Minute)+ session, _ := createTestSession(t, db, user.ID, exp)+ require.NoError(t, s.RevokeSession(context.Background(), session.ID))+ token := makeAccessToken(t, s.jwtSecret, "access", user.ID, user.Username, []string{"user"}, "", "", exp, session.ID)++ _, _, err = s.VerifyToken(context.Background(), token)+ require.True(t, common.IsSessionRevokedError(err))+}++func TestVerifyToken_RejectsMissingSessionID(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ s := newTestAuthService("")+ s.userService = userSvc+ s.sessionService = NewSessionService(db)++ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-no-sid"},+ Username: "no-sid-user",+ Roles: models.StringSlice{"user"},+ }+ _, err := userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ token := makeAccessToken(t, s.jwtSecret, "access", user.ID, user.Username, []string{"user"}, "", "", time.Now().Add(5*time.Minute))++ _, _, err = s.VerifyToken(context.Background(), token)+ require.ErrorAs(t, err, new(*common.MissingTokenSessionIDError))+}++func TestRevokeSessionThenVerifyTokenFails(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ s := newTestAuthService("")+ s.userService = userSvc+ s.sessionService = NewSessionService(db)++ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-logout"},+ Username: "logout-user",+ Roles: models.StringSlice{"user"},+ }+ _, err := userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ exp := time.Now().Add(5 * time.Minute)+ session, _ := createTestSession(t, db, user.ID, exp)+ token := makeAccessToken(t, s.jwtSecret, "access", user.ID, user.Username, []string{"user"}, "", "", exp, session.ID)+ require.NoError(t, s.RevokeSession(context.Background(), session.ID))++ _, _, err = s.VerifyToken(context.Background(), token)+ require.True(t, common.IsSessionRevokedError(err))+}++func TestRefreshToken_RotatesJTI(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ settingsSvc, err := NewSettingsService(context.Background(), db)+ require.NoError(t, err)+ s := newTestAuthService("")+ s.userService = userSvc+ s.settingsService = settingsSvc+ s.sessionService = NewSessionService(db)++ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-rotate"},+ Username: "rotate-user",+ Roles: models.StringSlice{"user"},+ }+ _, err = userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ exp := time.Now().Add(5 * time.Minute)+ session, refreshJTI := createTestSession(t, db, user.ID, exp)+ token := makeRefreshToken(t, s.jwtSecret, "refresh", refreshJTI, exp, user.ID, session.ID)++ tokenPair, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})+ require.NoError(t, err)+ require.NotEmpty(t, tokenPair.RefreshToken)++ _, err = s.RefreshToken(context.Background(), token, auth.SessionMeta{})+ require.ErrorIs(t, err, ErrInvalidToken)+}++func TestRefreshToken_RejectsRevokedSession(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ settingsSvc, err := NewSettingsService(context.Background(), db)+ require.NoError(t, err)+ s := newTestAuthService("")+ s.userService = userSvc+ s.settingsService = settingsSvc+ s.sessionService = NewSessionService(db)++ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-refresh-revoked"},+ Username: "refresh-revoked-user",+ Roles: models.StringSlice{"user"},+ }+ _, err = userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ exp := time.Now().Add(5 * time.Minute)+ session, refreshJTI := createTestSession(t, db, user.ID, exp)+ require.NoError(t, s.RevokeSession(context.Background(), session.ID))+ token := makeRefreshToken(t, s.jwtSecret, "refresh", refreshJTI, exp, user.ID, session.ID)++ _, err = s.RefreshToken(context.Background(), token, auth.SessionMeta{})+ require.True(t, common.IsSessionRevokedError(err))+}++func TestChangePassword_RevokesAllSessions(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ s := newTestAuthService("")+ s.userService = userSvc+ s.sessionService = NewSessionService(db)++ passwordHash, err := userSvc.hashPassword("old-password")+ require.NoError(t, err)+ user := &models.User{+ BaseModel: models.BaseModel{ID: "u-password"},+ Username: "password-user",+ PasswordHash: passwordHash,+ Roles: models.StringSlice{"user"},+ }+ _, err = userSvc.CreateUser(context.Background(), user)+ require.NoError(t, err)++ sessionA, _ := createTestSession(t, db, user.ID, time.Now().Add(time.Hour))+ sessionB, _ := createTestSession(t, db, user.ID, time.Now().Add(time.Hour))++ require.NoError(t, s.ChangePassword(context.Background(), user.ID, "old-password", "new-password"))++ sessionA, err = s.sessionService.GetSessionByID(context.Background(), sessionA.ID)+ require.NoError(t, err)+ sessionB, err = s.sessionService.GetSessionByID(context.Background(), sessionB.ID)+ require.NoError(t, err)+ require.NotNil(t, sessionA.RevokedAt)+ require.NotNil(t, sessionB.RevokedAt)+}+func TestRefreshToken_RejectsNonHMACAlg(t *testing.T) {s := newTestAuthService("")exp := time.Now().Add(5 * time.Minute)@@ -317,7 +505,7 @@ func TestRefreshToken_RejectsNonHMACAlg(t *testing.T) {ExpiresAt: jwt.NewNumericDate(exp),})- _, err := s.RefreshToken(context.Background(), token)+ _, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})if !errors.Is(err, ErrInvalidToken) {t.Errorf("want ErrInvalidToken, got %v", err)}diff --git a/backend/internal/services/job_service.go b/backend/internal/services/job_service.goindex 1034f82f1..3e0e946ad 100644--- a/backend/internal/services/job_service.go+++ b/backend/internal/services/job_service.go@@ -59,15 +59,16 @@ func (s *JobService) SetScheduler(ctx context.Context, scheduler JobRunner) { //func (s *JobService) GetJobSchedules(ctx context.Context) jobschedule.Config {// Use SettingsService cache for fast reads.return jobschedule.Config{- EnvironmentHealthInterval: s.settings.GetStringSetting(ctx, "environmentHealthInterval", "0 */2 * * * *"),- EventCleanupInterval: s.settings.GetStringSetting(ctx, "eventCleanupInterval", "0 0 */6 * * *"),- AutoUpdateInterval: s.settings.GetStringSetting(ctx, "autoUpdateInterval", "0 0 0 * * *"),- DockerClientRefreshInterval: s.settings.GetStringSetting(ctx, "dockerClientRefreshInterval", "*/30 * * * * *"),- PollingInterval: s.settings.GetStringSetting(ctx, "pollingInterval", "0 */15 * * * *"),- ScheduledPruneInterval: s.settings.GetStringSetting(ctx, "scheduledPruneInterval", "0 0 0 * * *"),- GitopsSyncInterval: s.settings.GetStringSetting(ctx, "gitopsSyncInterval", "0 */1 * * * *"),- VulnerabilityScanInterval: s.settings.GetStringSetting(ctx, "vulnerabilityScanInterval", "0 0 0 * * *"),- AutoHealInterval: s.settings.GetStringSetting(ctx, "autoHealInterval", "*/30 * * * * *"),+ EnvironmentHealthInterval: s.settings.GetStringSetting(ctx, "environmentHealthInterval", "0 */2 * * * *"),+ EventCleanupInterval: s.settings.GetStringSetting(ctx, "eventCleanupInterval", "0 0 */6 * * *"),+ ExpiredSessionsCleanupInterval: s.settings.GetStringSetting(ctx, "expiredSessionsCleanupInterval", "0 0 0 * * *"),+ AutoUpdateInterval: s.settings.GetStringSetting(ctx, "autoUpdateInterval", "0 0 0 * * *"),+ DockerClientRefreshInterval: s.settings.GetStringSetting(ctx, "dockerClientRefreshInterval", "*/30 * * * * *"),+ PollingInterval: s.settings.GetStringSetting(ctx, "pollingInterval", "0 */15 * * * *"),+ ScheduledPruneInterval: s.settings.GetStringSetting(ctx, "scheduledPruneInterval", "0 0 0 * * *"),+ GitopsSyncInterval: s.settings.GetStringSetting(ctx, "gitopsSyncInterval", "0 */1 * * * *"),+ VulnerabilityScanInterval: s.settings.GetStringSetting(ctx, "vulnerabilityScanInterval", "0 0 0 * * *"),+ AutoHealInterval: s.settings.GetStringSetting(ctx, "autoHealInterval", "*/30 * * * * *"),}}@@ -88,6 +89,7 @@ func (s *JobService) UpdateJobSchedules(ctx context.Context, updates jobschedule}{{key: "environmentHealthInterval", current: current.EnvironmentHealthInterval, update: updates.EnvironmentHealthInterval},{key: "eventCleanupInterval", current: current.EventCleanupInterval, update: updates.EventCleanupInterval},+ {key: "expiredSessionsCleanupInterval", current: current.ExpiredSessionsCleanupInterval, update: updates.ExpiredSessionsCleanupInterval},{key: "autoUpdateInterval", current: current.AutoUpdateInterval, update: updates.AutoUpdateInterval},{key: "dockerClientRefreshInterval", current: current.DockerClientRefreshInterval, update: updates.DockerClientRefreshInterval},{key: "pollingInterval", current: current.PollingInterval, update: updates.PollingInterval},@@ -279,15 +281,16 @@ func (s *JobService) getJobScheduleInternal(ctx context.Context, meta meta.JobMe}defaultSchedules := map[string]string{- "environmentHealthInterval": "0 */2 * * * *",- "eventCleanupInterval": "0 0 */6 * * *",- "autoUpdateInterval": "0 0 0 * * *",- "dockerClientRefreshInterval": "*/30 * * * * *",- "pollingInterval": "0 */15 * * * *",- "scheduledPruneInterval": "0 0 0 * * *",- "gitopsSyncInterval": "0 */1 * * * *",- "vulnerabilityScanInterval": "0 0 0 * * *",- "autoHealInterval": "*/30 * * * * *",+ "environmentHealthInterval": "0 */2 * * * *",+ "eventCleanupInterval": "0 0 */6 * * *",+ "expiredSessionsCleanupInterval": "0 0 0 * * *",+ "autoUpdateInterval": "0 0 0 * * *",+ "dockerClientRefreshInterval": "*/30 * * * * *",+ "pollingInterval": "0 */15 * * * *",+ "scheduledPruneInterval": "0 0 0 * * *",+ "gitopsSyncInterval": "0 */1 * * * *",+ "vulnerabilityScanInterval": "0 0 0 * * *",+ "autoHealInterval": "*/30 * * * * *",}defaultSchedule := defaultSchedules[meta.SettingsKey]diff --git a/backend/internal/services/session_service.go b/backend/internal/services/session_service.gonew file mode 100644index 000000000..8d7842a58--- /dev/null+++ b/backend/internal/services/session_service.go@@ -0,0 +1,167 @@+package services++import (+ "context"+ "crypto/sha256"+ "crypto/subtle"+ "encoding/hex"+ "errors"+ "fmt"+ "strings"+ "time"++ "github.com/getarcaneapp/arcane/backend/internal/database"+ "github.com/getarcaneapp/arcane/backend/internal/models"+ pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"+ "github.com/getarcaneapp/arcane/types/auth"+ "github.com/google/uuid"+ "gorm.io/gorm"+)++type SessionService struct {+ db *database.DB+}++func NewSessionService(db *database.DB) *SessionService {+ return &SessionService{db: db}+}++func (s *SessionService) CreateSession(ctx context.Context, userID string, expiresAt time.Time, meta auth.SessionMeta) (*models.UserSession, string, error) {+ refreshJTI := uuid.NewString()+ refreshHash := hashRefreshJTIInternal(refreshJTI)++ now := time.Now()+ session := &models.UserSession{+ UserID: userID,+ RefreshTokenHash: refreshHash,+ UserAgent: pkgutils.StringPtrFromTrimmed(meta.UserAgent),+ IPAddress: pkgutils.StringPtrFromTrimmed(meta.IPAddress),+ LastUsedAt: now,+ ExpiresAt: expiresAt,+ }++ if err := s.db.WithContext(ctx).Create(session).Error; err != nil {+ return nil, "", fmt.Errorf("failed to create user session: %w", err)+ }++ return session, refreshJTI, nil+}++func (s *SessionService) GetSessionByID(ctx context.Context, sessionID string) (*models.UserSession, error) {+ if strings.TrimSpace(sessionID) == "" {+ return nil, ErrInvalidToken+ }++ var session models.UserSession+ if err := s.db.WithContext(ctx).Where("id = ?", sessionID).First(&session).Error; err != nil {+ if errors.Is(err, gorm.ErrRecordNotFound) {+ return nil, ErrInvalidToken+ }+ return nil, fmt.Errorf("failed to get user session: %w", err)+ }+ return &session, nil+}++func (s *SessionService) RotateRefreshToken(ctx context.Context, sessionID string, refreshJTI string, meta auth.SessionMeta) (*models.UserSession, string, error) {+ if strings.TrimSpace(sessionID) == "" || strings.TrimSpace(refreshJTI) == "" {+ return nil, "", ErrInvalidToken+ }++ newRefreshJTI := uuid.NewString()+ newHash := hashRefreshJTIInternal(newRefreshJTI)++ now := time.Now()+ var rotated models.UserSession++ err := dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {+ var session models.UserSession+ if err := tx.Where("id = ?", sessionID).First(&session).Error; err != nil {+ if errors.Is(err, gorm.ErrRecordNotFound) {+ return ErrInvalidToken+ }+ return fmt.Errorf("failed to get user session for rotation: %w", err)+ }+ if err := validateSessionActiveInternal(&session); err != nil {+ return err+ }+ if subtle.ConstantTimeCompare([]byte(session.RefreshTokenHash), []byte(hashRefreshJTIInternal(refreshJTI))) != 1 {+ return ErrInvalidToken+ }++ updates := map[string]any{+ "refresh_token_hash": newHash,+ "last_used_at": now,+ "updated_at": now,+ "user_agent": pkgutils.StringPtrFromTrimmed(meta.UserAgent),+ "ip_address": pkgutils.StringPtrFromTrimmed(meta.IPAddress),+ }+ result := tx.Model(&models.UserSession{}).+ Where("id = ? AND refresh_token_hash = ? AND revoked_at IS NULL", session.ID, session.RefreshTokenHash).+ Updates(updates)+ if result.Error != nil {+ return fmt.Errorf("failed to rotate refresh token: %w", result.Error)+ }+ if result.RowsAffected != 1 {+ return ErrInvalidToken+ }+ rotated = session+ return nil+ })+ if err != nil {+ return nil, "", err+ }++ rotated.RefreshTokenHash = newHash+ rotated.LastUsedAt = now+ rotated.UpdatedAt = &now+ rotated.UserAgent = pkgutils.StringPtrFromTrimmed(meta.UserAgent)+ rotated.IPAddress = pkgutils.StringPtrFromTrimmed(meta.IPAddress)++ return &rotated, newRefreshJTI, nil+}++func (s *SessionService) RevokeSession(ctx context.Context, sessionID string) error {+ if strings.TrimSpace(sessionID) == "" {+ return nil+ }++ now := time.Now()+ if err := s.db.WithContext(ctx).Model(&models.UserSession{}).+ Where("id = ? AND revoked_at IS NULL", sessionID).+ Updates(map[string]any{"revoked_at": now, "updated_at": now}).Error; err != nil {+ return fmt.Errorf("failed to revoke user session: %w", err)+ }+ return nil+}++func (s *SessionService) DeleteExpiredSessions(ctx context.Context, revokedRetention time.Duration) (int64, error) {+ now := time.Now()+ revokedCutoff := now.Add(-revokedRetention)+ result := s.db.WithContext(ctx).+ Where("expires_at < ? OR (revoked_at IS NOT NULL AND revoked_at < ?)", now, revokedCutoff).+ Delete(&models.UserSession{})+ if result.Error != nil {+ return 0, fmt.Errorf("failed to delete expired user sessions: %w", result.Error)+ }+ return result.RowsAffected, nil+}++func hashRefreshJTIInternal(jti string) string {+ sum := sha256.Sum256([]byte(jti))+ return hex.EncodeToString(sum[:])+}++func (s *SessionService) RevokeAllUserSessions(ctx context.Context, userID string) error {+ if strings.TrimSpace(userID) == "" {+ return ErrInvalidToken+ }++ now := time.Now()+ if err := s.db.WithContext(ctx).Model(&models.UserSession{}).+ Where("user_id = ? AND revoked_at IS NULL", userID).+ Updates(map[string]any{"revoked_at": now, "updated_at": now}).Error; err != nil {+ return fmt.Errorf("failed to revoke user sessions: %w", err)+ }+ return nil+}diff --git a/backend/internal/services/session_service_test.go b/backend/internal/services/session_service_test.gonew file mode 100644index 000000000..31fca49fe--- /dev/null+++ b/backend/internal/services/session_service_test.go@@ -0,0 +1,74 @@+package services++import (+ "context"+ "testing"+ "time"++ "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/types/auth"+ "github.com/stretchr/testify/require"+)++func TestSessionService_RotateRefreshTokenRequiresCurrentHash(t *testing.T) {+ ctx := context.Background()+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ require.NoError(t, userSvc.db.Create(&models.User{+ BaseModel: models.BaseModel{ID: "u-session"},+ Username: "session-user",+ Roles: models.StringSlice{"user"},+ }).Error)++ sessionSvc := NewSessionService(db)+ session, refreshJTI, err := sessionSvc.CreateSession(ctx, "u-session", time.Now().Add(time.Hour), auth.SessionMeta{})+ require.NoError(t, err)++ rotated, newJTI, err := sessionSvc.RotateRefreshToken(ctx, session.ID, refreshJTI, auth.SessionMeta{})+ require.NoError(t, err)+ require.NotEmpty(t, newJTI)+ require.NotEqual(t, refreshJTI, newJTI)+ require.Equal(t, hashRefreshJTIInternal(newJTI), rotated.RefreshTokenHash)++ _, _, err = sessionSvc.RotateRefreshToken(ctx, session.ID, refreshJTI, auth.SessionMeta{})+ require.ErrorIs(t, err, ErrInvalidToken)+}++func TestSessionService_DeleteExpiredSessions(t *testing.T) {+ ctx := context.Background()+ db := setupAuthServiceTestDB(t)+ userSvc := NewUserService(db)+ require.NoError(t, userSvc.db.Create(&models.User{+ BaseModel: models.BaseModel{ID: "u-cleanup"},+ Username: "cleanup-user",+ Roles: models.StringSlice{"user"},+ }).Error)++ sessionSvc := NewSessionService(db)+ expired, _, err := sessionSvc.CreateSession(ctx, "u-cleanup", time.Now().Add(-time.Hour), auth.SessionMeta{})+ require.NoError(t, err)+ oldRevoked, _, err := sessionSvc.CreateSession(ctx, "u-cleanup", time.Now().Add(time.Hour), auth.SessionMeta{})+ require.NoError(t, err)+ active, _, err := sessionSvc.CreateSession(ctx, "u-cleanup", time.Now().Add(time.Hour), auth.SessionMeta{})+ require.NoError(t, err)++ oldRevokedAt := time.Now().Add(-8 * 24 * time.Hour)+ require.NoError(t, db.WithContext(ctx).Model(&models.UserSession{}).+ Where("id = ?", oldRevoked.ID).+ Update("revoked_at", oldRevokedAt).Error)++ deleted, err := sessionSvc.DeleteExpiredSessions(ctx, 7*24*time.Hour)+ require.NoError(t, err)+ require.EqualValues(t, 2, deleted)++ var remaining []models.UserSession+ require.NoError(t, db.WithContext(ctx).Order("id").Find(&remaining).Error)+ require.Len(t, remaining, 1)+ require.Equal(t, active.ID, remaining[0].ID)++ var deletedCount int64+ require.NoError(t, db.WithContext(ctx).Model(&models.UserSession{}).+ Where("id IN ?", []string{expired.ID, oldRevoked.ID}).+ Count(&deletedCount).Error)+ require.Zero(t, deletedCount)+}diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 02e539e91..4d8c9a8fd 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -106,6 +106,7 @@ func DefaultSettingsConfig() *models.Settings {PollingInterval: models.SettingVariable{Value: "0 0 * * * *"},DockerClientRefreshInterval: models.SettingVariable{Value: "*/30 * * * * *"},EventCleanupInterval: models.SettingVariable{Value: "0 0 */6 * * *"},+ ExpiredSessionsCleanupInterval: models.SettingVariable{Value: "0 0 0 * * *"},AutoInjectEnv: models.SettingVariable{Value: "false"},PruneMode: models.SettingVariable{Value: "dangling"}, //nolint:staticcheck // Legacy prune setting is still seeded for migration compatibility.DefaultDeployPullPolicy: models.SettingVariable{Value: "missing"},diff --git a/backend/pkg/libarcane/settings.go b/backend/pkg/libarcane/settings.goindex 0b5368c44..0644a74b4 100644--- a/backend/pkg/libarcane/settings.go+++ b/backend/pkg/libarcane/settings.go@@ -38,6 +38,7 @@ var cronSettingKeys = []string{"pollingInterval","environmentHealthInterval","eventCleanupInterval",+ "expiredSessionsCleanupInterval","vulnerabilityScanInterval",}diff --git a/backend/pkg/libarcane/startup/startup.go b/backend/pkg/libarcane/startup/startup.goindex f554f7f33..eae84c7b9 100644--- a/backend/pkg/libarcane/startup/startup.go+++ b/backend/pkg/libarcane/startup/startup.go@@ -148,6 +148,7 @@ func MigrateSchedulerCronValues({key: "scheduledPruneInterval", defaultUnit: time.Minute},{key: "environmentHealthInterval", defaultUnit: time.Minute},{key: "eventCleanupInterval", defaultUnit: time.Minute},+ {key: "expiredSessionsCleanupInterval", defaultUnit: time.Minute},}changed := falsediff --git a/backend/pkg/scheduler/expired_sessions_cleanup_job.go b/backend/pkg/scheduler/expired_sessions_cleanup_job.gonew file mode 100644index 000000000..89b013b29--- /dev/null+++ b/backend/pkg/scheduler/expired_sessions_cleanup_job.go@@ -0,0 +1,56 @@+package scheduler++import (+ "context"+ "log/slog"+ "time"++ "github.com/getarcaneapp/arcane/backend/internal/services"+)++const ExpiredSessionsCleanupJobName = "expired-sessions-cleanup"++type ExpiredSessionsCleanupJob struct {+ sessionService *services.SessionService+ settingsService *services.SettingsService+}++func NewExpiredSessionsCleanupJob(sessionService *services.SessionService, settingsService *services.SettingsService) *ExpiredSessionsCleanupJob {+ return &ExpiredSessionsCleanupJob{+ sessionService: sessionService,+ settingsService: settingsService,+ }+}++func (j *ExpiredSessionsCleanupJob) Name() string {+ return ExpiredSessionsCleanupJobName+}++func (j *ExpiredSessionsCleanupJob) Schedule(ctx context.Context) string {+ s := j.settingsService.GetStringSetting(ctx, "expiredSessionsCleanupInterval", "0 0 0 * * *")+ if s == "" {+ return "0 0 0 * * *"+ }+ return s+}++func (j *ExpiredSessionsCleanupJob) Run(ctx context.Context) {+ slog.InfoContext(ctx, "Running expired sessions cleanup job", "jobName", ExpiredSessionsCleanupJobName)++ revokedRetention := 7 * 24 * time.Hour+ deleted, err := j.sessionService.DeleteExpiredSessions(ctx, revokedRetention)+ if err != nil {+ slog.ErrorContext(ctx, "Failed to delete expired user sessions", "jobName", ExpiredSessionsCleanupJobName, "revokedRetention", revokedRetention.String(), "error", err)+ return+ }++ slog.InfoContext(ctx, "Expired sessions cleanup job completed successfully",+ "jobName", ExpiredSessionsCleanupJobName,+ "revokedRetention", revokedRetention.String(),+ "deleted", deleted)+}++func (j *ExpiredSessionsCleanupJob) Reschedule(ctx context.Context) error {+ slog.InfoContext(ctx, "rescheduling expired sessions cleanup job in new scheduler; currently requires restart")+ return nil+}diff --git a/backend/pkg/utils/ptr_util.go b/backend/pkg/utils/ptr_util.goindex 775443827..d4cdae38e 100644--- a/backend/pkg/utils/ptr_util.go+++ b/backend/pkg/utils/ptr_util.go@@ -1,5 +1,7 @@package utils+import "strings"+func DerefString(p *string) string {if p == nil {return ""@@ -7,6 +9,14 @@ func DerefString(p *string) string {return *p}+func StringPtrFromTrimmed(value string) *string {+ trimmed := strings.TrimSpace(value)+ if trimmed == "" {+ return nil+ }+ return &trimmed+}+func StringPtrEqual(a, b *string) bool {if a == nil && b == nil {return truediff --git a/backend/resources/migrations/postgres/051_add_user_sessions.down.sql b/backend/resources/migrations/postgres/051_add_user_sessions.down.sqlnew file mode 100644index 000000000..58349aa4c--- /dev/null+++ b/backend/resources/migrations/postgres/051_add_user_sessions.down.sql@@ -0,0 +1,3 @@+DROP INDEX IF EXISTS idx_user_sessions_expires_at;+DROP INDEX IF EXISTS idx_user_sessions_user_id;+DROP TABLE IF EXISTS user_sessions;diff --git a/backend/resources/migrations/postgres/051_add_user_sessions.up.sql b/backend/resources/migrations/postgres/051_add_user_sessions.up.sqlnew file mode 100644index 000000000..c384d5b7f--- /dev/null+++ b/backend/resources/migrations/postgres/051_add_user_sessions.up.sql@@ -0,0 +1,15 @@+CREATE TABLE IF NOT EXISTS user_sessions (+ id TEXT PRIMARY KEY,+ user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,+ refresh_token_hash TEXT NOT NULL UNIQUE,+ user_agent TEXT,+ ip_address TEXT,+ created_at TIMESTAMP NOT NULL,+ updated_at TIMESTAMP,+ last_used_at TIMESTAMP NOT NULL,+ expires_at TIMESTAMP NOT NULL,+ revoked_at TIMESTAMP+);++CREATE INDEX IF NOT EXISTS idx_user_sessions_user_id ON user_sessions(user_id);+CREATE INDEX IF NOT EXISTS idx_user_sessions_expires_at ON user_sessions(expires_at);diff --git a/backend/resources/migrations/sqlite/051_add_user_sessions.down.sql b/backend/resources/migrations/sqlite/051_add_user_sessions.down.sqlnew file mode 100644index 000000000..58349aa4c--- /dev/null+++ b/backend/resources/migrations/sqlite/051_add_user_sessions.down.sql@@ -0,0 +1,3 @@+DROP INDEX IF EXISTS idx_user_sessions_expires_at;+DROP INDEX IF EXISTS idx_user_sessions_user_id;+DROP TABLE IF EXISTS user_sessions;diff --git a/backend/resources/migrations/sqlite/051_add_user_sessions.up.sql b/backend/resources/migrations/sqlite/051_add_user_sessions.up.sqlnew file mode 100644index 000000000..9bb6ac613--- /dev/null+++ b/backend/resources/migrations/sqlite/051_add_user_sessions.up.sql@@ -0,0 +1,15 @@+CREATE TABLE user_sessions (+ id TEXT PRIMARY KEY,+ user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,+ refresh_token_hash TEXT NOT NULL UNIQUE,+ user_agent TEXT,+ ip_address TEXT,+ created_at DATETIME NOT NULL,+ updated_at DATETIME,+ last_used_at DATETIME NOT NULL,+ expires_at DATETIME NOT NULL,+ revoked_at DATETIME+);++CREATE INDEX idx_user_sessions_user_id ON user_sessions(user_id);+CREATE INDEX idx_user_sessions_expires_at ON user_sessions(expires_at);diff --git a/cli/pkg/jobs/cmd.go b/cli/pkg/jobs/cmd.goindex b15419e87..358ab493a 100644--- a/cli/pkg/jobs/cmd.go+++ b/cli/pkg/jobs/cmd.go@@ -58,13 +58,15 @@ var getCmd = &cobra.Command{output.Header("Job Schedules")output.KeyValue("Environment health interval", cfg.EnvironmentHealthInterval)output.KeyValue("Event cleanup interval", cfg.EventCleanupInterval)+ output.KeyValue("Expired sessions cleanup interval", cfg.ExpiredSessionsCleanupInterval)return nil},}var (- environmentHealthInterval string- eventCleanupInterval string+ environmentHealthInterval string+ eventCleanupInterval string+ expiredSessionsCleanupInterval string)var updateCmd = &cobra.Command{@@ -84,8 +86,11 @@ var updateCmd = &cobra.Command{if cmd.Flags().Changed("event-cleanup-interval") {req.EventCleanupInterval = &eventCleanupInterval}+ if cmd.Flags().Changed("expired-sessions-cleanup-interval") {+ req.ExpiredSessionsCleanupInterval = &expiredSessionsCleanupInterval+ }- if req.EnvironmentHealthInterval == nil && req.EventCleanupInterval == nil {+ if req.EnvironmentHealthInterval == nil && req.EventCleanupInterval == nil && req.ExpiredSessionsCleanupInterval == nil {return fmt.Errorf("no updates provided (set at least one interval flag)")}@@ -112,6 +117,7 @@ var updateCmd = &cobra.Command{output.Success("Job schedules updated")output.KeyValue("Environment health interval", result.Data.EnvironmentHealthInterval)output.KeyValue("Event cleanup interval", result.Data.EventCleanupInterval)+ output.KeyValue("Expired sessions cleanup interval", result.Data.ExpiredSessionsCleanupInterval)return nil},}@@ -125,4 +131,5 @@ func init() {updateCmd.Flags().StringVar(&environmentHealthInterval, "environment-health-interval", "", "Environment health job interval (cron expression)")updateCmd.Flags().StringVar(&eventCleanupInterval, "event-cleanup-interval", "", "Event cleanup job interval (cron expression)")+ updateCmd.Flags().StringVar(&expiredSessionsCleanupInterval, "expired-sessions-cleanup-interval", "", "Expired sessions cleanup job interval (cron expression)")}diff --git a/frontend/src/lib/types/job-schedule.type.ts b/frontend/src/lib/types/job-schedule.type.tsindex 234624694..f825cfabd 100644--- a/frontend/src/lib/types/job-schedule.type.ts+++ b/frontend/src/lib/types/job-schedule.type.ts@@ -1,6 +1,7 @@export type JobSchedules = {environmentHealthInterval: string;eventCleanupInterval: string;+ expiredSessionsCleanupInterval: string;autoUpdateInterval: string;dockerClientRefreshInterval: string;pollingInterval: string;diff --git a/types/auth/auth.go b/types/auth/auth.goindex 39e624a00..05a322810 100644--- a/types/auth/auth.go+++ b/types/auth/auth.go@@ -23,6 +23,12 @@ type PasswordChange struct {NewPassword string `json:"newPassword" minLength:"8" doc:"New password for the user"`}+// SessionMeta captures request metadata associated with an authenticated session.+type SessionMeta struct {+ UserAgent string+ IPAddress string+}+// LoginResponse represents the successful login response data.type LoginResponse struct {Token string `json:"token" doc:"JWT access token"`diff --git a/types/jobschedule/jobschedule.go b/types/jobschedule/jobschedule.goindex 26be0d808..03b9f5fca 100644--- a/types/jobschedule/jobschedule.go+++ b/types/jobschedule/jobschedule.go@@ -7,30 +7,32 @@ import "time"// All fields are in minutes.// This makes conversion to time.Duration straightforward in the backend.type Config struct {- EnvironmentHealthInterval string `json:"environmentHealthInterval"`- EventCleanupInterval string `json:"eventCleanupInterval"`- AutoUpdateInterval string `json:"autoUpdateInterval"`- DockerClientRefreshInterval string `json:"dockerClientRefreshInterval"`- PollingInterval string `json:"pollingInterval"`- ScheduledPruneInterval string `json:"scheduledPruneInterval"`- GitopsSyncInterval string `json:"gitopsSyncInterval"`- VulnerabilityScanInterval string `json:"vulnerabilityScanInterval"`- AutoHealInterval string `json:"autoHealInterval"`+ EnvironmentHealthInterval string `json:"environmentHealthInterval"`+ EventCleanupInterval string `json:"eventCleanupInterval"`+ ExpiredSessionsCleanupInterval string `json:"expiredSessionsCleanupInterval"`+ AutoUpdateInterval string `json:"autoUpdateInterval"`+ DockerClientRefreshInterval string `json:"dockerClientRefreshInterval"`+ PollingInterval string `json:"pollingInterval"`+ ScheduledPruneInterval string `json:"scheduledPruneInterval"`+ GitopsSyncInterval string `json:"gitopsSyncInterval"`+ VulnerabilityScanInterval string `json:"vulnerabilityScanInterval"`+ AutoHealInterval string `json:"autoHealInterval"`}// Update is used to update job schedule intervals (in minutes).//// Any nil field is ignored.type Update struct {- EnvironmentHealthInterval *string `json:"environmentHealthInterval,omitempty"`- EventCleanupInterval *string `json:"eventCleanupInterval,omitempty"`- AutoUpdateInterval *string `json:"autoUpdateInterval,omitempty"`- DockerClientRefreshInterval *string `json:"dockerClientRefreshInterval,omitempty"`- PollingInterval *string `json:"pollingInterval,omitempty"`- ScheduledPruneInterval *string `json:"scheduledPruneInterval,omitempty"`- GitopsSyncInterval *string `json:"gitopsSyncInterval,omitempty"`- VulnerabilityScanInterval *string `json:"vulnerabilityScanInterval,omitempty"`- AutoHealInterval *string `json:"autoHealInterval,omitempty"`+ EnvironmentHealthInterval *string `json:"environmentHealthInterval,omitempty"`+ EventCleanupInterval *string `json:"eventCleanupInterval,omitempty"`+ ExpiredSessionsCleanupInterval *string `json:"expiredSessionsCleanupInterval,omitempty"`+ AutoUpdateInterval *string `json:"autoUpdateInterval,omitempty"`+ DockerClientRefreshInterval *string `json:"dockerClientRefreshInterval,omitempty"`+ PollingInterval *string `json:"pollingInterval,omitempty"`+ ScheduledPruneInterval *string `json:"scheduledPruneInterval,omitempty"`+ GitopsSyncInterval *string `json:"gitopsSyncInterval,omitempty"`+ VulnerabilityScanInterval *string `json:"vulnerabilityScanInterval,omitempty"`+ AutoHealInterval *string `json:"autoHealInterval,omitempty"`}// JobStatus represents the current status and metadata for a background job.diff --git a/types/meta/job_metadata.go b/types/meta/job_metadata.goindex 67e278670..1715ab322 100644--- a/types/meta/job_metadata.go+++ b/types/meta/job_metadata.go@@ -59,6 +59,17 @@ var jobMetadataRegistry = map[string]JobMetadata{CanRunManually: true,Prerequisites: []JobPrerequisiteMetadata{},},+ "expired-sessions-cleanup": {+ ID: "expired-sessions-cleanup",+ Name: "Expired Sessions Cleanup",+ Description: "Removes expired and old revoked user sessions from the database",+ Category: "maintenance",+ SettingsKey: "expiredSessionsCleanupInterval",+ ManagerOnly: false,+ IsContinuous: false,+ CanRunManually: true,+ Prerequisites: []JobPrerequisiteMetadata{},+ },"analytics-heartbeat": {ID: "analytics-heartbeat",Name: "Analytics Heartbeat",