Skip to content

Modern Docker Management, Designed for Everyone

perf: serve cached auth token state

Kyle Mendell65fcfa637919
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.go
index 24d7d188a..9d80c82a1 100644
--- a/backend/internal/auth/service.go
+++ b/backend/internal/auth/service.go
@@ -56,8 +56,10 @@ type AuthSettings struct {
}
type verifiedTokenEntry struct {
- User common.User
- SessionID string
+ User common.User
+ SessionID string
+ TokenExpiresAt time.Time
+ SessionExpiresAt time.Time
}
type AuthService struct {
@@ -72,9 +74,10 @@ type AuthService struct {
refreshExpiry time.Duration
config *config.Config
errorHandler emperror.ErrorHandler
- // tokenCache is a per-process in-memory cache for parsed user/token data.
- // Cached entries still revalidate persisted session state so revocation
- // performed by another process takes effect immediately.
+ // tokenCache is a per-process in-memory cache for verified tokens. A hit
+ // skips signature verification and the user/session lookups; revocation in
+ // this process purges entries, revocation by another process is visible
+ // once the TTL lapses.
tokenCache *hot.HotCache[string, verifiedTokenEntry]
}
@@ -92,7 +95,7 @@ func NewAuthService(userService *user.UserService, settingsService *settings.Set
config: cfg,
errorHandler: errorHandler,
tokenCache: hot.NewHotCache[string, verifiedTokenEntry](hot.LRU, 4096).
- WithTTL(15 * time.Second).
+ WithTTL(60 * time.Second).
WithJanitor().
Build(),
}
@@ -768,6 +771,10 @@ func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, met
}
func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*common.User, string, error) {
+ tokenHash := hashTokenInternal(accessToken)
+ if user, sessionID, ok := s.cachedVerificationInternal(tokenHash); ok {
+ return user, sessionID, nil
+ }
signingKey, err := s.signingKeyInternal(ctx)
if err != nil {
return nil, "", err
@@ -776,10 +783,14 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*com
if err != nil {
return nil, "", err
}
- return s.verifyTokenClaimsInternal(ctx, accessToken, claims)
+ return s.verifyTokenClaimsInternal(ctx, tokenHash, claims)
}
func (s *AuthService) VerifyBrowserToken(ctx context.Context, browserToken string) (*common.User, string, error) {
+ tokenHash := "browser:" + hashTokenInternal(browserToken)
+ if user, sessionID, ok := s.cachedVerificationInternal(tokenHash); ok {
+ return user, sessionID, nil
+ }
algorithm, ok := signedTokenAlgorithmInternal(browserToken)
if !ok {
return nil, "", common.ErrInvalidToken
@@ -794,7 +805,7 @@ func (s *AuthService) VerifyBrowserToken(ctx context.Context, browserToken strin
if err != nil {
return nil, "", err
}
- return s.verifyTokenClaimsInternal(ctx, browserToken, claims)
+ return s.verifyTokenClaimsInternal(ctx, tokenHash, claims)
case jwa.MLDSA87().String():
return s.VerifyToken(ctx, browserToken)
default:
@@ -802,7 +813,20 @@ func (s *AuthService) VerifyBrowserToken(ctx context.Context, browserToken strin
}
}
-func (s *AuthService) verifyTokenClaimsInternal(ctx context.Context, rawToken string, claims *accessTokenClaims) (*common.User, string, error) {
+func (s *AuthService) cachedVerificationInternal(tokenHash string) (*common.User, string, bool) {
+ cached, ok, _ := s.tokenCache.Get(tokenHash)
+ if !ok {
+ return nil, "", false
+ }
+ now := time.Now()
+ if now.After(cached.TokenExpiresAt) || now.After(cached.SessionExpiresAt) {
+ s.tokenCache.Delete(tokenHash)
+ return nil, "", false
+ }
+ return new(cached.User), cached.SessionID, true
+}
+
+func (s *AuthService) verifyTokenClaimsInternal(ctx context.Context, tokenHash string, claims *accessTokenClaims) (*common.User, string, error) {
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, "", common.ErrTokenVersionMismatch
@@ -811,30 +835,6 @@ func (s *AuthService) verifyTokenClaimsInternal(ctx context.Context, rawToken st
return nil, "", common.Classify(common.ErrUnavailable, errors.New("Session service is not configured"))
}
- tokenHash := hashTokenInternal(rawToken)
- if cached, ok, _ := s.tokenCache.Get(tokenHash); ok {
- if cached.User.ID != claims.UserID || cached.SessionID != claims.SessionID {
- s.tokenCache.Delete(tokenHash)
- return nil, "", common.ErrInvalidToken
- }
-
- userSession, err := s.sessionService.GetSessionByID(ctx, cached.SessionID)
- if err != nil {
- s.tokenCache.Delete(tokenHash)
- return nil, "", err
- }
- if userSession.UserID != cached.User.ID {
- s.tokenCache.Delete(tokenHash)
- return nil, "", common.ErrInvalidToken
- }
- if err := session.ValidateActive(userSession); err != nil {
- s.tokenCache.Delete(tokenHash)
- return nil, "", err
- }
-
- return new(cached.User), cached.SessionID, nil
- }
-
// Verify user exists in DB
// This ensures that if the database is wiped or user is deleted, the token becomes invalid
// even if the JWT signature is still valid (e.g. same signing key).
@@ -857,7 +857,7 @@ func (s *AuthService) verifyTokenClaimsInternal(ctx context.Context, rawToken st
return nil, "", err
}
- s.tokenCache.Set(tokenHash, verifiedTokenEntry{User: *dbUser, SessionID: userSession.ID})
+ s.tokenCache.Set(tokenHash, verifiedTokenEntry{User: *dbUser, SessionID: userSession.ID, TokenExpiresAt: claims.ExpiresAt, SessionExpiresAt: userSession.ExpiresAt})
return dbUser, userSession.ID, nil
}
diff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.go
index bd7fb4850..7cda86675 100644
--- a/backend/internal/auth/service_test.go
+++ b/backend/internal/auth/service_test.go
@@ -591,10 +591,10 @@ func TestVerifyToken_RejectsRevokedCachedSession(t *testing.T) {
_, _, err = s.VerifyToken(context.Background(), token)
require.NoError(t, err)
- require.NoError(t, session.NewSessionService(db).RevokeSession(context.Background(), sessionRecord.ID))
+ require.NoError(t, s.RevokeSession(context.Background(), sessionRecord.ID))
_, _, err = s.VerifyToken(context.Background(), token)
- require.ErrorIs(t, err, common.ErrSessionRevoked, "expected cached access token to be rejected after cross-process revocation, got %v", err)
+ require.ErrorIs(t, err, common.ErrSessionRevoked, "expected cached access token to be rejected after revocation, got %v", err)
}
func TestRefreshToken_RotatesJTI(t *testing.T) {
diff --git a/backend/internal/auth/token.go b/backend/internal/auth/token.go
index 947c61ce9..1c97262e3 100644
--- a/backend/internal/auth/token.go
+++ b/backend/internal/auth/token.go
@@ -3,6 +3,7 @@ package auth
import (
"context"
"crypto/mldsa"
+ "time"
"emperror.dev/errors"
"github.com/lestrrat-go/jwx/v4/jwa"
@@ -34,6 +35,7 @@ type accessTokenClaims struct {
SessionID string
Username string
AppVersion string
+ ExpiresAt time.Time
}
type refreshTokenClaims struct {
@@ -79,7 +81,8 @@ func parseAccessTokenInternal(ctx context.Context, rawToken string, key *mldsa.P
if errors.Is(usernameErr, jwt.ClaimTypeMismatchError{}) || errors.Is(appVersionErr, jwt.ClaimTypeMismatchError{}) {
return nil, common.ErrTokenValidation
}
- return new(accessTokenClaims{UserID: userID, SessionID: sessionID, Username: username, AppVersion: appVersion}), nil
+ expiresAt, _ := token.Expiration()
+ return new(accessTokenClaims{UserID: userID, SessionID: sessionID, Username: username, AppVersion: appVersion, ExpiresAt: expiresAt}), nil
}
func parseBrowserTokenInternal(ctx context.Context, rawToken string, key []byte) (*accessTokenClaims, error) {
@@ -107,7 +110,8 @@ func parseBrowserTokenInternal(ctx context.Context, rawToken string, key []byte)
if errors.Is(appVersionErr, jwt.ClaimTypeMismatchError{}) {
return nil, common.ErrTokenValidation
}
- return new(accessTokenClaims{UserID: userID, SessionID: sessionID, AppVersion: appVersion}), nil
+ expiresAt, _ := token.Expiration()
+ return new(accessTokenClaims{UserID: userID, SessionID: sessionID, AppVersion: appVersion, ExpiresAt: expiresAt}), nil
}
func signedTokenAlgorithmInternal(rawToken string) (string, bool) {
diff --git a/backend/internal/federated/service.go b/backend/internal/federated/service.go
index 26564e2df..c37648f0d 100644
--- a/backend/internal/federated/service.go
+++ b/backend/internal/federated/service.go
@@ -238,6 +238,9 @@ func (s *FederatedCredentialService) Update(ctx context.Context, callerUserID, i
if roleChanged && s.roleService != nil {
s.roleService.InvalidateUser(updated.IdentityUserID)
}
+ if (revokeActiveSessions || roleChanged) && s.authService != nil {
+ s.authService.InvalidateUserTokenCache(updated.IdentityUserID)
+ }
return s.Get(ctx, id)
}
@@ -265,5 +268,8 @@ func (s *FederatedCredentialService) Delete(ctx context.Context, id string) erro
if s.roleService != nil {
s.roleService.InvalidateUser(credential.IdentityUserID)
}
+ if s.authService != nil {
+ s.authService.InvalidateUserTokenCache(credential.IdentityUserID)
+ }
return nil
}