Skip to content

Modern Docker Management, Designed for Everyone

feat: sessions, OIDC, passkeys, and edge mTLS now signed and verified with ML-DSA-87 (#3785)

Kyle Mendell2993fd316d41
diff --git a/backend/api/buildables.go b/backend/api/buildables.go
index 999aadd82..6324e1f90 100644
--- a/backend/api/buildables.go
+++ b/backend/api/buildables.go
@@ -89,7 +89,9 @@ func registerAutoLoginRoutes(apiGroup *echo.Group, authService *auth.AuthService
maxAge += 60
expiresAt := tokenPair.ExpiresAt
- c.Response().Header().Set("Set-Cookie", cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromRequest(c.Request())))
+ for _, tokenCookie := range cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromRequest(c.Request())) {
+ c.Response().Header().Add("Set-Cookie", tokenCookie)
+ }
return c.JSON(http.StatusOK, base.ApiResponse[authtypes.AuthenticationResponse]{
Success: true,
Data: authtypes.AuthenticationResponse{
diff --git a/backend/cli/generate/secret_test.go b/backend/cli/generate/secret_test.go
index 89075cb7a..885727d7a 100644
--- a/backend/cli/generate/secret_test.go
+++ b/backend/cli/generate/secret_test.go
@@ -56,19 +56,18 @@ func TestSecretDefaultBase64(t *testing.T) {
require.Contains(t, out, "BASE64",
"expected BASE64 header in output, got: %q", out)
- // find ENCRYPTION_KEY= and JWT_SECRET= lines and ensure they are valid base64
- var encVal, jwtVal string
+ // find the ENCRYPTION_KEY= line and ensure it is valid base64
+ var encVal string
for line := range strings.SplitSeq(out, "\n") {
if after, ok := strings.CutPrefix(line, "ENCRYPTION_KEY="); ok {
encVal = after
}
- if after, ok := strings.CutPrefix(line, "JWT_SECRET="); ok {
- jwtVal = after
- }
}
- require.False(t, encVal == "" || jwtVal == "",
- "missing keys in output: enc=%q jwt=%q out=%q", encVal, jwtVal, out)
+ require.NotEmpty(t, encVal,
+ "missing ENCRYPTION_KEY in output: %q", out)
+ require.NotContains(t, out, "JWT_SECRET",
+ "JWT_SECRET is no longer emitted, got: %q", out)
if b, err := base64.StdEncoding.DecodeString(encVal); err != nil {
require.FailNowf(t, "unexpected failure", "ENCRYPTION_KEY is not valid base64: %v (value=%q)", err, encVal)
@@ -76,12 +75,6 @@ func TestSecretDefaultBase64(t *testing.T) {
require.Len(t, b, 32,
"ENCRYPTION_KEY decoded length != 32 bytes: %d", len(b))
}
- if b, err := base64.StdEncoding.DecodeString(jwtVal); err != nil {
- require.FailNowf(t, "unexpected failure", "JWT_SECRET is not valid base64: %v (value=%q)", err, jwtVal)
- } else if len(b) != 32 {
- require.Len(t, b, 32,
- "JWT_SECRET decoded length != 32 bytes: %d", len(b))
- }
}
func TestSecretAllFormatContainsSections(t *testing.T) {
@@ -112,8 +105,8 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
}
- // verify hex values decode to 32 bytes
- var hexEnc, hexJwt string
+ // verify the hex value decodes to 32 bytes
+ var hexEnc string
for line := range strings.SplitSeq(out, "\n") {
if after, ok := strings.CutPrefix(line, "ENCRYPTION_KEY="); ok {
v := after
@@ -123,17 +116,12 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
continue
}
}
- if after, ok := strings.CutPrefix(line, "JWT_SECRET="); ok {
- v := after
- if len(v) >= 64 {
- hexJwt = v
- continue
- }
- }
}
- require.False(t, hexEnc == "" || hexJwt == "",
- "hex values not found in output (enc=%q jwt=%q) output:\n%s", hexEnc, hexJwt, out)
+ require.NotEmpty(t, hexEnc,
+ "hex value not found in output:\n%s", out)
+ require.NotContains(t, out, "JWT_SECRET",
+ "JWT_SECRET is no longer emitted, got: %q", out)
if b, err := hex.DecodeString(strings.TrimSpace(hexEnc)); err != nil {
require.FailNowf(t, "unexpected failure", "ENCRYPTION_KEY hex decode failed: %v", err)
@@ -141,10 +129,4 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
require.Len(t, b, 32,
"ENCRYPTION_KEY hex decoded length != 32: %d", len(b))
}
- if b, err := hex.DecodeString(strings.TrimSpace(hexJwt)); err != nil {
- require.FailNowf(t, "unexpected failure", "JWT_SECRET hex decode failed: %v", err)
- } else if len(b) != 32 {
- require.Len(t, b, 32,
- "JWT_SECRET hex decoded length != 32: %d", len(b))
- }
}
diff --git a/backend/go.mod b/backend/go.mod
index 967d6d6a9..e7bff53d6 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -34,6 +34,7 @@ require (
github.com/getarcaneapp/arcane/cli/v2 v2.9.0
github.com/getarcaneapp/arcane/types/v2 v2.9.0
github.com/go-git/go-git/v5 v5.19.2
+ github.com/go-jose/go-jose/v4 v4.1.4
github.com/go-webauthn/webauthn v0.18.0
github.com/gofrs/flock v0.13.1
github.com/golang-jwt/jwt/v5 v5.3.1
@@ -159,7 +160,6 @@ require (
github.com/fxamacker/cbor/v2 v2.9.3 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.9.0 // indirect
- github.com/go-jose/go-jose/v4 v4.1.4 // indirect
github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
diff --git a/backend/internal/auth/buildables_test.go b/backend/internal/auth/buildables_test.go
index 86a1d35d6..e134ec877 100644
--- a/backend/internal/auth/buildables_test.go
+++ b/backend/internal/auth/buildables_test.go
@@ -30,7 +30,7 @@ func TestGetAutoLoginConfig_Enabled(t *testing.T) {
require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))
require.NoError(t, settingsSvc.SetBoolSetting(ctx, "authLocalEnabled", true))
- s := newTestAuthService("")
+ s := newTestAuthService()
s.config = &config.Config{
BuildablesConfig: config.BuildablesConfig{
AutoLoginUsername: "autologinuser",
@@ -56,7 +56,7 @@ func TestGetAutoLoginConfig_DisabledWhenLocalAuthDisabled(t *testing.T) {
require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))
require.NoError(t, settingsSvc.SetBoolSetting(ctx, "authLocalEnabled", false))
- s := newTestAuthService("")
+ s := newTestAuthService()
s.config = &config.Config{
BuildablesConfig: config.BuildablesConfig{
AutoLoginUsername: "autologinuser",
@@ -74,7 +74,7 @@ func TestGetAutoLoginConfig_DisabledWhenLocalAuthDisabled(t *testing.T) {
func TestGetAutoLoginPassword(t *testing.T) {
enableAutoLoginFeature(t)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.config = &config.Config{
BuildablesConfig: config.BuildablesConfig{
AutoLoginPassword: "my-secret-password",
@@ -87,7 +87,7 @@ func TestGetAutoLoginPassword(t *testing.T) {
func TestGetAutoLoginPassword_EmptyWhenNotConfigured(t *testing.T) {
enableAutoLoginFeature(t)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.config = &config.Config{
BuildablesConfig: config.BuildablesConfig{
AutoLoginPassword: "",
diff --git a/backend/internal/auth/handler.go b/backend/internal/auth/handler.go
index 679367ab6..fe04a84a9 100644
--- a/backend/internal/auth/handler.go
+++ b/backend/internal/auth/handler.go
@@ -280,7 +280,7 @@ func (h *AuthHandler) Login(ctx context.Context, input *LoginInput) (*LoginOutpu
expiresAt := tokenPair.ExpiresAt
return &LoginOutput{
- SetCookie: []string{cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))},
+ SetCookie: cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx)),
Body: base.ApiResponse[authtypes.AuthenticationResponse]{
Success: true,
Data: authtypes.AuthenticationResponse{
@@ -362,7 +362,7 @@ func (h *AuthHandler) RefreshToken(ctx context.Context, input *RefreshTokenInput
maxAge += 60
return &RefreshTokenOutput{
- SetCookie: []string{cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))},
+ SetCookie: cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx)),
Body: base.ApiResponse[authtypes.TokenRefreshResponse]{
Success: true,
Data: authtypes.TokenRefreshResponse{
diff --git a/backend/internal/auth/huma_middleware.go b/backend/internal/auth/huma_middleware.go
index c821c6891..9e230fcca 100644
--- a/backend/internal/auth/huma_middleware.go
+++ b/backend/internal/auth/huma_middleware.go
@@ -352,26 +352,12 @@ func extractBearerTokenInternal(ctx huma.Context) string {
}
// Try cookie as fallback
- cookieHeader := ctx.Header("Cookie")
- if cookieHeader != "" {
- return extractTokenFromCookieHeaderInternal(cookieHeader)
- }
-
- return ""
-}
-
-// extractTokenFromCookieHeaderInternal parses the token cookie from a Cookie header string.
-func extractTokenFromCookieHeaderInternal(cookieHeader string) string {
- cookies := strings.SplitSeq(cookieHeader, ";")
- for c := range cookies {
- c = strings.TrimSpace(c)
- if after, ok := strings.CutPrefix(c, "token="); ok {
- return after
- }
- if after, ok := strings.CutPrefix(c, "__Host-token="); ok {
- return after
+ if cookieHeader := ctx.Header("Cookie"); cookieHeader != "" {
+ if token, err := cookie.GetTokenCookieFromHeader(cookieHeader); err == nil {
+ return token
}
}
+
return ""
}
diff --git a/backend/internal/auth/huma_middleware_test.go b/backend/internal/auth/huma_middleware_test.go
index 1d7c05a79..5c9987be9 100644
--- a/backend/internal/auth/huma_middleware_test.go
+++ b/backend/internal/auth/huma_middleware_test.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"context"
+ "crypto/mldsa"
"net/http"
"net/http/httptest"
"testing"
@@ -22,6 +23,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v5"
@@ -103,9 +105,9 @@ func TestNewHumaMiddleware_UsesBearerWhenLoopbackProxySendsEnvironmentAccessToke
userSvc := user.NewUserService(db)
sessionSvc := session.NewSessionService(db)
- jwtSecret := "test-secret-please-do-not-use-in-prod"
- authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, jwtSecret, &config.Config{JWTRefreshExpiry: 24 * time.Hour}, nil)
- bearerToken := mintHumaMiddlewareTestTokenInternal(t, userSvc, sessionSvc, jwtSecret, "u-loopback")
+ signingKey := newTestSigningKeyInternal()
+ authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, &config.Config{JWTRefreshExpiry: 24 * time.Hour}, nil).WithSigningKey(signingKey)
+ bearerToken := mintHumaMiddlewareTestTokenInternal(t, userSvc, sessionSvc, signingKey, "u-loopback")
ps := authz.NewPermissionSet()
ps.AddEnv("0", authz.PermContainersStart)
@@ -265,9 +267,9 @@ func TestNewHumaMiddleware_OpportunisticAuthOnPublicRoute(t *testing.T) {
userSvc := user.NewUserService(db)
sessionSvc := session.NewSessionService(db)
- jwtSecret := "test-secret-please-do-not-use-in-prod"
+ signingKey := newTestSigningKeyInternal()
cfg := &config.Config{JWTRefreshExpiry: 24 * time.Hour}
- authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, jwtSecret, cfg, nil)
+ authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, cfg, nil).WithSigningKey(signingKey)
_, err := userSvc.CreateUser(context.Background(), &common.User{
ID: "u-logout",
@@ -289,7 +291,7 @@ func TestNewHumaMiddleware_OpportunisticAuthOnPublicRoute(t *testing.T) {
"username": "logouttest",
"roles": []string{"user"},
}
- token, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(jwtSecret))
+ token, err := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims).SignedString(signingKey)
require.NoError(t, err)
router := echo.New()
@@ -353,9 +355,9 @@ func TestNewHumaMiddleware_VersionMismatchIsRecoverable(t *testing.T) {
userSvc := user.NewUserService(db)
sessionSvc := session.NewSessionService(db)
- jwtSecret := "test-secret-please-do-not-use-in-prod"
+ signingKey := newTestSigningKeyInternal()
cfg := &config.Config{JWTRefreshExpiry: 24 * time.Hour}
- authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, jwtSecret, cfg, nil)
+ authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, cfg, nil).WithSigningKey(signingKey)
_, err := userSvc.CreateUser(context.Background(), &common.User{
ID: "u-ver",
@@ -381,7 +383,7 @@ func TestNewHumaMiddleware_VersionMismatchIsRecoverable(t *testing.T) {
if appVersion != "" {
claims["app_version"] = appVersion
}
- token, signErr := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(jwtSecret))
+ token, signErr := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims).SignedString(signingKey)
require.NoError(t, signErr)
return token
}
@@ -483,7 +485,7 @@ func setupAuthMiddlewareTestDBInternal(t *testing.T) *database.DB {
return &database.DB{DB: db}
}
-func mintHumaMiddlewareTestTokenInternal(t *testing.T, userSvc *user.UserService, sessionSvc *session.SessionService, jwtSecret string, userID string) string {
+func mintHumaMiddlewareTestTokenInternal(t *testing.T, userSvc *user.UserService, sessionSvc *session.SessionService, signingKey *mldsa.PrivateKey, userID string) string {
t.Helper()
_, err := userSvc.CreateUser(context.Background(), &common.User{
@@ -505,7 +507,7 @@ func mintHumaMiddlewareTestTokenInternal(t *testing.T, userSvc *user.UserService
"user_id": userID,
"username": userID,
}
- token, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(jwtSecret))
+ token, err := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims).SignedString(signingKey)
require.NoError(t, err)
return token
}
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.go
index 43bbc2698..b27317540 100644
--- a/backend/internal/auth/service.go
+++ b/backend/internal/auth/service.go
@@ -4,6 +4,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"context"
+ "crypto/mldsa"
"crypto/sha256"
"encoding/hex"
"fmt"
@@ -11,6 +12,7 @@ import (
"maps"
"strconv"
"strings"
+ "sync"
"time"
"uuid"
@@ -25,6 +27,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/golang-jwt/jwt/v5"
@@ -83,7 +86,8 @@ type AuthService struct {
eventService *event.EventService
sessionService *session.SessionService
roleService *role.RoleService
- jwtSecret []byte
+ signingKeyMu sync.Mutex
+ signingKey *mldsa.PrivateKey
refreshExpiry time.Duration
config *config.Config
errorHandler emperror.ErrorHandler
@@ -93,10 +97,7 @@ type AuthService struct {
tokenCache *hot.HotCache[string, verifiedTokenEntry]
}
-func NewAuthService(userService *user.UserService, settingsService *settings.SettingsService, eventService *event.EventService, sessionService *session.SessionService, roleService *role.RoleService, jwtSecret string, cfg *config.Config, errorHandler emperror.ErrorHandler) *AuthService {
- // Production managers must supply an explicit, non-default JWT_SECRET (fail
- // closed, mirroring the ENCRYPTION_KEY guard). Dev and agent mode auto-generate.
- requireExplicitSecret := cfg.Environment == config.AppEnvironmentProduction && !cfg.AgentMode
+func NewAuthService(userService *user.UserService, settingsService *settings.SettingsService, eventService *event.EventService, sessionService *session.SessionService, roleService *role.RoleService, cfg *config.Config, errorHandler emperror.ErrorHandler) *AuthService {
if errorHandler == nil {
errorHandler = emperror.NoopHandler{}
}
@@ -106,7 +107,6 @@ func NewAuthService(userService *user.UserService, settingsService *settings.Set
eventService: eventService,
sessionService: sessionService,
roleService: roleService,
- jwtSecret: jwtclaims.CheckOrGenerateJwtSecret(jwtSecret, requireExplicitSecret),
refreshExpiry: cfg.JWTRefreshExpiry,
config: cfg,
errorHandler: errorHandler,
@@ -657,14 +657,14 @@ func (s *AuthService) extractOidcGroups(ctx context.Context, userInfo auth.OidcU
if claim != "" {
if v, ok := jwtclaims.GetByPath(userInfo.Extra, claim).Get(); ok {
- if groups := stringValuesFromClaim(v); len(groups) > 0 {
+ if groups := jwtclaims.StringSliceFromClaimValue(v); len(groups) > 0 {
return groups
}
}
if tokenResp != nil && tokenResp.IDToken != "" {
if parsed := jwtclaims.ParseJWTClaims(tokenResp.IDToken); parsed != nil {
if v, ok := jwtclaims.GetByPath(parsed, claim).Get(); ok {
- if groups := stringValuesFromClaim(v); len(groups) > 0 {
+ if groups := jwtclaims.StringSliceFromClaimValue(v); len(groups) > 0 {
return groups
}
}
@@ -687,32 +687,6 @@ func (s *AuthService) oidcGroupsClaim(ctx context.Context) string {
return v
}
-// stringValuesFromClaim flattens a claim value into a slice of strings.
-// Accepts string, []string, []any (coerces each element to string), or nil.
-func stringValuesFromClaim(v any) []string {
- switch typed := v.(type) {
- case nil:
- return nil
- case string:
- if typed == "" {
- return nil
- }
- return []string{typed}
- case []string:
- return typed
- case []any:
- out := make([]string, 0, len(typed))
- for _, item := range typed {
- if s, ok := item.(string); ok && s != "" {
- out = append(out, s)
- }
- }
- return out
- default:
- return nil
- }
-}
-
func (s *AuthService) persistOidcTokens(user *common.User, tokenResp *auth.OidcTokenResponse) {
if tokenResp == nil {
return
@@ -728,14 +702,40 @@ func (s *AuthService) persistOidcTokens(user *common.User, tokenResp *auth.OidcT
}
}
+func (s *AuthService) WithSigningKey(key *mldsa.PrivateKey) *AuthService {
+ s.signingKey = key
+ return s
+}
+
+func (s *AuthService) signingKeyInternal(ctx context.Context) (*mldsa.PrivateKey, error) {
+ s.signingKeyMu.Lock()
+ defer s.signingKeyMu.Unlock()
+ if s.signingKey != nil {
+ return s.signingKey, nil
+ }
+ if s.settingsService == nil {
+ return nil, common.Classify(common.ErrUnavailable, errors.New("JWT signing key is not configured"))
+ }
+ key, err := s.settingsService.EnsureJwtSigningKey(ctx)
+ if err != nil {
+ return nil, err
+ }
+ s.signingKey = key
+ return key, nil
+}
+
func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, meta auth.SessionMeta) (*TokenPair, error) {
+ signingKey, err := s.signingKeyInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
token, err := jwt.ParseWithClaims(refreshToken, &refreshClaims{},
func(t *jwt.Token) (any, error) {
- if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+ if _, ok := t.Method.(*mldsajose.SigningMethodMLDSA); !ok {
return nil, errors.Errorf("unexpected signing method: %v", t.Header["alg"])
}
- return s.jwtSecret, nil
- })
+ return signingKey.PublicKey(), nil
+ }, jwt.WithValidMethods([]string{mldsajose.AlgMLDSA87}))
if err != nil {
return nil, common.ErrInvalidToken
}
@@ -795,13 +795,17 @@ func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, met
}
func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*common.User, string, error) {
+ signingKey, err := s.signingKeyInternal(ctx)
+ if err != nil {
+ return nil, "", err
+ }
token, err := jwt.ParseWithClaims(accessToken, &userClaims{},
func(t *jwt.Token) (any, error) {
- if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+ if _, ok := t.Method.(*mldsajose.SigningMethodMLDSA); !ok {
return nil, errors.Errorf("unexpected signing method: %v", t.Header["alg"])
}
- return s.jwtSecret, nil
- })
+ return signingKey.PublicKey(), nil
+ }, jwt.WithValidMethods([]string{mldsajose.AlgMLDSA87}))
if err != nil {
if strings.Contains(err.Error(), "token is expired") {
return nil, "", common.ErrExpiredToken
@@ -863,7 +867,7 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*com
// 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 JWT_SECRET).
+ // even if the JWT signature is still valid (e.g. same signing key).
dbUser, err := s.userService.GetUserByID(ctx, claims.ID)
if err != nil {
if errors.Is(err, common.ErrUserNotFound) {
@@ -1016,14 +1020,19 @@ func (s *AuthService) buildTokenPairInternal(ctx context.Context, user *common.U
userClaims.DisplayName = *user.DisplayName
}
- accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, userClaims)
+ signingKey, err := s.signingKeyInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ accessToken := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, userClaims)
- accessTokenString, err := accessToken.SignedString(s.jwtSecret)
+ accessTokenString, err := accessToken.SignedString(signingKey)
if err != nil {
return nil, err
}
- refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, refreshClaims{
+ refreshToken := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, refreshClaims{
ID: refreshJTI,
Subject: "refresh",
IssuedAt: jwt.NewNumericDate(time.Now()),
@@ -1033,7 +1042,7 @@ func (s *AuthService) buildTokenPairInternal(ctx context.Context, user *common.U
AppVersion: config.Version,
})
- refreshTokenString, err := refreshToken.SignedString(s.jwtSecret)
+ refreshTokenString, err := refreshToken.SignedString(signingKey)
if err != nil {
return nil, err
}
@@ -1082,8 +1091,12 @@ func (s *AuthService) IssueFederatedToken(ctx context.Context, user *common.User
claims.DisplayName = *user.DisplayName
}
- accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
- accessTokenString, err := accessToken.SignedString(s.jwtSecret)
+ signingKey, err := s.signingKeyInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
+ accessToken := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims)
+ accessTokenString, err := accessToken.SignedString(signingKey)
if err != nil {
return nil, err
}
diff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.go
index bbcf2064e..c8e0084ae 100644
--- a/backend/internal/auth/service_test.go
+++ b/backend/internal/auth/service_test.go
@@ -8,7 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"context"
- "crypto/rand"
+ "crypto/mldsa"
"testing"
"time"
@@ -24,6 +24,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/golang-jwt/jwt/v5"
"github.com/samber/hot"
@@ -72,24 +73,17 @@ func newSettingsServiceForAuthTestInternal(t testing.TB, ctx context.Context, db
return settings.NewSettingsService(ctx, db, writes, effects)
}
-func newTestAuthService(secret string) *AuthService {
- if secret == "" {
- b := make([]byte, 32)
- if _, err := rand.Read(b); err != nil {
- panic(err)
- }
- return &AuthService{
- jwtSecret: b,
- refreshExpiry: 24 * time.Hour,
- config: &config.Config{},
- tokenCache: hot.NewHotCache[string, verifiedTokenEntry](hot.LRU, 4096).
- WithTTL(15 * time.Second).
- WithJanitor().
- Build(),
- }
+func newTestSigningKeyInternal() *mldsa.PrivateKey {
+ key, err := mldsa.GenerateKey(mldsa.MLDSA87())
+ if err != nil {
+ panic(err)
}
+ return key
+}
+
+func newTestAuthService() *AuthService {
return &AuthService{
- jwtSecret: []byte(secret),
+ signingKey: newTestSigningKeyInternal(),
refreshExpiry: 24 * time.Hour,
config: &config.Config{},
tokenCache: hot.NewHotCache[string, verifiedTokenEntry](hot.LRU, 4096).
@@ -99,7 +93,7 @@ func newTestAuthService(secret string) *AuthService {
}
}
-func makeAccessToken(t *testing.T, secret []byte, subject string, id string, username string, _ []string, email, displayName string, exp time.Time, sessionIDs ...string) string {
+func makeAccessToken(t *testing.T, key *mldsa.PrivateKey, subject string, id string, username string, _ []string, email, displayName string, exp time.Time, sessionIDs ...string) string {
t.Helper()
sessionID := ""
if len(sessionIDs) > 0 {
@@ -117,8 +111,8 @@ func makeAccessToken(t *testing.T, secret []byte, subject string, id string, use
DisplayName: displayName,
AppVersion: config.Version,
}
- tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
- signed, err := tok.SignedString(secret)
+ tok := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims)
+ signed, err := tok.SignedString(key)
require.NoError(t, err,
"sign: %v", err)
@@ -126,7 +120,7 @@ func makeAccessToken(t *testing.T, secret []byte, subject string, id string, use
return signed
}
-func makeRefreshToken(t *testing.T, secret []byte, subject string, id string, exp time.Time, userIDAndSessionID ...string) string {
+func makeRefreshToken(t *testing.T, key *mldsa.PrivateKey, subject string, id string, exp time.Time, userIDAndSessionID ...string) string {
t.Helper()
userID := id
sessionID := ""
@@ -145,8 +139,8 @@ func makeRefreshToken(t *testing.T, secret []byte, subject string, id string, ex
SessionID: sessionID,
AppVersion: config.Version,
}
- tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
- signed, err := tok.SignedString(secret)
+ tok := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, claims)
+ signed, err := tok.SignedString(key)
require.NoError(t, err,
"sign: %v", err)
@@ -179,7 +173,7 @@ func makeUnsignedToken(t *testing.T, claims jwt.Claims) string {
func TestVerifyToken_ValidClaims(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -195,7 +189,7 @@ func TestVerifyToken_ValidClaims(t *testing.T) {
exp := time.Now().Add(5 * time.Minute)
session, _ := createTestSession(t, db, "u123", exp)
- token := makeAccessToken(t, s.jwtSecret, "access", "u123", "alice", []string{"user", "admin"}, "[email protected]", "Alice", exp, session.ID)
+ token := makeAccessToken(t, s.signingKey, "access", "u123", "alice", []string{"user", "admin"}, "[email protected]", "Alice", exp, session.ID)
verifiedUser, _, err := s.VerifyToken(context.Background(), token)
@@ -216,8 +210,8 @@ func TestVerifyToken_ValidClaims(t *testing.T) {
}
-func TestVerifyToken_RejectsNonHMACAlg(t *testing.T) {
- s := newTestAuthService("")
+func TestVerifyToken_RejectsNonMLDSAAlg(t *testing.T) {
+ s := newTestAuthService()
exp := time.Now().Add(5 * time.Minute)
token := makeUnsignedToken(t, userClaims{
ID: "u1",
@@ -239,7 +233,7 @@ func TestVerifyToken_RejectsNonHMACAlg(t *testing.T) {
func TestVerifyToken_Expired(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -252,7 +246,7 @@ func TestVerifyToken_Expired(t *testing.T) {
require.NoError(t, err)
exp := time.Now().Add(-1 * time.Minute)
- token := makeAccessToken(t, s.jwtSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)
+ token := makeAccessToken(t, s.signingKey, "access", "u1", "bob", []string{"user"}, "", "", exp)
_, _, err = s.VerifyToken(context.Background(), token)
@@ -262,25 +256,20 @@ func TestVerifyToken_Expired(t *testing.T) {
}
func TestVerifyToken_InvalidSubject(t *testing.T) {
- s := newTestAuthService("")
+ s := newTestAuthService()
exp := time.Now().Add(5 * time.Minute)
- token := makeAccessToken(t, s.jwtSecret, "refresh", "u1", "bob", []string{"user"}, "", "", exp)
+ token := makeAccessToken(t, s.signingKey, "refresh", "u1", "bob", []string{"user"}, "", "", exp)
_, _, err := s.VerifyToken(context.Background(), token)
require.ErrorIs(t, err, common.ErrTokenValidation)
}
func TestVerifyToken_InvalidSignature(t *testing.T) {
- s := newTestAuthService("")
+ s := newTestAuthService()
exp := time.Now().Add(5 * time.Minute)
- otherSecret := make([]byte, 32)
- {
- _, err := rand.Read(otherSecret)
- require.NoError(t, err,
- "rand.Read: %v", err)
- }
+ otherKey := newTestSigningKeyInternal()
- token := makeAccessToken(t, otherSecret, "access", "u1", "bob", []string{"user"}, "", "", exp)
+ token := makeAccessToken(t, otherKey, "access", "u1", "bob", []string{"user"}, "", "", exp)
_, _, err := s.VerifyToken(context.Background(), token)
@@ -290,9 +279,9 @@ func TestVerifyToken_InvalidSignature(t *testing.T) {
}
func TestVerifyToken_MissingUserID(t *testing.T) {
- s := newTestAuthService("")
+ s := newTestAuthService()
exp := time.Now().Add(5 * time.Minute)
- token := makeAccessToken(t, s.jwtSecret, "access", "", "bob", []string{"user"}, "", "", exp)
+ token := makeAccessToken(t, s.signingKey, "access", "", "bob", []string{"user"}, "", "", exp)
_, _, err := s.VerifyToken(context.Background(), token)
require.ErrorIs(t, err, common.ErrTokenValidation)
@@ -329,7 +318,7 @@ func TestUniqueOidcUsernameInternal(t *testing.T) {
}
func TestPersistOidcTokens_SetsFields(t *testing.T) {
- s := newTestAuthService("")
+ s := newTestAuthService()
user := &common.User{}
start := time.Now()
resp := &auth.OidcTokenResponse{
@@ -359,12 +348,12 @@ func TestPersistOidcTokens_SetsFields(t *testing.T) {
}
func TestVerifyToken_VersionMismatch(t *testing.T) {
- s := newTestAuthService("")
+ 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)
+ token := makeAccessToken(t, s.signingKey, "access", "u1", "bob", []string{"user"}, "", "", exp)
config.Version = "2.0.0"
_, _, err := s.VerifyToken(context.Background(), token)
@@ -380,7 +369,7 @@ func TestRefreshToken_Valid(t *testing.T) {
userSvc := user.NewUserService(db)
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.settingsService = settingsSvc
s.sessionService = session.NewSessionService(db)
@@ -394,7 +383,7 @@ func TestRefreshToken_Valid(t *testing.T) {
exp := time.Now().Add(5 * time.Minute)
session, refreshJTI := createTestSession(t, db, "u-refresh", exp)
- token := makeRefreshToken(t, s.jwtSecret, "refresh", refreshJTI, exp, "u-refresh", session.ID)
+ token := makeRefreshToken(t, s.signingKey, "refresh", refreshJTI, exp, "u-refresh", session.ID)
tokenPair, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})
require.NoError(t, err)
@@ -411,7 +400,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {
userSvc := user.NewUserService(db)
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.settingsService = settingsSvc
s.sessionService = session.NewSessionService(db)
@@ -429,7 +418,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {
oldVersion := config.Version
t.Cleanup(func() { config.Version = oldVersion })
config.Version = "1.0.0"
- token := makeRefreshToken(t, s.jwtSecret, "refresh", refreshJTI, exp, user.ID, session.ID)
+ token := makeRefreshToken(t, s.signingKey, "refresh", refreshJTI, exp, user.ID, session.ID)
config.Version = "2.0.0"
tokenPair, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})
@@ -439,7 +428,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {
require.NotEmpty(t, tokenPair.RefreshToken)
parsedAccess, err := jwt.ParseWithClaims(tokenPair.AccessToken, &userClaims{}, func(*jwt.Token) (any, error) {
- return s.jwtSecret, nil
+ return s.signingKey.PublicKey(), nil
})
require.NoError(t, err)
accessClaims, ok := parsedAccess.Claims.(*userClaims)
@@ -447,7 +436,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {
require.Equal(t, "2.0.0", accessClaims.AppVersion)
parsedRefresh, err := jwt.ParseWithClaims(tokenPair.RefreshToken, &refreshClaims{}, func(*jwt.Token) (any, error) {
- return s.jwtSecret, nil
+ return s.signingKey.PublicKey(), nil
})
require.NoError(t, err)
rClaims, ok := parsedRefresh.Claims.(*refreshClaims)
@@ -458,7 +447,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {
func TestVerifyToken_RejectsRevokedSession(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -472,7 +461,7 @@ func TestVerifyToken_RejectsRevokedSession(t *testing.T) {
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)
+ token := makeAccessToken(t, s.signingKey, "access", user.ID, user.Username, []string{"user"}, "", "", exp, session.ID)
_, _, err = s.VerifyToken(context.Background(), token)
require.ErrorIs(t, err, common.ErrSessionRevoked)
@@ -481,7 +470,7 @@ func TestVerifyToken_RejectsRevokedSession(t *testing.T) {
func TestVerifyToken_RejectsMissingSessionID(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -492,7 +481,7 @@ func TestVerifyToken_RejectsMissingSessionID(t *testing.T) {
_, 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))
+ token := makeAccessToken(t, s.signingKey, "access", user.ID, user.Username, []string{"user"}, "", "", time.Now().Add(5*time.Minute))
_, _, err = s.VerifyToken(context.Background(), token)
require.ErrorIs(t, err, common.ErrTokenValidation)
@@ -501,7 +490,7 @@ func TestVerifyToken_RejectsMissingSessionID(t *testing.T) {
func TestRevokeSessionThenVerifyTokenFails(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -514,7 +503,7 @@ func TestRevokeSessionThenVerifyTokenFails(t *testing.T) {
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)
+ token := makeAccessToken(t, s.signingKey, "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)
@@ -524,7 +513,7 @@ func TestRevokeSessionThenVerifyTokenFails(t *testing.T) {
func TestVerifyToken_RejectsRevokedCachedSession(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -537,7 +526,7 @@ func TestVerifyToken_RejectsRevokedCachedSession(t *testing.T) {
exp := time.Now().Add(5 * time.Minute)
sessionRecord, _ := createTestSession(t, db, user.ID, exp)
- token := makeAccessToken(t, s.jwtSecret, "access", user.ID, user.Username, []string{"user"}, "", "", exp, sessionRecord.ID)
+ token := makeAccessToken(t, s.signingKey, "access", user.ID, user.Username, []string{"user"}, "", "", exp, sessionRecord.ID)
_, _, err = s.VerifyToken(context.Background(), token)
require.NoError(t, err)
@@ -552,7 +541,7 @@ func TestRefreshToken_RotatesJTI(t *testing.T) {
userSvc := user.NewUserService(db)
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.settingsService = settingsSvc
s.sessionService = session.NewSessionService(db)
@@ -566,7 +555,7 @@ func TestRefreshToken_RotatesJTI(t *testing.T) {
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)
+ token := makeRefreshToken(t, s.signingKey, "refresh", refreshJTI, exp, user.ID, session.ID)
tokenPair, err := s.RefreshToken(context.Background(), token, auth.SessionMeta{})
require.NoError(t, err)
@@ -581,7 +570,7 @@ func TestRefreshToken_RejectsRevokedSession(t *testing.T) {
userSvc := user.NewUserService(db)
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.settingsService = settingsSvc
s.sessionService = session.NewSessionService(db)
@@ -596,7 +585,7 @@ func TestRefreshToken_RejectsRevokedSession(t *testing.T) {
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)
+ token := makeRefreshToken(t, s.signingKey, "refresh", refreshJTI, exp, user.ID, session.ID)
_, err = s.RefreshToken(context.Background(), token, auth.SessionMeta{})
require.ErrorIs(t, err, common.ErrSessionRevoked)
@@ -605,7 +594,7 @@ func TestRefreshToken_RejectsRevokedSession(t *testing.T) {
func TestChangePassword_RevokesAllSessions(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -635,7 +624,7 @@ func TestChangePassword_RevokesAllSessions(t *testing.T) {
func TestChangePassword_KeepsCurrentSessionAlive(t *testing.T) {
db := setupAuthServiceTestDB(t)
userSvc := user.NewUserService(db)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.sessionService = session.NewSessionService(db)
@@ -663,7 +652,7 @@ func TestChangePassword_KeepsCurrentSessionAlive(t *testing.T) {
}
func TestRefreshToken_RejectsNonHMACAlg(t *testing.T) {
- s := newTestAuthService("")
+ s := newTestAuthService()
exp := time.Now().Add(5 * time.Minute)
token := makeUnsignedToken(t, jwt.RegisteredClaims{
ID: "u1",
@@ -682,7 +671,7 @@ func TestRefreshToken_RejectsNonHMACAlg(t *testing.T) {
func TestGetOidcConfigurationStatus(t *testing.T) {
db := setupAuthServiceTestDB(t)
// Disabled
- s := newTestAuthService("")
+ s := newTestAuthService()
s.config = &config.Config{}
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
@@ -752,7 +741,7 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_NoExistingUser_Creat
require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))
userSvc := user.NewUserService(db)
- authSvc := newTestAuthService("")
+ authSvc := newTestAuthService()
authSvc.userService = userSvc
authSvc.settingsService = settingsSvc
@@ -798,7 +787,7 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_WithExistingUser_Ret
_, err = userSvc.CreateUser(ctx, existing)
require.NoError(t, err)
- authSvc := newTestAuthService("")
+ authSvc := newTestAuthService()
authSvc.userService = userSvc
authSvc.settingsService = settingsSvc
@@ -840,7 +829,7 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailVerificationMissing_WithExisting
_, err = userSvc.CreateUser(ctx, existing)
require.NoError(t, err)
- authSvc := newTestAuthService("")
+ authSvc := newTestAuthService()
authSvc.userService = userSvc
authSvc.settingsService = settingsSvc
@@ -869,7 +858,7 @@ func TestAuthenticateLocalPrimary_EmailFallback(t *testing.T) {
userSvc := user.NewUserService(db)
settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)
require.NoError(t, err)
- s := newTestAuthService("")
+ s := newTestAuthService()
s.userService = userSvc
s.settingsService = settingsSvc
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index f98a4df88..2a5fe1f58 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -150,6 +150,12 @@ func isWeakProductionEncryptionKeyInternal(encryptionKey, environment string, ag
return len(strings.TrimPrefix(key, "raw:")) < 32
}
+func warnDeprecatedEnvVarsInternal(cfg *config.Config) {
+ for _, envName := range cfg.DeprecatedEnvVarsSet() {
+ slog.Warn("Deprecated environment variable is set and no longer used; remove it from your environment", "env", envName)
+ }
+}
+
func newConfiguredHTTPClient(cfg *config.Config) *http.Client {
if cfg.HTTPClientTimeout > 0 {
return httpx.NewHTTPClientWithTimeout(time.Duration(cfg.HTTPClientTimeout) * time.Second)
@@ -196,6 +202,8 @@ func initializeStartupState(p initializeStartupStateParams) {
AdminStaticAPIKey: cfg.AdminStaticAPIKey,
}
+ warnDeprecatedEnvVarsInternal(cfg)
+
startup.LoadAgentToken(appCtx, runtimeCfg, p.Settings.GetStringSetting)
startup.EnsureEncryptionKey(appCtx, runtimeCfg, p.Settings.EnsureEncryptionKey)
cfg.AgentToken = runtimeCfg.AgentToken
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index bce6a8572..8c73b7910 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -7,6 +7,7 @@ import (
"net/url"
"os"
"reflect"
+ "slices"
"strconv"
"strings"
"time"
@@ -25,7 +26,7 @@ const (
// Config holds all application configuration.
// Fields tagged with `env` will be loaded from the corresponding environment variable.
// Fields with `options:"file"` support Docker secrets via the _FILE suffix.
-// Available options: file, toLower, trimTrailingSlash
+// Available options: file, toLower, trimTrailingSlash, deprecated
type Config struct {
// BuildablesConfig contains feature-specific configuration that can be conditionally compiled
BuildablesConfig
@@ -41,7 +42,7 @@ type Config struct {
TLSCertFile string `env:"TLS_CERT_FILE" default:""`
TLSKeyFile string `env:"TLS_KEY_FILE" default:""`
Environment AppEnvironment `env:"ENVIRONMENT" default:"production"`
- JWTSecret string `env:"JWT_SECRET" default:"default-jwt-secret-change-me" options:"file"`
+ JWTSecret string `env:"JWT_SECRET" options:"file,deprecated"`
JWTRefreshExpiry time.Duration `env:"JWT_REFRESH_EXPIRY" default:"168h"`
EncryptionKey string `env:"ENCRYPTION_KEY" default:"arcane-dev-key-32-characters!!!" options:"file"`
AdminStaticAPIKey string `env:"ADMIN_STATIC_API_KEY" default:"" options:"file"`
@@ -230,6 +231,23 @@ func loadFromEnv(cfg *Config) {
})
}
+// DeprecatedEnvVarsSet returns the env names of fields tagged deprecated that
+// still carry a value, so bootstrap can warn once logging is configured.
+func (c *Config) DeprecatedEnvVarsSet() []string {
+ var envNames []string
+ v := reflect.ValueOf(c).Elem()
+ visitConfigFields(v, func(field reflect.Value, fieldType reflect.StructField) {
+ if !slices.Contains(strings.Split(fieldType.Tag.Get("options"), ","), "deprecated") {
+ return
+ }
+ if field.Kind() == reflect.String && field.String() == "" {
+ return
+ }
+ envNames = append(envNames, fieldType.Tag.Get("env"))
+ })
+ return envNames
+}
+
// applyOptions processes special options for Config fields after initial load.
func applyOptions(cfg *Config) {
v := reflect.ValueOf(cfg).Elem()
diff --git a/backend/internal/config/schema/schema.go b/backend/internal/config/schema/schema.go
index 14de524ab..222987b10 100644
--- a/backend/internal/config/schema/schema.go
+++ b/backend/internal/config/schema/schema.go
@@ -53,6 +53,7 @@ type ConfigEntry struct {
Description string `json:"description,omitempty"`
Options []string `json:"options,omitempty"`
SupportsFile bool `json:"supportsFile,omitempty"`
+ Deprecated bool `json:"deprecated,omitempty"`
Conditional bool `json:"conditional,omitempty"`
BuildTags []string `json:"buildTags,omitempty"`
Source string `json:"source"`
@@ -264,6 +265,7 @@ func parseStructEnvFieldsInternal(filename, structName string, opts envFieldOpti
Description: description,
Options: options,
SupportsFile: slices.Contains(options, "file"),
+ Deprecated: slices.Contains(options, "deprecated"),
Conditional: opts.conditional,
BuildTags: slices.Clone(opts.buildTags),
Source: opts.sourceType,
diff --git a/backend/internal/di/di.go b/backend/internal/di/di.go
index c5d8ecd2d..3287b0d10 100644
--- a/backend/internal/di/di.go
+++ b/backend/internal/di/di.go
@@ -2,9 +2,12 @@
package di
import (
+ "emperror.dev/emperror"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/actors"
"github.com/getarcaneapp/arcane/backend/v2/internal/apns"
"github.com/getarcaneapp/arcane/backend/v2/internal/appimages"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/build"
"github.com/getarcaneapp/arcane/backend/v2/internal/diagnostics"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -41,7 +44,7 @@ var ActorOptions = fx.Options(
// ServiceOptions provides the backend service graph.
var ServiceOptions = fx.Options(
- fx.Supply(new(logging.SlogErrorHandler)),
+ fx.Supply(fx.Annotate(new(logging.SlogErrorHandler), fx.As(new(emperror.ErrorHandler)))),
fx.Provide(
// Infrastructure values consumed by services.
provideResourcesFSInternal,
@@ -113,7 +116,7 @@ var ServiceOptions = fx.Options(
provideVolumeServiceInternal,
provideSystemBackupServiceInternal,
systembackup.New,
- provideAuthServiceInternal,
+ auth.NewAuthService,
provideAuthModuleInternal,
provideContainerRegistryModuleInternal,
provideContainerRegistryServiceInternal,
diff --git a/backend/internal/di/providers.go b/backend/internal/di/providers.go
index 4f6c93f46..9cd144e1b 100644
--- a/backend/internal/di/providers.go
+++ b/backend/internal/di/providers.go
@@ -28,7 +28,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/registry"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
- "github.com/getarcaneapp/arcane/backend/v2/internal/session"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/swarm"
"github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"
@@ -50,7 +49,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/webhook"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
- arcanelogging "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/logging"
"github.com/getarcaneapp/arcane/backend/v2/resources"
"go.uber.org/fx"
)
@@ -274,10 +272,6 @@ func provideContainerModuleInternal(event *event.EventService, docker *docker.Do
})
}
-func provideAuthServiceInternal(user *user.UserService, settings *settings.SettingsService, event *event.EventService, session *session.SessionService, role *role.RoleService, cfg *config.Config, errorHandler *arcanelogging.SlogErrorHandler) *auth.AuthService {
- return auth.NewAuthService(user, settings, event, session, role, cfg.JWTSecret, cfg, errorHandler)
-}
-
func provideAuthModuleInternal(service *auth.AuthService, userService *user.UserService, settingsService *settings.SettingsService, passkeyService *passkey.PasskeyService) *auth.Module {
return auth.New(auth.Dependencies{
Service: service,
diff --git a/backend/internal/environment/service_test.go b/backend/internal/environment/service_test.go
index f5bc301c1..ba9beca20 100644
--- a/backend/internal/environment/service_test.go
+++ b/backend/internal/environment/service_test.go
@@ -1352,7 +1352,7 @@ func TestEnvironmentService_GenerateEdgeDeploymentSnippets_WithAutoGeneratedMTLS
require.Contains(t, snippets.MTLS.Files[0].Content, "BEGIN CERTIFICATE")
require.Equal(t, "agent.key", snippets.MTLS.Files[2].Name)
require.Equal(t, "/app/data/edge-mtls-agent/agent.key", snippets.MTLS.Files[2].ContainerPath)
- require.Contains(t, snippets.MTLS.Files[2].Content, "BEGIN EC PRIVATE KEY")
+ require.Contains(t, snippets.MTLS.Files[2].Content, "BEGIN PRIVATE KEY")
}
func TestEnvironmentService_GenerateEdgeDeploymentSnippets_ReturnsBasicSnippetsWhenMTLSGenerationFails(t *testing.T) {
diff --git a/backend/internal/federated/service.go b/backend/internal/federated/service.go
index 6d408d97b..9b1a8a910 100644
--- a/backend/internal/federated/service.go
+++ b/backend/internal/federated/service.go
@@ -34,6 +34,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
)
@@ -51,7 +52,7 @@ type FederatedCredentialService struct {
roleService *role.RoleService
httpClient *http.Client
providerMu sync.RWMutex
- providers map[string]*oidc.Provider
+ keySets map[string]*mldsajose.KeySet
providerGroup singleflight.Group
}
@@ -74,7 +75,7 @@ func NewFederatedCredentialService(
settingsService: settingsService,
eventService: eventService,
httpClient: httpClient,
- providers: make(map[string]*oidc.Provider),
+ keySets: make(map[string]*mldsajose.KeySet),
}
}
@@ -389,13 +390,16 @@ func (s *FederatedCredentialService) listEnabledCredentialsForIssuerInternal(ctx
}
func (s *FederatedCredentialService) verifySubjectTokenInternal(ctx context.Context, issuer string, rawToken string) (*oidc.IDToken, map[string]any, error) {
- provider, err := s.providerForIssuerInternal(ctx, issuer)
+ keySet, err := s.keySetForIssuerInternal(ctx, issuer)
if err != nil {
return nil, nil, err
}
providerCtx := oidc.ClientContext(ctx, s.httpClient)
- verifier := provider.Verifier(&oidc.Config{SkipClientIDCheck: true})
+ verifier := oidc.NewVerifier(issuer, keySet, &oidc.Config{
+ SkipClientIDCheck: true,
+ SupportedSigningAlgs: mldsajose.SupportedSigningAlgs(),
+ })
idToken, err := verifier.Verify(providerCtx, rawToken)
if err != nil {
return nil, nil, err
@@ -454,11 +458,11 @@ func isUniqueConstraintErrorInternal(err error) bool {
return strings.Contains(msg, "unique") || strings.Contains(msg, "duplicate key")
}
-func (s *FederatedCredentialService) providerForIssuerInternal(ctx context.Context, issuer string) (*oidc.Provider, error) {
+func (s *FederatedCredentialService) keySetForIssuerInternal(ctx context.Context, issuer string) (*mldsajose.KeySet, error) {
s.providerMu.RLock()
- if provider := s.providers[issuer]; provider != nil {
+ if keySet := s.keySets[issuer]; keySet != nil {
s.providerMu.RUnlock()
- return provider, nil
+ return keySet, nil
}
s.providerMu.RUnlock()
@@ -469,20 +473,31 @@ func (s *FederatedCredentialService) providerForIssuerInternal(ctx context.Conte
return nil, errors.WrapIf(err, "failed to discover federated issuer")
}
+ var meta struct {
+ JWKSURL string `json:"jwks_uri"`
+ }
+ if err := provider.Claims(&meta); err != nil {
+ return nil, errors.WrapIf(err, "failed to read federated issuer metadata")
+ }
+ if meta.JWKSURL == "" {
+ return nil, errors.New("federated issuer metadata is missing jwks_uri")
+ }
+
+ keySet := mldsajose.NewKeySet(providerCtx, meta.JWKSURL)
s.providerMu.Lock()
- s.providers[issuer] = provider
+ s.keySets[issuer] = keySet
s.providerMu.Unlock()
- return provider, nil
+ return keySet, nil
})
if err != nil {
return nil, err
}
- provider, ok := v.(*oidc.Provider)
- if !ok || provider == nil {
- return nil, errors.New("federated issuer discovery returned invalid provider")
+ keySet, ok := v.(*mldsajose.KeySet)
+ if !ok || keySet == nil {
+ return nil, errors.New("federated issuer discovery returned invalid key set")
}
- return provider, nil
+ return keySet, nil
}
func selectMatchingCredentialInternal(credentials []FederatedCredential, tokenAudiences []string, claims map[string]any) *FederatedCredential {
diff --git a/backend/internal/federated/service_test.go b/backend/internal/federated/service_test.go
index adddd524e..9f09eaa4c 100644
--- a/backend/internal/federated/service_test.go
+++ b/backend/internal/federated/service_test.go
@@ -2,6 +2,7 @@ package federated
import (
"context"
+ "crypto/mldsa"
"crypto/rand"
"crypto/rsa"
"encoding/base64"
@@ -148,9 +149,11 @@ func setupFederatedCredentialServiceInternal(t *testing.T, issuer *federatedTest
settingsSvc, err := newSettingsServiceForTestInternal(t, ctx, db)
require.NoError(t, err)
eventSvc := event.NewEventService(db, &config.Config{}, nil)
- authSvc := auth.NewAuthService(userSvc, settingsSvc, eventSvc, sessionSvc, roleSvc, "test-federated-secret", &config.Config{
+ signingKey, err := mldsa.GenerateKey(mldsa.MLDSA87())
+ require.NoError(t, err)
+ authSvc := auth.NewAuthService(userSvc, settingsSvc, eventSvc, sessionSvc, roleSvc, &config.Config{
JWTRefreshExpiry: 24 * time.Hour,
- }, nil)
+ }, nil).WithSigningKey(signingKey)
service := NewFederatedCredentialService(db, authSvc, userSvc, settingsSvc, eventSvc, issuer.server.Client()).WithRoleService(roleSvc)
diff --git a/backend/internal/oidc/handler.go b/backend/internal/oidc/handler.go
index 5393cf96e..f0340e8cd 100644
--- a/backend/internal/oidc/handler.go
+++ b/backend/internal/oidc/handler.go
@@ -405,7 +405,7 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC
if mobileRedirectURI == "" {
maxAge := max(int(time.Until(tokenPair.ExpiresAt).Seconds()), 0)
maxAge += 60 // Add 60 seconds buffer for clock skew
- setCookies = append(setCookies, cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx)))
+ setCookies = append(setCookies, cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))...)
}
expiresAt := tokenPair.ExpiresAt
@@ -497,7 +497,7 @@ func (h *OidcHandler) ExchangeDeviceToken(ctx context.Context, input *ExchangeDe
maxAge += 60
expiresAt := tokenPair.ExpiresAt
- tokenCookie := cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))
+ tokenCookies := cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))
userDto, err := h.userService.ToUserResponseDto(ctx, *userModel)
if err != nil {
@@ -505,7 +505,7 @@ func (h *OidcHandler) ExchangeDeviceToken(ctx context.Context, input *ExchangeDe
}
return &ExchangeDeviceTokenOutput{
- SetCookie: []string{tokenCookie},
+ SetCookie: tokenCookies,
Body: authtypes.AuthenticationResponse{
Success: true,
Status: authtypes.AuthenticationStatusAuthenticated,
diff --git a/backend/internal/oidc/service.go b/backend/internal/oidc/service.go
index 096220788..c5fc5aa71 100644
--- a/backend/internal/oidc/service.go
+++ b/backend/internal/oidc/service.go
@@ -27,6 +27,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
)
@@ -38,6 +39,7 @@ type OidcService struct {
insecureHttpClient *http.Client
providerMutex sync.RWMutex
providerCache *hot.HotCache[oidcProviderKey, *oidc.Provider]
+ keySets map[oidcKeySetKey]*mldsajose.KeySet
}
type oidcProviderKey struct {
@@ -45,6 +47,11 @@ type oidcProviderKey struct {
skipTLS bool
}
+type oidcKeySetKey struct {
+ jwksURL string
+ skipTLS bool
+}
+
type OidcState struct {
State string `json:"state"`
Nonce string `json:"nonce"`
@@ -68,11 +75,31 @@ func NewOidcService(authService *auth.AuthService, settingsService *settings.Set
settingsService: settingsService,
config: cfg,
httpClient: &oidcClient,
+ keySets: map[oidcKeySetKey]*mldsajose.KeySet{},
}
service.providerCache = hot.NewHotCache[oidcProviderKey, *oidc.Provider](hot.LRU, 4).Build()
return service
}
+func (s *OidcService) keySetInternal(ctx context.Context, jwksURL string, skipTLS bool) *mldsajose.KeySet {
+ key := oidcKeySetKey{jwksURL: jwksURL, skipTLS: skipTLS}
+ s.providerMutex.RLock()
+ keySet := s.keySets[key]
+ s.providerMutex.RUnlock()
+ if keySet != nil {
+ return keySet
+ }
+
+ clientCtx := oidc.ClientContext(context.WithoutCancel(ctx), s.getHttpClientInternal(skipTLS))
+ s.providerMutex.Lock()
+ defer s.providerMutex.Unlock()
+ if keySet = s.keySets[key]; keySet == nil {
+ keySet = mldsajose.NewKeySet(clientCtx, jwksURL)
+ s.keySets[key] = keySet
+ }
+ return keySet
+}
+
func (s *OidcService) getEffectiveConfigInternal(ctx context.Context) (*settings.OidcConfig, error) {
oidcConfig, err := s.authService.GetOidcConfig(ctx)
if err != nil {
@@ -513,25 +540,30 @@ func (s *OidcService) verifyIDTokenInternal(ctx context.Context, provider *oidc.
}
verifierConfig := &oidc.Config{
- ClientID: cfg.ClientID,
- }
-
- if nonce != "" {
- verifierConfig.Now = time.Now
+ ClientID: cfg.ClientID,
+ SupportedSigningAlgs: mldsajose.SupportedSigningAlgs(),
}
- providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
- var verifier *oidc.IDTokenVerifier
+ var issuer, jwksURL string
if provider != nil {
- verifier = provider.Verifier(verifierConfig)
- } else {
- if cfg.JwksURI == "" {
- return nil, "", errors.New("jwks URI must be configured when using manual OIDC endpoints")
+ var meta struct {
+ Issuer string `json:"issuer"`
+ JWKSURL string `json:"jwks_uri"`
}
- keySet := oidc.NewRemoteKeySet(providerCtx, cfg.JwksURI)
- verifier = oidc.NewVerifier(cfg.IssuerURL, keySet, verifierConfig)
+ if err := provider.Claims(&meta); err != nil {
+ return nil, "", errors.WrapIf(err, "failed to read provider metadata")
+ }
+ issuer, jwksURL = meta.Issuer, meta.JWKSURL
+ } else {
+ issuer, jwksURL = cfg.IssuerURL, cfg.JwksURI
+ }
+ if jwksURL == "" {
+ return nil, "", errors.New("jwks URI must be configured when using manual OIDC endpoints")
}
+ providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
+ verifier := oidc.NewVerifier(issuer, s.keySetInternal(ctx, jwksURL, cfg.SkipTlsVerify), verifierConfig)
+
idToken, err := verifier.Verify(providerCtx, rawIDToken)
if err != nil {
slog.Error("HandleCallback: ID token verification failed", "error", err)
diff --git a/backend/internal/passkey/handler.go b/backend/internal/passkey/handler.go
index 923bcfd48..3b0286926 100644
--- a/backend/internal/passkey/handler.go
+++ b/backend/internal/passkey/handler.go
@@ -737,7 +737,7 @@ func marshalCredentialInternal(credential map[string]any) ([]byte, error) {
func tokenCookieInternal(ctx context.Context, tokenPair *auth.TokenPair) []string {
maxAge := max(int(time.Until(tokenPair.ExpiresAt).Seconds()), 0) + 60
- return []string{cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))}
+ return cookie.BuildTokenCookieStringFor(maxAge, tokenPair.AccessToken, cookie.SecureCookieFromContext(ctx))
}
func passkeyHTTPErrorInternal(err error) error {
diff --git a/backend/internal/passkey/service.go b/backend/internal/passkey/service.go
index 679b35060..050adad1d 100644
--- a/backend/internal/passkey/service.go
+++ b/backend/internal/passkey/service.go
@@ -455,6 +455,7 @@ func (s *passkeyService) BeginRegistration(ctx context.Context, userID, sessionI
exclusions := webauthn.Credentials(adapter.credentials).CredentialDescriptors()
creation, session, err := s.webAuthn.BeginRegistration(
adapter,
+ webauthn.WithCredentialParameters(webauthn.CredentialParametersPQCRecommendedL3()),
webauthn.WithExclusions(exclusions),
webauthn.WithExtensions(webauthn.WithExtensionCredProps()),
webauthn.WithResidentKeyRequirement(protocol.ResidentKeyRequirementRequired),
diff --git a/backend/internal/settings/model.go b/backend/internal/settings/model.go
index 1adf8e20e..042938280 100644
--- a/backend/internal/settings/model.go
+++ b/backend/internal/settings/model.go
@@ -174,8 +174,9 @@ type Settings struct {
ApnsChannelID SettingVariable `key:"apnsChannelId,internal"`
ApnsSigningKey SettingVariable `key:"apnsSigningKey,internal,sensitive"`
- AgentToken SettingVariable `key:"agentToken,internal,sensitive"`
- InstanceID SettingVariable `key:"instanceId,internal"`
+ AgentToken SettingVariable `key:"agentToken,internal,sensitive"`
+ JwtSigningKeySeed SettingVariable `key:"jwtSigningKeySeed,internal,sensitive"`
+ InstanceID SettingVariable `key:"instanceId,internal"`
// Users category (admin management page - no actual settings)
UsersCategoryPlaceholder SettingVariable `key:"usersCategory,internal" meta:"label=Users;type=internal;keywords=users,accounts,management,admin,access,permissions,roles;category=users;description=Manage user accounts and permissions" catmeta:"id=users;title=Users;icon=user;url=/settings/users;description=Manage user accounts and access control"`
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index 4b2149bac..c7cce3fb2 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -2,6 +2,7 @@ package settings
import (
"context"
+ "crypto/mldsa"
"crypto/sha256"
"encoding/base64"
"fmt"
@@ -21,6 +22,8 @@ import (
"github.com/samber/mo"
"gorm.io/gorm"
+ libcrypto "go.getarcane.app/sys/crypto"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/actors"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -1032,6 +1035,58 @@ func (s *SettingsService) EnsureEncryptionKey(ctx context.Context) (string, erro
}, nil)
}
+func (s *SettingsService) EnsureJwtSigningKey(ctx context.Context) (*mldsa.PrivateKey, error) {
+ return actors.Execute(ctx, s.writes, "ensure jwt signing key", func(writeCtx context.Context) (*mldsa.PrivateKey, error) {
+ const keyName = "jwtSigningKeySeed"
+ var key *mldsa.PrivateKey
+
+ err := s.db.WithContext(writeCtx).Transaction(func(tx *gorm.DB) error {
+ var sv SettingVariable
+ err := tx.Where("key = ?", keyName).First(&sv).Error
+
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return errors.WrapIf(err, "failed to load jwt signing key")
+ }
+
+ if sv.Value != "" {
+ decoded, decErr := libcrypto.Decrypt(sv.Value)
+ if decErr != nil {
+ return errors.WrapIf(decErr, "failed to decrypt jwt signing key")
+ }
+ seed, decErr := base64.StdEncoding.DecodeString(decoded)
+ if decErr != nil {
+ return errors.WrapIf(decErr, "failed to decode jwt signing key")
+ }
+ key, decErr = mldsa.NewPrivateKey(mldsa.MLDSA87(), seed)
+ return errors.WrapIf(decErr, "failed to load jwt signing key")
+ }
+
+ notFound := errors.Is(err, gorm.ErrRecordNotFound)
+ generated, genErr := mldsa.GenerateKey(mldsa.MLDSA87())
+ if genErr != nil {
+ return errors.WrapIf(genErr, "failed to generate jwt signing key")
+ }
+ encrypted, encErr := libcrypto.Encrypt(base64.StdEncoding.EncodeToString(generated.Bytes()))
+ if encErr != nil {
+ return errors.WrapIf(encErr, "failed to encrypt jwt signing key")
+ }
+ key = generated
+
+ if notFound {
+ return errors.WrapIf(tx.Create(&SettingVariable{Key: keyName, Value: encrypted}).Error, "failed to persist jwt signing key")
+ }
+ return errors.WrapIf(tx.Model(&SettingVariable{}).
+ Where("key = ?", keyName).
+ Update("value", encrypted).Error, "failed to update jwt signing key")
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return key, nil
+ }, nil)
+}
+
func (s *SettingsService) NormalizeProjectsDirectory(ctx context.Context, projectsDirEnv string) error {
if projectsDirEnv != "" {
slog.DebugContext(ctx, "PROJECTS_DIRECTORY environment variable is set, skipping normalization", "value", projectsDirEnv)
diff --git a/backend/pkg/libarcane/edge/remenv.go b/backend/pkg/libarcane/edge/remenv.go
index b0cfd6777..f79836f58 100644
--- a/backend/pkg/libarcane/edge/remenv.go
+++ b/backend/pkg/libarcane/edge/remenv.go
@@ -6,6 +6,7 @@ import (
"strings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/labstack/echo/v5"
)
@@ -41,8 +42,8 @@ func SetAuthHeader(req *http.Request, c *echo.Context) {
// Forward Authorization header or cookie token
if auth := c.Request().Header.Get(HeaderAuthorization); auth != "" {
req.Header.Set(HeaderAuthorization, auth)
- } else if ck, err := c.Cookie("token"); err == nil && ck != nil && ck.Value != "" {
- req.Header.Set(HeaderAuthorization, "Bearer "+ck.Value)
+ } else if token, err := cookie.GetTokenCookie(c.Request()); err == nil && token != "" {
+ req.Header.Set(HeaderAuthorization, "Bearer "+token)
}
}
@@ -64,8 +65,8 @@ func BuildWebSocketHeaders(c *echo.Context, accessToken *string) http.Header {
// Forward authorization (header or cookie)
if auth := req.Header.Get(HeaderAuthorization); auth != "" {
headers.Set(HeaderAuthorization, auth)
- } else if ck, err := c.Cookie("token"); err == nil && ck != nil && ck.Value != "" {
- headers.Set(HeaderAuthorization, "Bearer "+ck.Value)
+ } else if token, err := cookie.GetTokenCookie(req); err == nil && token != "" {
+ headers.Set(HeaderAuthorization, "Bearer "+token)
}
// Forward cookies if no other auth is present
diff --git a/backend/pkg/libarcane/edge/server_test.go b/backend/pkg/libarcane/edge/server_test.go
index 4e410751c..d5be359ab 100644
--- a/backend/pkg/libarcane/edge/server_test.go
+++ b/backend/pkg/libarcane/edge/server_test.go
@@ -363,7 +363,7 @@ func TestTunnelServer_HandleMTLSEnroll(t *testing.T) {
assert.Equal(t, "ca.crt", resp.Files[0].Name)
assert.Contains(t, resp.Files[0].Content, "BEGIN CERTIFICATE")
assert.Equal(t, "agent.key", resp.Files[2].Name)
- assert.Contains(t, resp.Files[2].Content, "BEGIN EC PRIVATE KEY")
+ assert.Contains(t, resp.Files[2].Content, "BEGIN PRIVATE KEY")
certBlock, _ := pem.Decode([]byte(resp.Files[1].Content))
require.NotNil(t, certBlock)
diff --git a/backend/pkg/libarcane/edge/tls.go b/backend/pkg/libarcane/edge/tls.go
index e2e331e9e..81a617c90 100644
--- a/backend/pkg/libarcane/edge/tls.go
+++ b/backend/pkg/libarcane/edge/tls.go
@@ -3,8 +3,10 @@ package edge
import (
"bytes"
"context"
+ "crypto"
"crypto/ecdsa"
"crypto/elliptic"
+ "crypto/mldsa"
"crypto/rand"
"crypto/tls"
"crypto/x509"
@@ -447,6 +449,11 @@ func buildManagerClientTLSConfigInternal(cfg *Config) (*tls.Config, error) {
}
return nil, errors.WrapIf(err, "failed to load edge mTLS client certificate")
}
+ if cert.Leaf != nil {
+ if _, ok := cert.Leaf.PublicKey.(*mldsa.PublicKey); ok {
+ tlsConfig.MinVersion = tls.VersionTLS13
+ }
+ }
tlsConfig.Certificates = []tls.Certificate{cert}
}
@@ -743,7 +750,7 @@ func ensureManagerCAInternal(ctx context.Context, assetsDir string) (string, str
_ = acfs.Remove(ctx, assetsDir, "/"+generatedMTLSCACertFileName)
_ = acfs.Remove(ctx, assetsDir, "/"+generatedMTLSCAKeyFileName)
- privateKey, err := certgen.GenerateP384PrivateKey()
+ privateKey, err := certgen.GenerateMLDSA87PrivateKey()
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to generate CA private key")
}
@@ -753,7 +760,7 @@ func ensureManagerCAInternal(ctx context.Context, assetsDir string) (string, str
return "", "", false, err
}
- certDER, err := x509.CreateCertificate(rand.Reader, template, template, &privateKey.PublicKey, privateKey)
+ certDER, err := x509.CreateCertificate(rand.Reader, template, template, privateKey.PublicKey(), privateKey)
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to create CA certificate")
}
@@ -761,7 +768,7 @@ func ensureManagerCAInternal(ctx context.Context, assetsDir string) (string, str
if err := writePEMFileInternal(caCertPath, "CERTIFICATE", certDER, utils.FilePerm); err != nil {
return "", "", false, err
}
- caKeyDER, err := x509.MarshalECPrivateKey(privateKey)
+ caKeyDER, err := x509.MarshalPKCS8PrivateKey(privateKey)
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to marshal CA private key")
}
@@ -807,13 +814,9 @@ func ensureClientCertificateInternal(ctx context.Context, assetsDir string, envI
return "", "", false, errors.WrapIf(err, "failed to parse CA certificate")
}
- caKeyBlock, _ := pem.Decode(caKeyPEM)
- if caKeyBlock == nil {
- return "", "", false, errors.New("failed to parse CA private key PEM")
- }
- caKey, err := x509.ParseECPrivateKey(caKeyBlock.Bytes)
+ caKey, err := parsePrivateKeyPEMInternal(caKeyPEM, "CA")
if err != nil {
- return "", "", false, errors.WrapIf(err, "failed to parse CA private key")
+ return "", "", false, err
}
safeEnvID := generatedAssetNameSanitizer.ReplaceAllString(strings.TrimSpace(envID), "_")
@@ -841,7 +844,7 @@ func ensureClientCertificateInternal(ctx context.Context, assetsDir string, envI
_ = acfs.Remove(ctx, clientDir, "/"+generatedMTLSClientKeyName)
}
- privateKey, err := certgen.GenerateP384PrivateKey()
+ privateKey, err := generateKeyLikeInternal(caKey)
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to generate client private key")
}
@@ -851,7 +854,7 @@ func ensureClientCertificateInternal(ctx context.Context, assetsDir string, envI
return "", "", false, err
}
- certDER, err := x509.CreateCertificate(rand.Reader, template, caCert, &privateKey.PublicKey, caKey)
+ certDER, err := x509.CreateCertificate(rand.Reader, template, caCert, privateKey.Public(), caKey)
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to create client certificate")
}
@@ -859,11 +862,20 @@ func ensureClientCertificateInternal(ctx context.Context, assetsDir string, envI
if err := writePEMFileInternal(clientCertPath, "CERTIFICATE", certDER, utils.FilePerm); err != nil {
return "", "", false, err
}
- clientKeyDER, err := x509.MarshalECPrivateKey(privateKey)
+ // P-384 leaves keep the SEC1 framing so agents from before the ML-DSA
+ // migration can still parse keys issued during a rolling upgrade.
+ var clientKeyDER []byte
+ keyPEMType := "PRIVATE KEY"
+ if ecKey, ok := privateKey.(*ecdsa.PrivateKey); ok {
+ keyPEMType = "EC PRIVATE KEY"
+ clientKeyDER, err = x509.MarshalECPrivateKey(ecKey)
+ } else {
+ clientKeyDER, err = x509.MarshalPKCS8PrivateKey(privateKey)
+ }
if err != nil {
return "", "", false, errors.WrapIf(err, "failed to marshal client private key")
}
- if err := writePEMFileInternal(clientKeyPath, "EC PRIVATE KEY", clientKeyDER, 0o600); err != nil {
+ if err := writePEMFileInternal(clientKeyPath, keyPEMType, clientKeyDER, 0o600); err != nil {
return "", "", false, err
}
@@ -929,24 +941,16 @@ func validateGeneratedCAInternal(certPath, keyPath string) error {
if !cert.IsCA {
return errors.New("generated CA certificate is not a CA")
}
- publicKey, ok := cert.PublicKey.(*ecdsa.PublicKey)
- if !ok || publicKey.Curve != elliptic.P384() {
- return errors.New("generated CA certificate is not ECDSA P-384")
+ if err := validateGeneratedKeyTypeInternal(cert.PublicKey, "generated CA certificate"); err != nil {
+ return err
}
keyPEM, err := readCAKeyPEMInternal(keyPath)
if err != nil {
return err
}
- keyBlock, _ := pem.Decode(keyPEM)
- if keyBlock == nil {
- return errors.Errorf("failed to parse CA private key PEM %s", keyPath)
- }
- privateKey, err := x509.ParseECPrivateKey(keyBlock.Bytes)
+ privateKey, err := parsePrivateKeyPEMInternal(keyPEM, "generated CA")
if err != nil {
- return errors.WrapIff(err, "failed to parse CA private key %s", keyPath)
- }
- if privateKey.Curve != elliptic.P384() {
- return errors.New("generated CA private key is not ECDSA P-384")
+ return err
}
if err := validateCertificateKeyPairInternal(cert, privateKey, "generated CA"); err != nil {
return err
@@ -969,17 +973,13 @@ func validateGeneratedClientCertificateInternal(certPath, keyPath string, expect
if expectedURISAN != nil && !certificateHasURISANInternal(cert, expectedURISAN) {
return errors.Errorf("generated client certificate URI SAN does not match expected %s", expectedURISAN.String())
}
- publicKey, ok := cert.PublicKey.(*ecdsa.PublicKey)
- if !ok || publicKey.Curve != elliptic.P384() {
- return errors.New("generated client certificate is not ECDSA P-384")
+ if err := validateGeneratedKeyTypeInternal(cert.PublicKey, "generated client certificate"); err != nil {
+ return err
}
- privateKey, err := readECPrivateKeyInternal(keyPath)
+ privateKey, err := readPrivateKeyInternal(keyPath)
if err != nil {
return err
}
- if privateKey.Curve != elliptic.P384() {
- return errors.New("generated client private key is not ECDSA P-384")
- }
if err := validateCertificateKeyPairInternal(cert, privateKey, "generated client"); err != nil {
return err
}
@@ -1011,7 +1011,7 @@ func agentMTLSAssetsNeedEnrollmentInternal(certPath string, keyPath string, now
if err != nil {
return true, err.Error()
}
- privateKey, err := readECPrivateKeyInternal(keyPath)
+ privateKey, err := readPrivateKeyInternal(keyPath)
if err != nil {
return true, err.Error()
}
@@ -1033,7 +1033,7 @@ func agentMTLSAssetsNeedEnrollmentInternal(certPath string, keyPath string, now
return false, ""
}
-func validateCertificateKeyPairInternal(cert *x509.Certificate, privateKey *ecdsa.PrivateKey, label string) error {
+func validateCertificateKeyPairInternal(cert *x509.Certificate, privateKey crypto.Signer, label string) error {
if cert == nil {
return errors.Errorf("%s certificate is required", label)
}
@@ -1041,16 +1041,11 @@ func validateCertificateKeyPairInternal(cert *x509.Certificate, privateKey *ecds
return errors.Errorf("%s private key is required", label)
}
- publicKey, ok := cert.PublicKey.(*ecdsa.PublicKey)
- if !ok {
- return errors.Errorf("%s certificate public key is not ECDSA", label)
- }
-
- certPublicKeyDER, err := x509.MarshalPKIXPublicKey(publicKey)
+ certPublicKeyDER, err := x509.MarshalPKIXPublicKey(cert.PublicKey)
if err != nil {
return errors.WrapIff(err, "failed to marshal %s certificate public key", label)
}
- privatePublicKeyDER, err := x509.MarshalPKIXPublicKey(&privateKey.PublicKey)
+ privatePublicKeyDER, err := x509.MarshalPKIXPublicKey(privateKey.Public())
if err != nil {
return errors.WrapIff(err, "failed to marshal %s private key public key", label)
}
@@ -1061,6 +1056,46 @@ func validateCertificateKeyPairInternal(cert *x509.Certificate, privateKey *ecds
return nil
}
+func validateGeneratedKeyTypeInternal(publicKey any, label string) error {
+ switch key := publicKey.(type) {
+ case *ecdsa.PublicKey:
+ if key.Curve == elliptic.P384() {
+ return nil
+ }
+ case *mldsa.PublicKey:
+ if key.Parameters() == mldsa.MLDSA87() {
+ return nil
+ }
+ }
+ return errors.Errorf("%s is not ECDSA P-384 or ML-DSA-87", label)
+}
+
+func generateKeyLikeInternal(caKey crypto.Signer) (crypto.Signer, error) {
+ if _, ok := caKey.(*ecdsa.PrivateKey); ok {
+ return certgen.GenerateP384PrivateKey()
+ }
+ return certgen.GenerateMLDSA87PrivateKey()
+}
+
+func parsePrivateKeyPEMInternal(pemBytes []byte, label string) (crypto.Signer, error) {
+ block, _ := pem.Decode(pemBytes)
+ if block == nil {
+ return nil, errors.Errorf("failed to parse %s private key PEM", label)
+ }
+ if key, err := x509.ParsePKCS8PrivateKey(block.Bytes); err == nil {
+ signer, ok := key.(crypto.Signer)
+ if !ok {
+ return nil, errors.Errorf("%s private key is not a signer", label)
+ }
+ return signer, nil
+ }
+ key, err := x509.ParseECPrivateKey(block.Bytes)
+ if err != nil {
+ return nil, errors.WrapIff(err, "failed to parse %s private key", label)
+ }
+ return key, nil
+}
+
func readCertificateInternal(path string) (*x509.Certificate, error) {
// os.* rather than acfs: callers pass both generated-asset paths and
// user-configured absolute cert paths, so no single confinement root exists.
@@ -1079,22 +1114,14 @@ func readCertificateInternal(path string) (*x509.Certificate, error) {
return cert, nil
}
-func readECPrivateKeyInternal(path string) (*ecdsa.PrivateKey, error) {
+func readPrivateKeyInternal(path string) (crypto.Signer, error) {
// os.* rather than acfs: callers pass both generated-asset paths and
// user-configured absolute key paths, so no single confinement root exists.
pemBytes, err := os.ReadFile(path)
if err != nil {
return nil, errors.WrapIff(err, "failed to read private key %s", path)
}
- block, _ := pem.Decode(pemBytes)
- if block == nil {
- return nil, errors.Errorf("failed to parse private key PEM %s", path)
- }
- privateKey, err := x509.ParseECPrivateKey(block.Bytes)
- if err != nil {
- return nil, errors.WrapIff(err, "failed to parse EC private key %s", path)
- }
- return privateKey, nil
+ return parsePrivateKeyPEMInternal(pemBytes, path)
}
func lockEdgeMTLSPathInternal(ctx context.Context, dir string, lockName string) (func(), error) {
@@ -1238,7 +1265,7 @@ var caKeyEncryptInternal = libcrypto.Encrypt
// writeCAKeyFileInternal writes the edge CA private key to disk using envelope
// encryption via libcrypto.
func writeCAKeyFileInternal(path string, derBytes []byte) error {
- pemBytes := pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: derBytes})
+ pemBytes := pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: derBytes})
if pemBytes == nil {
return errors.New("failed to encode CA private key to PEM")
}
diff --git a/backend/pkg/libarcane/edge/tls_test.go b/backend/pkg/libarcane/edge/tls_test.go
index 7c5799a70..7ea4aa7d8 100644
--- a/backend/pkg/libarcane/edge/tls_test.go
+++ b/backend/pkg/libarcane/edge/tls_test.go
@@ -4,6 +4,7 @@ import (
"context"
"crypto/ecdsa"
"crypto/elliptic"
+ "crypto/mldsa"
"crypto/rand"
"crypto/tls"
"crypto/x509"
@@ -20,6 +21,7 @@ import (
"time"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ certgen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/stretchr/testify/require"
libcrypto "go.getarcane.app/sys/crypto"
"google.golang.org/grpc/credentials"
@@ -80,21 +82,23 @@ func TestGenerateManagerClientMTLSAssetsWithContext(t *testing.T) {
require.Equal(t, "/app/data/edge-mtls-agent/agent.crt", assets.Files[1].ContainerPath)
require.Equal(t, "agent.key", assets.Files[2].Name)
require.Equal(t, "/app/data/edge-mtls-agent/agent.key", assets.Files[2].ContainerPath)
- require.Contains(t, assets.Files[2].Content, "BEGIN EC PRIVATE KEY")
+ require.Contains(t, assets.Files[2].Content, "BEGIN PRIVATE KEY")
keyBlock, _ := pem.Decode([]byte(assets.Files[2].Content))
require.NotNil(t, keyBlock)
- privateKey, err := x509.ParseECPrivateKey(keyBlock.Bytes)
+ parsedKey, err := x509.ParsePKCS8PrivateKey(keyBlock.Bytes)
require.NoError(t, err)
- require.Equal(t, elliptic.P384(), privateKey.Curve)
+ privateKey, ok := parsedKey.(*mldsa.PrivateKey)
+ require.True(t, ok)
+ require.Equal(t, mldsa.MLDSA87(), privateKey.PublicKey().Parameters())
certBlock, _ := pem.Decode([]byte(assets.Files[1].Content))
require.NotNil(t, certBlock)
cert, err := x509.ParseCertificate(certBlock.Bytes)
require.NoError(t, err)
- publicKey, ok := cert.PublicKey.(*ecdsa.PublicKey)
+ publicKey, ok := cert.PublicKey.(*mldsa.PublicKey)
require.True(t, ok)
- require.Equal(t, elliptic.P384(), publicKey.Curve)
+ require.Equal(t, mldsa.MLDSA87(), publicKey.Parameters())
require.Equal(t, "Lab-Server-env-123", cert.Subject.CommonName)
require.Len(t, cert.URIs, 1)
require.Equal(t, "spiffe://manager.example.com/edge/env-123", cert.URIs[0].String())
@@ -507,14 +511,14 @@ func TestCAKey_EncryptedOnDiskWhenCryptoInitialized(t *testing.T) {
raw, err := os.ReadFile(caKeyPath)
require.NoError(t, err)
- require.NotContains(t, string(raw), "BEGIN EC PRIVATE KEY",
+ require.NotContains(t, string(raw), "BEGIN PRIVATE KEY",
"encrypted CA key file must not contain plain PEM markers")
pemBytes, err := readCAKeyPEMInternal(caKeyPath)
require.NoError(t, err)
block, _ := pem.Decode(pemBytes)
require.NotNil(t, block)
- _, err = x509.ParseECPrivateKey(block.Bytes)
+ _, err = x509.ParsePKCS8PrivateKey(block.Bytes)
require.NoError(t, err)
clientCertPath, clientKeyPath, _, err := ensureClientCertificateInternal(context.Background(), assetsDir, "env-round", "Round Trip", "https://manager.example.com")
@@ -609,3 +613,90 @@ func TestShouldAutoEnrollAgentMTLSInternal(t *testing.T) {
cfg.EdgeMTLSKeyFile = filepath.Join(t.TempDir(), "agent.key")
require.False(t, shouldAutoEnrollAgentMTLSInternal(cfg))
}
+
+func TestGeneratedMLDSAAssets_HandshakeWithVerifiedClientCertificate(t *testing.T) {
+ assetsDir := t.TempDir()
+ cfg := &Config{
+ EdgeMTLSMode: EdgeMTLSModeRequired,
+ EdgeMTLSAssetsDir: assetsDir,
+ AppURL: "https://manager.example.com",
+ }
+ _, err := GenerateManagerClientMTLSAssetsWithContext(context.Background(), cfg, "env-hs", "Handshake")
+ require.NoError(t, err)
+
+ caCertPath := filepath.Join(assetsDir, "ca.crt")
+ caCertPEM, err := os.ReadFile(caCertPath)
+ require.NoError(t, err)
+ caBlock, _ := pem.Decode(caCertPEM)
+ require.NotNil(t, caBlock)
+ caCert, err := x509.ParseCertificate(caBlock.Bytes)
+ require.NoError(t, err)
+ caKeyPEM, err := readCAKeyPEMInternal(filepath.Join(assetsDir, "ca.key"))
+ require.NoError(t, err)
+ caKey, err := parsePrivateKeyPEMInternal(caKeyPEM, "CA")
+ require.NoError(t, err)
+
+ serverKey, err := certgen.GenerateMLDSA87PrivateKey()
+ require.NoError(t, err)
+ serverTemplate, err := certgen.NewServerTLSTemplate("localhost", []string{"localhost", "127.0.0.1"})
+ require.NoError(t, err)
+ serverDER, err := x509.CreateCertificate(rand.Reader, serverTemplate, caCert, serverKey.PublicKey(), caKey)
+ require.NoError(t, err)
+
+ serverTLS, err := BuildManagerServerTLSConfig(&Config{
+ EdgeMTLSMode: EdgeMTLSModeRequired,
+ EdgeMTLSCAFile: caCertPath,
+ })
+ require.NoError(t, err)
+ require.NotNil(t, serverTLS)
+ serverTLS.Certificates = []tls.Certificate{{Certificate: [][]byte{serverDER}, PrivateKey: serverKey}}
+
+ clientCertPath, err := GeneratedManagerClientMTLSCertPath(cfg, "env-hs")
+ require.NoError(t, err)
+ clientTLS, err := buildManagerClientTLSConfigInternal(&Config{
+ EdgeMTLSMode: EdgeMTLSModeRequired,
+ EdgeMTLSCAFile: caCertPath,
+ EdgeMTLSCertFile: clientCertPath,
+ EdgeMTLSKeyFile: filepath.Join(filepath.Dir(clientCertPath), "agent.key"),
+ EdgeMTLSServerName: "localhost",
+ ManagerApiUrl: "https://localhost/api",
+ })
+ require.NoError(t, err)
+ require.NotNil(t, clientTLS)
+ require.Equal(t, uint16(tls.VersionTLS13), clientTLS.MinVersion)
+
+ listener, err := tls.Listen("tcp", "127.0.0.1:0", serverTLS)
+ require.NoError(t, err)
+ defer listener.Close()
+
+ type handshakeResult struct {
+ state tls.ConnectionState
+ err error
+ }
+ resultCh := make(chan handshakeResult, 1)
+ go func() {
+ conn, err := listener.Accept()
+ if err != nil {
+ resultCh <- handshakeResult{err: err}
+ return
+ }
+ defer conn.Close()
+ tlsConn := conn.(*tls.Conn)
+ if err := tlsConn.Handshake(); err != nil {
+ resultCh <- handshakeResult{err: err}
+ return
+ }
+ resultCh <- handshakeResult{state: tlsConn.ConnectionState()}
+ }()
+
+ conn, err := tls.Dial("tcp", listener.Addr().String(), clientTLS)
+ require.NoError(t, err)
+ defer conn.Close()
+ require.Equal(t, uint16(tls.VersionTLS13), conn.ConnectionState().Version)
+
+ result := <-resultCh
+ require.NoError(t, result.err)
+ require.Equal(t, uint16(tls.VersionTLS13), result.state.Version)
+ require.True(t, hasVerifiedPeerCertificateInternal(&result.state))
+ require.NoError(t, verifiedPeerCertificateEnvironmentIDMatchesInternal(&result.state, "env-hs", "manager.example.com"))
+}
diff --git a/backend/pkg/utils/cookie/cookie_util.go b/backend/pkg/utils/cookie/cookie_util.go
index 68a73bced..087a5acce 100644
--- a/backend/pkg/utils/cookie/cookie_util.go
+++ b/backend/pkg/utils/cookie/cookie_util.go
@@ -2,7 +2,9 @@ package cookie
import (
"context"
+ "fmt"
"net/http"
+ "strings"
)
var (
@@ -11,6 +13,20 @@ var (
OidcStateCookieName = "oidc_state"
)
+// Browsers cap a single cookie (name + value) at 4096 bytes, so tokens larger
+// than that are split across numbered chunk cookies and reassembled on read.
+const (
+ tokenCookieChunkSize = 3072
+ tokenCookieMaxChunks = 4
+)
+
+func tokenCookieChunkNameInternal(base string, index int) string {
+ if index == 0 {
+ return base
+ }
+ return fmt.Sprintf("%s.%d", base, index)
+}
+
// SecureCookieContextKey is the context key under which router middleware
// records its trusted secure-cookie decision (a bool derived from TLS or
// trusted proxy headers).
@@ -38,39 +54,78 @@ func ClearTokenCookie(w http.ResponseWriter, r *http.Request) {
}
}
+func GetTokenCookieFromHeader(cookieHeader string) (string, error) {
+ return GetTokenCookie(&http.Request{Header: http.Header{"Cookie": []string{cookieHeader}}})
+}
+
func GetTokenCookie(r *http.Request) (string, error) {
- if c, err := r.Cookie(TokenCookieName); err == nil {
- return c.Value, nil
+ if value, err := readTokenCookieInternal(r, TokenCookieName); err == nil {
+ return value, nil
+ }
+ return readTokenCookieInternal(r, InsecureTokenCookieName)
+}
+
+func readTokenCookieInternal(r *http.Request, base string) (string, error) {
+ byName := make(map[string]string, len(r.Cookies()))
+ for _, c := range r.Cookies() {
+ byName[c.Name] = c.Value
+ }
+ first, ok := byName[base]
+ if !ok {
+ return "", http.ErrNoCookie
}
- c, err := r.Cookie(InsecureTokenCookieName)
- if err != nil {
- return "", err
+ var value strings.Builder
+ value.WriteString(first)
+ for i := 1; ; i++ {
+ chunk, ok := byName[tokenCookieChunkNameInternal(base, i)]
+ if !ok {
+ break
+ }
+ value.WriteString(chunk)
}
- return c.Value, nil
+ return value.String(), nil
}
-// BuildTokenCookieStringFor builds a Set-Cookie header string matching the
-// current request security context. Callers must pass the trusted secure flag
-// from SecureCookieFromContext / SecureCookieFromRequest so the cookie name
-// (__Host-token vs. token) round-trips correctly behind HTTPS reverse proxies.
-func BuildTokenCookieStringFor(maxAgeInSeconds int, token string, secure bool) string {
+// BuildTokenCookieStringFor builds Set-Cookie header strings matching the
+// current request security context, splitting the token across chunk cookies
+// when it exceeds the per-cookie browser limit and clearing unused chunk slots
+// so stale chunks from a longer previous token cannot corrupt reassembly.
+// Callers must pass the trusted secure flag from SecureCookieFromContext /
+// SecureCookieFromRequest so the cookie name (__Host-token vs. token)
+// round-trips correctly behind HTTPS reverse proxies.
+func BuildTokenCookieStringFor(maxAgeInSeconds int, token string, secure bool) []string {
if maxAgeInSeconds < 0 {
maxAgeInSeconds = 0
}
- cookieName := InsecureTokenCookieName
+ base := InsecureTokenCookieName
if secure {
- cookieName = TokenCookieName
+ base = TokenCookieName
}
- cookie := &http.Cookie{ // #nosec G124: Secure mirrors the trusted request context so the cookie can round-trip through HTTPS reverse proxies.
- Name: cookieName,
- Value: token,
- Path: "/",
- MaxAge: maxAgeInSeconds,
- HttpOnly: true,
- Secure: secure,
- SameSite: http.SameSiteLaxMode,
+
+ var chunks []string
+ for len(token) > tokenCookieChunkSize {
+ chunks = append(chunks, token[:tokenCookieChunkSize])
+ token = token[tokenCookieChunkSize:]
}
- return cookie.String()
+ chunks = append(chunks, token)
+
+ var headers []string
+ for i, chunk := range chunks {
+ cookie := &http.Cookie{ // #nosec G124: Secure mirrors the trusted request context so the cookie can round-trip through HTTPS reverse proxies.
+ Name: tokenCookieChunkNameInternal(base, i),
+ Value: chunk,
+ Path: "/",
+ MaxAge: maxAgeInSeconds,
+ HttpOnly: true,
+ Secure: secure,
+ SameSite: http.SameSiteLaxMode,
+ }
+ headers = append(headers, cookie.String())
+ }
+ for i := len(chunks); i < tokenCookieMaxChunks; i++ {
+ headers = append(headers, buildClearTokenCookieStringInternal(tokenCookieChunkNameInternal(base, i), secure))
+ }
+ return headers
}
// BuildClearTokenCookieStringsFor builds Set-Cookie header strings to clear
@@ -78,9 +133,12 @@ func BuildTokenCookieStringFor(maxAgeInSeconds int, token string, secure bool) s
// also clear the HTTP fallback cookie so stale sessions from older releases are
// flushed instead of being re-presented forever.
func BuildClearTokenCookieStringsFor(secure bool) []string {
- headers := []string{buildClearTokenCookieStringInternal(InsecureTokenCookieName, false)}
- if secure {
- headers = append(headers, buildClearTokenCookieStringInternal(TokenCookieName, true))
+ var headers []string
+ for i := range tokenCookieMaxChunks {
+ headers = append(headers, buildClearTokenCookieStringInternal(tokenCookieChunkNameInternal(InsecureTokenCookieName, i), false))
+ if secure {
+ headers = append(headers, buildClearTokenCookieStringInternal(tokenCookieChunkNameInternal(TokenCookieName, i), true))
+ }
}
return headers
}
diff --git a/backend/pkg/utils/cookie/cookie_util_test.go b/backend/pkg/utils/cookie/cookie_util_test.go
index d43f4eaa5..12427f8fd 100644
--- a/backend/pkg/utils/cookie/cookie_util_test.go
+++ b/backend/pkg/utils/cookie/cookie_util_test.go
@@ -32,29 +32,49 @@ func TestSecureCookieFromRequest(t *testing.T) {
func TestBuildTokenCookieStringFor(t *testing.T) {
t.Run("secure uses host-prefixed secure cookie", func(t *testing.T) {
- header := BuildTokenCookieStringFor(60, "abc", true)
+ headers := BuildTokenCookieStringFor(60, "abc", true)
- cookies := readSetCookieHeadersInternal(t, header)
- require.Len(t, cookies, 1)
+ cookies := readSetCookieHeadersInternal(t, headers...)
+ require.Len(t, cookies, tokenCookieMaxChunks)
assert.Equal(t, TokenCookieName, cookies[0].Name)
+ assert.Equal(t, "abc", cookies[0].Value)
assert.True(t, cookies[0].Secure)
+ for _, clear := range cookies[1:] {
+ assert.Equal(t, -1, clear.MaxAge)
+ }
})
t.Run("insecure uses fallback cookie", func(t *testing.T) {
- header := BuildTokenCookieStringFor(60, "abc", false)
+ headers := BuildTokenCookieStringFor(60, "abc", false)
- cookies := readSetCookieHeadersInternal(t, header)
- require.Len(t, cookies, 1)
+ cookies := readSetCookieHeadersInternal(t, headers...)
+ require.Len(t, cookies, tokenCookieMaxChunks)
assert.Equal(t, InsecureTokenCookieName, cookies[0].Name)
assert.False(t, cookies[0].Secure)
})
+
+ t.Run("large token chunks and reassembles", func(t *testing.T) {
+ token := strings.Repeat("a", tokenCookieChunkSize) + strings.Repeat("b", tokenCookieChunkSize) + "tail"
+ headers := BuildTokenCookieStringFor(60, token, true)
+
+ req := httptest.NewRequest("GET", "https://example.com/", nil)
+ for _, c := range readSetCookieHeadersInternal(t, headers...) {
+ if c.MaxAge >= 0 {
+ req.AddCookie(&http.Cookie{Name: c.Name, Value: c.Value})
+ }
+ }
+
+ got, err := GetTokenCookie(req)
+ require.NoError(t, err)
+ assert.Equal(t, token, got)
+ })
}
func TestBuildClearTokenCookieStringsFor(t *testing.T) {
t.Run("secure clears fallback and host-prefixed cookies", func(t *testing.T) {
headers := BuildClearTokenCookieStringsFor(true)
- require.Len(t, headers, 2)
+ require.Len(t, headers, 2*tokenCookieMaxChunks)
assert.Equal(t, InsecureTokenCookieName, readSetCookieHeadersInternal(t, headers[0])[0].Name)
secureCookie := readSetCookieHeadersInternal(t, headers[1])[0]
assert.Equal(t, TokenCookieName, secureCookie.Name)
@@ -64,7 +84,7 @@ func TestBuildClearTokenCookieStringsFor(t *testing.T) {
t.Run("insecure clears only fallback cookie", func(t *testing.T) {
headers := BuildClearTokenCookieStringsFor(false)
- require.Len(t, headers, 1)
+ require.Len(t, headers, tokenCookieMaxChunks)
clearCookie := readSetCookieHeadersInternal(t, headers[0])[0]
assert.Equal(t, InsecureTokenCookieName, clearCookie.Name)
assert.False(t, clearCookie.Secure)
diff --git a/backend/pkg/utils/jwtclaims/jwt.go b/backend/pkg/utils/jwtclaims/jwt.go
index 5d29dc478..cc483162f 100644
--- a/backend/pkg/utils/jwtclaims/jwt.go
+++ b/backend/pkg/utils/jwtclaims/jwt.go
@@ -1,7 +1,6 @@
package jwtclaims
import (
- "crypto/rand"
"encoding/base64"
"encoding/json/v2"
"fmt"
@@ -48,10 +47,12 @@ func GetBoolClaim(m map[string]any, key string) bool {
// GetStringSliceClaim extracts a string slice claim from a map
func GetStringSliceClaim(m map[string]any, key string) []string {
- v, ok := m[key]
- if !ok || v == nil {
- return nil
- }
+ return StringSliceFromClaimValue(m[key])
+}
+
+// StringSliceFromClaimValue flattens a claim value into a slice of strings.
+// Accepts string (comma or space separated), []string, []any, or nil.
+func StringSliceFromClaimValue(v any) []string {
switch t := v.(type) {
case []string:
return t
@@ -88,47 +89,6 @@ func GetStringSliceClaim(m map[string]any, key string) []string {
return nil
}
-const (
- // knownInsecureJWTSecret is the placeholder shipped in config.go's struct
- // tag; it must never sign real tokens. Keep in sync with the `default:` tag
- // on Config.JWTSecret.
- knownInsecureJWTSecret = "default-jwt-secret-change-me" // #nosec G101: public placeholder config default, intentionally rejected for production signing
- // minJWTSecretLength matches the 32-byte floor enforced for ENCRYPTION_KEY.
- minJWTSecretLength = 32
-)
-
-// CheckOrGenerateJwtSecret returns the HMAC signing key for JWTs.
-//
-// When requireExplicit is true (production manager), a real secret is mandatory:
-// an empty, default, or too-short JWT_SECRET panics at startup — mirroring the
-// ENCRYPTION_KEY guard in go.getarcane.app/sys/crypto. Otherwise (development / agent mode)
-// a random per-boot key is generated when none (or only the public default) is
-// configured, so the public default never becomes a live signing key.
-func CheckOrGenerateJwtSecret(jwtSecret string, requireExplicit bool) []byte {
- isDefault := jwtSecret == "" || jwtSecret == knownInsecureJWTSecret
-
- if requireExplicit {
- if isDefault {
- panic("JWT_SECRET is required in production. Set JWT_SECRET to a unique " +
- "random value of at least 32 characters (e.g. `openssl rand -base64 32`).")
- }
- if len(jwtSecret) < minJWTSecretLength {
- panic(fmt.Sprintf("JWT_SECRET must be at least %d characters (got %d).",
- minJWTSecretLength, len(jwtSecret)))
- }
- return []byte(jwtSecret)
- }
-
- if isDefault {
- secretBytes := make([]byte, 32)
- if _, err := rand.Read(secretBytes); err != nil {
- panic(errors.WrapIf(err, "failed to generate random JWT secret"))
- }
- return secretBytes
- }
- return []byte(jwtSecret)
-}
-
// ParseJWTClaims decodes and unmarshals the payload part of a JWT
func ParseJWTClaims(idToken string) map[string]any {
return result.Pipe3(
diff --git a/backend/pkg/utils/jwtclaims/jwt_test.go b/backend/pkg/utils/jwtclaims/jwt_test.go
deleted file mode 100644
index 7d75a76a1..000000000
--- a/backend/pkg/utils/jwtclaims/jwt_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package jwtclaims
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestCheckOrGenerateJwtSecret(t *testing.T) {
- // Production (requireExplicit) must reject empty, the public default, and short secrets.
- assert.Panics(t, func() { CheckOrGenerateJwtSecret("", true) })
- assert.Panics(t, func() { CheckOrGenerateJwtSecret(knownInsecureJWTSecret, true) })
- assert.Panics(t, func() { CheckOrGenerateJwtSecret("too-short", true) })
-
- // Production accepts a real secret verbatim.
- good := "a-sufficiently-long-jwt-secret-value-1234" // >= 32 chars
- assert.Equal(t, []byte(good), CheckOrGenerateJwtSecret(good, true))
-
- // Development / agent mode replaces the public default with a random key.
- got := CheckOrGenerateJwtSecret(knownInsecureJWTSecret, false)
- assert.Len(t, got, 32)
- assert.NotEqual(t, []byte(knownInsecureJWTSecret), got)
-}
diff --git a/backend/pkg/utils/mldsajose/keyset.go b/backend/pkg/utils/mldsajose/keyset.go
new file mode 100644
index 000000000..a30bc33bb
--- /dev/null
+++ b/backend/pkg/utils/mldsajose/keyset.go
@@ -0,0 +1,105 @@
+package mldsajose
+
+import (
+ "context"
+ "io"
+ "net/http"
+ "sync"
+
+ "emperror.dev/errors"
+ "github.com/coreos/go-oidc/v3/oidc"
+ "github.com/go-jose/go-jose/v4"
+ "golang.org/x/oauth2"
+ "golang.org/x/sync/singleflight"
+)
+
+type KeySet struct {
+ client *http.Client
+ jwksURL string
+ remote *oidc.RemoteKeySet
+ mu sync.RWMutex
+ keys []Key
+ group singleflight.Group
+}
+
+func NewKeySet(ctx context.Context, jwksURL string) *KeySet {
+ client := http.DefaultClient
+ if c, ok := ctx.Value(oauth2.HTTPClient).(*http.Client); ok && c != nil {
+ client = c
+ }
+ return &KeySet{
+ client: client,
+ jwksURL: jwksURL,
+ remote: oidc.NewRemoteKeySet(ctx, jwksURL),
+ }
+}
+
+func (k *KeySet) VerifySignature(ctx context.Context, jwt string) ([]byte, error) {
+ jws, err := jose.ParseSigned(jwt, joseAlgorithmsInternal(SupportedSigningAlgs()))
+ if err != nil {
+ return nil, errors.WrapIf(err, "malformed jwt")
+ }
+ if len(jws.Signatures) != 1 {
+ return nil, errors.New("expected exactly one signature")
+ }
+ if !IsAlg(jws.Signatures[0].Header.Algorithm) {
+ return k.remote.VerifySignature(ctx, jwt)
+ }
+
+ k.mu.RLock()
+ keys := k.keys
+ k.mu.RUnlock()
+ if len(keys) > 0 {
+ if payload, err := VerifyCompact(jwt, keys); err == nil {
+ return payload, nil
+ }
+ }
+
+ keys, err = k.refreshInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
+ return VerifyCompact(jwt, keys)
+}
+
+func (k *KeySet) refreshInternal(ctx context.Context) ([]Key, error) {
+ v, err, _ := k.group.Do("jwks", func() (any, error) {
+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, k.jwksURL, nil)
+ if err != nil {
+ return nil, errors.WrapIf(err, "failed to build jwks request")
+ }
+ req.Header.Set("Cache-Control", "no-cache")
+
+ resp, err := k.client.Do(req)
+ if err != nil {
+ return nil, errors.WrapIf(err, "failed to fetch jwks")
+ }
+ defer resp.Body.Close()
+
+ body, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return nil, errors.WrapIf(err, "failed to read jwks response")
+ }
+ if resp.StatusCode != http.StatusOK {
+ return nil, errors.Errorf("failed to fetch jwks: %s", resp.Status)
+ }
+
+ keys, err := ParseJWKS(body)
+ if err != nil {
+ return nil, err
+ }
+
+ k.mu.Lock()
+ k.keys = keys
+ k.mu.Unlock()
+ return keys, nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ keys, ok := v.([]Key)
+ if !ok {
+ return nil, errors.New("jwks refresh returned invalid keys")
+ }
+ return keys, nil
+}
diff --git a/backend/pkg/utils/mldsajose/mldsajose.go b/backend/pkg/utils/mldsajose/mldsajose.go
new file mode 100644
index 000000000..e3adfb81d
--- /dev/null
+++ b/backend/pkg/utils/mldsajose/mldsajose.go
@@ -0,0 +1,168 @@
+package mldsajose
+
+import (
+ "crypto/mldsa"
+ "encoding/base64"
+ "encoding/json/v2"
+ "strings"
+
+ "emperror.dev/errors"
+ "github.com/coreos/go-oidc/v3/oidc"
+ "github.com/go-jose/go-jose/v4"
+ "github.com/golang-jwt/jwt/v5"
+)
+
+const (
+ AlgMLDSA44 = "ML-DSA-44"
+ AlgMLDSA65 = "ML-DSA-65"
+ AlgMLDSA87 = "ML-DSA-87"
+ KeyTypeAKP = "AKP"
+
+ ErrInvalidKeyType = errors.Sentinel("mldsajose: invalid key type")
+ ErrVerification = errors.Sentinel("mldsajose: verification error")
+)
+
+var Parameters = mldsa.MLDSA87()
+
+func Algorithms() []string {
+ return []string{AlgMLDSA44, AlgMLDSA65, AlgMLDSA87}
+}
+
+func SupportedSigningAlgs() []string {
+ return append([]string{
+ oidc.RS256, oidc.RS384, oidc.RS512,
+ oidc.ES256, oidc.ES384, oidc.ES512,
+ oidc.PS256, oidc.PS384, oidc.PS512,
+ oidc.EdDSA,
+ }, Algorithms()...)
+}
+
+func IsAlg(alg string) bool {
+ _, ok := ParametersForAlg(alg)
+ return ok
+}
+
+func ParametersForAlg(alg string) (mldsa.Parameters, bool) {
+ switch alg {
+ case AlgMLDSA44:
+ return mldsa.MLDSA44(), true
+ case AlgMLDSA65:
+ return mldsa.MLDSA65(), true
+ case AlgMLDSA87:
+ return mldsa.MLDSA87(), true
+ }
+ return mldsa.Parameters{}, false
+}
+
+type Key struct {
+ KeyID string
+ Alg string
+ Public *mldsa.PublicKey
+}
+
+func ParseJWKS(body []byte) ([]Key, error) {
+ var set struct {
+ Keys []struct {
+ Kty string `json:"kty"`
+ Kid string `json:"kid"`
+ Alg string `json:"alg"`
+ Pub string `json:"pub"`
+ } `json:"keys"`
+ }
+ if err := json.Unmarshal(body, &set); err != nil {
+ return nil, errors.WrapIf(err, "failed to parse jwks")
+ }
+
+ var keys []Key
+ for _, entry := range set.Keys {
+ if entry.Kty != KeyTypeAKP {
+ continue
+ }
+ params, ok := ParametersForAlg(entry.Alg)
+ if !ok {
+ continue
+ }
+ raw, err := base64.RawURLEncoding.DecodeString(entry.Pub)
+ if err != nil {
+ return nil, errors.WrapIff(err, "invalid AKP key %q", entry.Kid)
+ }
+ public, err := mldsa.NewPublicKey(params, raw)
+ if err != nil {
+ return nil, errors.WrapIff(err, "invalid AKP key %q", entry.Kid)
+ }
+ keys = append(keys, Key{KeyID: entry.Kid, Alg: entry.Alg, Public: public})
+ }
+ return keys, nil
+}
+
+func VerifyCompact(token string, keys []Key) ([]byte, error) {
+ jws, err := jose.ParseSignedCompact(token, joseAlgorithmsInternal(Algorithms()))
+ if err != nil {
+ return nil, errors.WrapIf(err, "malformed jws")
+ }
+ if len(jws.Signatures) != 1 {
+ return nil, errors.New("expected exactly one signature")
+ }
+ sig := jws.Signatures[0]
+
+ dot := strings.LastIndexByte(token, '.')
+ if dot < 0 {
+ return nil, errors.New("malformed compact jws")
+ }
+ signingInput := []byte(token[:dot])
+
+ for _, key := range keys {
+ if key.Alg != sig.Header.Algorithm || (sig.Header.KeyID != "" && key.KeyID != sig.Header.KeyID) {
+ continue
+ }
+ if mldsa.Verify(key.Public, signingInput, sig.Signature, nil) == nil {
+ return jws.UnsafePayloadWithoutVerification(), nil
+ }
+ }
+ return nil, ErrVerification
+}
+
+func joseAlgorithmsInternal(algs []string) []jose.SignatureAlgorithm {
+ out := make([]jose.SignatureAlgorithm, 0, len(algs))
+ for _, alg := range algs {
+ out = append(out, jose.SignatureAlgorithm(alg))
+ }
+ return out
+}
+
+type SigningMethodMLDSA struct {
+ params mldsa.Parameters
+ alg string
+}
+
+var SigningMethodMLDSA87 = &SigningMethodMLDSA{params: mldsa.MLDSA87(), alg: AlgMLDSA87}
+
+func init() {
+ jwt.RegisterSigningMethod(AlgMLDSA87, func() jwt.SigningMethod { return SigningMethodMLDSA87 })
+}
+
+func (m *SigningMethodMLDSA) Alg() string {
+ return m.alg
+}
+
+func (m *SigningMethodMLDSA) Sign(signingString string, key any) ([]byte, error) {
+ sk, ok := key.(*mldsa.PrivateKey)
+ if !ok || sk.PublicKey().Parameters() != m.params {
+ return nil, ErrInvalidKeyType
+ }
+ return sk.Sign(nil, []byte(signingString), nil)
+}
+
+func (m *SigningMethodMLDSA) Verify(signingString string, sig []byte, key any) error {
+ pk, ok := key.(*mldsa.PublicKey)
+ if !ok || pk.Parameters() != m.params {
+ return ErrInvalidKeyType
+ }
+ if len(sig) != m.params.SignatureSize() {
+ return ErrVerification
+ }
+ if err := mldsa.Verify(pk, []byte(signingString), sig, nil); err != nil {
+ return ErrVerification
+ }
+ return nil
+}
diff --git a/backend/pkg/utils/mldsajose/mldsajose_test.go b/backend/pkg/utils/mldsajose/mldsajose_test.go
new file mode 100644
index 000000000..72ee43dba
--- /dev/null
+++ b/backend/pkg/utils/mldsajose/mldsajose_test.go
@@ -0,0 +1,102 @@
+package mldsajose_test
+
+import (
+ "crypto/mldsa"
+ "encoding/base64"
+ "encoding/json/v2"
+ "fmt"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+ "time"
+
+ "github.com/coreos/go-oidc/v3/oidc"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mldsajose"
+ "github.com/golang-jwt/jwt/v5"
+ "github.com/stretchr/testify/require"
+)
+
+func signCompactInternal(t *testing.T, sk *mldsa.PrivateKey, alg, kid string, claims map[string]any) string {
+ t.Helper()
+ header, err := json.Marshal(map[string]string{"alg": alg, "kid": kid, "typ": "JWT"})
+ require.NoError(t, err)
+ payload, err := json.Marshal(claims)
+ require.NoError(t, err)
+ signingInput := base64.RawURLEncoding.EncodeToString(header) + "." + base64.RawURLEncoding.EncodeToString(payload)
+ sig, err := sk.Sign(nil, []byte(signingInput), nil)
+ require.NoError(t, err)
+ return signingInput + "." + base64.RawURLEncoding.EncodeToString(sig)
+}
+
+func TestKeySetVerifySignature(t *testing.T) {
+ tests := []struct {
+ params mldsa.Parameters
+ tamper bool
+ }{
+ {params: mldsa.MLDSA44()},
+ {params: mldsa.MLDSA65()},
+ {params: mldsa.MLDSA87()},
+ {params: mldsa.MLDSA87(), tamper: true},
+ }
+ for _, tc := range tests {
+ name := tc.params.String()
+ if tc.tamper {
+ name += "-tampered"
+ }
+ t.Run(name, func(t *testing.T) {
+ sk, err := mldsa.GenerateKey(tc.params)
+ require.NoError(t, err)
+
+ jwks := fmt.Sprintf(`{"keys":[{"kty":"AKP","alg":%q,"kid":"pq","use":"sig","pub":%q}]}`,
+ tc.params.String(), base64.RawURLEncoding.EncodeToString(sk.PublicKey().Bytes()))
+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+ fmt.Fprint(w, jwks)
+ }))
+ defer srv.Close()
+
+ token := signCompactInternal(t, sk, tc.params.String(), "pq", map[string]any{
+ "iss": srv.URL,
+ "sub": "alice",
+ "aud": "arcane",
+ "exp": time.Now().Add(5 * time.Minute).Unix(),
+ "iat": time.Now().Unix(),
+ })
+ if tc.tamper {
+ token = token[:len(token)-4] + "AAAA"
+ }
+
+ ctx := t.Context()
+ keySet := mldsajose.NewKeySet(oidc.ClientContext(ctx, srv.Client()), srv.URL)
+ verifier := oidc.NewVerifier(srv.URL, keySet, &oidc.Config{
+ ClientID: "arcane",
+ SupportedSigningAlgs: mldsajose.SupportedSigningAlgs(),
+ })
+
+ idToken, err := verifier.Verify(ctx, token)
+ if tc.tamper {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Equal(t, "alice", idToken.Subject)
+ })
+ }
+}
+
+func TestSigningMethodMLDSA87(t *testing.T) {
+ sk, err := mldsa.GenerateKey(mldsajose.Parameters)
+ require.NoError(t, err)
+
+ signed, err := jwt.NewWithClaims(mldsajose.SigningMethodMLDSA87, jwt.MapClaims{"sub": "x"}).SignedString(sk)
+ require.NoError(t, err)
+
+ parsed, err := jwt.Parse(signed, func(t *jwt.Token) (any, error) {
+ return sk.PublicKey(), nil
+ }, jwt.WithValidMethods([]string{mldsajose.AlgMLDSA87}))
+ require.NoError(t, err)
+ require.True(t, parsed.Valid)
+
+ _, err = mldsajose.SigningMethodMLDSA87.Sign("payload", []byte("not-a-key"))
+ require.ErrorIs(t, err, mldsajose.ErrInvalidKeyType)
+}
diff --git a/cli/pkg/auth/federated.go b/cli/pkg/auth/federated.go
index 8399765a7..7b19ba2b7 100644
--- a/cli/pkg/auth/federated.go
+++ b/cli/pkg/auth/federated.go
@@ -22,7 +22,10 @@ import (
"github.com/spf13/cobra"
)
-const maxFederatedErrorBody = 4096
+const (
+ maxFederatedErrorBody = 4096
+ maxFederatedResponseBody = 1 << 20
+)
var federatedCmd = &cobra.Command{
Use: "federated",
@@ -190,14 +193,16 @@ func exchangeFederatedTokenInternal(cmd *cobra.Command, c *client.Client, subjec
}
defer func() { _ = resp.Body.Close() }()
- body, err := io.ReadAll(io.LimitReader(resp.Body, maxFederatedErrorBody))
- if err != nil {
- return nil, errors.WrapIf(err, "failed to read federated token response")
- }
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+ body, _ := io.ReadAll(io.LimitReader(resp.Body, maxFederatedErrorBody))
return nil, errors.Errorf("federated token exchange failed (status %d): %s", resp.StatusCode, redactedFederatedExchangeMessageInternal(body))
}
+ body, err := io.ReadAll(io.LimitReader(resp.Body, maxFederatedResponseBody))
+ if err != nil {
+ return nil, errors.WrapIf(err, "failed to read federated token response")
+ }
+
var tokenResp federatedtypes.FederatedTokenResponse
if err := json.Unmarshal(body, &tokenResp); err != nil {
return nil, errors.WrapIf(err, "failed to parse federated token response")
diff --git a/cli/pkg/generate/certs.go b/cli/pkg/generate/certs.go
index 7601f7efd..14ccd4daf 100644
--- a/cli/pkg/generate/certs.go
+++ b/cli/pkg/generate/certs.go
@@ -1,8 +1,10 @@
package generate
import (
+ "crypto"
"crypto/ecdsa"
"crypto/elliptic"
+ "crypto/mldsa"
crand "crypto/rand"
"crypto/x509"
"crypto/x509/pkix"
@@ -40,7 +42,7 @@ var (
var mtlsCmd = &cobra.Command{
Use: "mtls",
Short: "Generate Arcane edge mTLS assets",
- Long: `Generate an Arcane-managed edge mTLS CA and agent client certificate bundle using ECDSA P-384.`,
+ Long: `Generate an Arcane-managed edge mTLS CA and agent client certificate bundle using ML-DSA-87.`,
RunE: func(cmd *cobra.Command, args []string) error {
return generateMTLSOutputInternal()
},
@@ -81,7 +83,7 @@ func generateMTLSOutputInternal() error {
return err
}
- fmt.Println("Generated Arcane edge mTLS assets (ECDSA P-384)")
+ fmt.Println("Generated Arcane edge mTLS assets (ML-DSA-87)")
fmt.Printf("CA cert: %s\n", paths.CACertPath)
fmt.Printf("CA key: %s\n", paths.CAKeyPath)
fmt.Printf("Agent cert: %s\n", paths.ClientCertPath)
@@ -135,7 +137,7 @@ func generateEdgeMTLSBundleInternal(outDir, envID string, appURL string) (*edgeM
return nil, errors.WrapIf(err, "failed to create output directory")
}
- caKey, err := GenerateP384PrivateKey()
+ caKey, err := GenerateMLDSA87PrivateKey()
if err != nil {
return nil, errors.WrapIf(err, "failed to generate CA private key")
}
@@ -144,12 +146,12 @@ func generateEdgeMTLSBundleInternal(outDir, envID string, appURL string) (*edgeM
return nil, err
}
- caDER, err := x509.CreateCertificate(crand.Reader, caTemplate, caTemplate, &caKey.PublicKey, caKey)
+ caDER, err := x509.CreateCertificate(crand.Reader, caTemplate, caTemplate, caKey.PublicKey(), caKey)
if err != nil {
return nil, errors.WrapIf(err, "failed to create CA certificate")
}
- clientKey, err := GenerateP384PrivateKey()
+ clientKey, err := GenerateMLDSA87PrivateKey()
if err != nil {
return nil, errors.WrapIf(err, "failed to generate client private key")
}
@@ -167,7 +169,7 @@ func generateEdgeMTLSBundleInternal(outDir, envID string, appURL string) (*edgeM
if err != nil {
return nil, errors.WrapIf(err, "failed to parse generated CA certificate")
}
- clientDER, err := x509.CreateCertificate(crand.Reader, clientTemplate, caCert, &clientKey.PublicKey, caKey)
+ clientDER, err := x509.CreateCertificate(crand.Reader, clientTemplate, caCert, clientKey.PublicKey(), caKey)
if err != nil {
return nil, errors.WrapIf(err, "failed to create client certificate")
}
@@ -234,6 +236,11 @@ func GenerateP384PrivateKey() (*ecdsa.PrivateKey, error) {
return ecdsa.GenerateKey(elliptic.P384(), crand.Reader)
}
+// GenerateMLDSA87PrivateKey generates an ML-DSA-87 private key.
+func GenerateMLDSA87PrivateKey() (*mldsa.PrivateKey, error) {
+ return mldsa.GenerateKey(mldsa.MLDSA87())
+}
+
// NewEdgeMTLSCATemplate builds Arcane's edge mTLS CA certificate template.
func NewEdgeMTLSCATemplate() (*x509.Certificate, error) {
template, err := newCertificateTemplateInternal("Arcane Edge mTLS CA")
@@ -361,15 +368,15 @@ func randomSerialInternal() (*big.Int, error) {
return serial, nil
}
-func writeCertificateBundleInternal(certPath, keyPath string, certDER []byte, privateKey *ecdsa.PrivateKey) error {
- keyDER, err := x509.MarshalECPrivateKey(privateKey)
+func writeCertificateBundleInternal(certPath, keyPath string, certDER []byte, privateKey crypto.PrivateKey) error {
+ keyDER, err := x509.MarshalPKCS8PrivateKey(privateKey)
if err != nil {
- return errors.WrapIf(err, "failed to marshal EC private key")
+ return errors.WrapIf(err, "failed to marshal private key")
}
if err := writePEMFileInternal(certPath, "CERTIFICATE", certDER, 0o644); err != nil {
return err
}
- if err := writePEMFileInternal(keyPath, "EC PRIVATE KEY", keyDER, 0o600); err != nil {
+ if err := writePEMFileInternal(keyPath, "PRIVATE KEY", keyDER, 0o600); err != nil {
return err
}
return nil
diff --git a/cli/pkg/generate/certs_test.go b/cli/pkg/generate/certs_test.go
index 7876d4ddf..161f05c94 100644
--- a/cli/pkg/generate/certs_test.go
+++ b/cli/pkg/generate/certs_test.go
@@ -3,6 +3,7 @@ package generate_test
import (
"crypto/ecdsa"
"crypto/elliptic"
+ "crypto/mldsa"
"crypto/x509"
"encoding/pem"
"net"
@@ -14,7 +15,7 @@ import (
"github.com/stretchr/testify/require"
)
-func TestGenerateMTLSCommandWritesECDSAP384Assets(t *testing.T) {
+func TestGenerateMTLSCommandWritesMLDSA87Assets(t *testing.T) {
outDir := t.TempDir()
cmd := gen.GenerateCmd
@@ -28,10 +29,10 @@ func TestGenerateMTLSCommandWritesECDSAP384Assets(t *testing.T) {
require.NoError(t, err,
"command failed: %v", err)
- assertECDSAP384PrivateKey(t, filepath.Join(outDir, "ca.key"))
- assertECDSAP384PrivateKey(t, filepath.Join(outDir, "agent.key"))
- assertECDSAP384Certificate(t, filepath.Join(outDir, "ca.crt"))
- cert := assertECDSAP384Certificate(t, filepath.Join(outDir, "agent.crt"))
+ assertMLDSA87PrivateKey(t, filepath.Join(outDir, "ca.key"))
+ assertMLDSA87PrivateKey(t, filepath.Join(outDir, "agent.key"))
+ assertMLDSA87Certificate(t, filepath.Join(outDir, "ca.crt"))
+ cert := assertMLDSA87Certificate(t, filepath.Join(outDir, "agent.crt"))
require.False(t, len(cert.URIs) == 0 || cert.URIs[0].String() != "spiffe://manager.example.com/edge/env-123",
"expected edge SPIFFE URI SAN, got %v", cert.URIs)
@@ -126,19 +127,84 @@ func assertECDSAP384PrivateKey(t *testing.T, path string) {
require.NotNil(t, block,
"failed to decode key PEM %s", path)
- require.Equal(t, "EC PRIVATE KEY", block.Type,
- "expected EC PRIVATE KEY for %s, got %s", path, block.Type)
+ require.Equal(t, "PRIVATE KEY", block.Type,
+ "expected PRIVATE KEY for %s, got %s", path, block.Type)
- key, err := x509.ParseECPrivateKey(block.Bytes)
+ parsed, err := x509.ParsePKCS8PrivateKey(block.Bytes)
require.NoError(t, err,
- "failed to parse EC private key %s: %v", path, err)
+ "failed to parse private key %s: %v", path, err)
+
+ key, ok := parsed.(*ecdsa.PrivateKey)
+
+ require.True(t, ok,
+ "expected ECDSA private key for %s", path)
require.Equal(t, elliptic.P384(), key.Curve,
"expected P-384 private key for %s", path)
}
+func assertMLDSA87PrivateKey(t *testing.T, path string) {
+ t.Helper()
+
+ pemBytes, err := os.ReadFile(path)
+
+ require.NoError(t, err,
+ "failed to read key %s: %v", path, err)
+
+ block, _ := pem.Decode(pemBytes)
+
+ require.NotNil(t, block,
+ "failed to decode key PEM %s", path)
+
+ require.Equal(t, "PRIVATE KEY", block.Type,
+ "expected PRIVATE KEY for %s, got %s", path, block.Type)
+
+ parsed, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+
+ require.NoError(t, err,
+ "failed to parse private key %s: %v", path, err)
+
+ key, ok := parsed.(*mldsa.PrivateKey)
+
+ require.True(t, ok,
+ "expected ML-DSA private key for %s", path)
+
+ require.Equal(t, mldsa.MLDSA87(), key.PublicKey().Parameters(),
+ "expected ML-DSA-87 private key for %s", path)
+
+}
+
+func assertMLDSA87Certificate(t *testing.T, path string) *x509.Certificate {
+ t.Helper()
+
+ pemBytes, err := os.ReadFile(path)
+
+ require.NoError(t, err,
+ "failed to read certificate %s: %v", path, err)
+
+ block, _ := pem.Decode(pemBytes)
+
+ require.NotNil(t, block,
+ "failed to decode certificate PEM %s", path)
+
+ cert, err := x509.ParseCertificate(block.Bytes)
+
+ require.NoError(t, err,
+ "failed to parse certificate %s: %v", path, err)
+
+ publicKey, ok := cert.PublicKey.(*mldsa.PublicKey)
+
+ require.True(t, ok,
+ "expected ML-DSA public key for %s", path)
+
+ require.Equal(t, mldsa.MLDSA87(), publicKey.Parameters(),
+ "expected ML-DSA-87 certificate for %s", path)
+
+ return cert
+}
+
func assertECDSAP384Certificate(t *testing.T, path string) *x509.Certificate {
t.Helper()
diff --git a/cli/pkg/generate/secret.go b/cli/pkg/generate/secret.go
index 3e15967ed..7955a491b 100644
--- a/cli/pkg/generate/secret.go
+++ b/cli/pkg/generate/secret.go
@@ -18,7 +18,7 @@ var (
var secretCmd = &cobra.Command{
Use: "secret",
Short: "Generate cryptographic secrets",
- Long: `Generate secure cryptographic secrets for ENCRYPTION_KEY and JWT_SECRET.`,
+ Long: `Generate a secure cryptographic secret for ENCRYPTION_KEY.`,
RunE: func(cmd *cobra.Command, args []string) error {
return generateSecrets()
},
@@ -36,22 +36,17 @@ func generateSecrets() error {
return errors.WrapIf(err, "failed to generate encryption key")
}
- jwtSecret := make([]byte, secretLength)
- if _, err := rand.Read(jwtSecret); err != nil {
- return errors.WrapIf(err, "failed to generate JWT secret")
- }
-
switch secretFormat {
case "base64":
- printBase64Format(encryptionKey, jwtSecret)
+ printBase64Format(encryptionKey)
case "hex":
- printHexFormat(encryptionKey, jwtSecret)
+ printHexFormat(encryptionKey)
case "env":
- printEnvFormat(encryptionKey, jwtSecret)
+ printEnvFormat(encryptionKey)
case "docker":
- printDockerFormat(encryptionKey, jwtSecret)
+ printDockerFormat(encryptionKey)
case "all":
- printAllFormats(encryptionKey, jwtSecret)
+ printAllFormats(encryptionKey)
default:
return errors.Errorf("unknown format: %s (supported: base64, hex, env, docker, all)", secretFormat)
}
@@ -59,36 +54,32 @@ func generateSecrets() error {
return nil
}
-func printBase64Format(encKey, jwtKey []byte) {
+func printBase64Format(encKey []byte) {
fmt.Println("BASE64")
fmt.Println("------")
fmt.Printf("ENCRYPTION_KEY=%s\n", base64.StdEncoding.EncodeToString(encKey))
- fmt.Printf("JWT_SECRET=%s\n", base64.StdEncoding.EncodeToString(jwtKey))
}
-func printHexFormat(encKey, jwtKey []byte) {
+func printHexFormat(encKey []byte) {
fmt.Println("HEX")
fmt.Println("---")
fmt.Printf("ENCRYPTION_KEY=%s\n", hex.EncodeToString(encKey))
- fmt.Printf("JWT_SECRET=%s\n", hex.EncodeToString(jwtKey))
}
-func printEnvFormat(encKey, jwtKey []byte) {
+func printEnvFormat(encKey []byte) {
fmt.Println("ENV (.env) FORMAT")
fmt.Println("-------------------")
fmt.Printf("ENCRYPTION_KEY=%s\n", base64.StdEncoding.EncodeToString(encKey))
- fmt.Printf("JWT_SECRET=%s\n", base64.StdEncoding.EncodeToString(jwtKey))
}
-func printDockerFormat(encKey, jwtKey []byte) {
+func printDockerFormat(encKey []byte) {
fmt.Println("DOCKER COMPOSE ENVIRONMENT")
fmt.Println("--------------------------")
fmt.Println("environment:")
fmt.Printf(" - ENCRYPTION_KEY=%s\n", base64.StdEncoding.EncodeToString(encKey))
- fmt.Printf(" - JWT_SECRET=%s\n", base64.StdEncoding.EncodeToString(jwtKey))
}
-func printAllFormats(encKey, jwtKey []byte) {
+func printAllFormats(encKey []byte) {
fmt.Println("Arcane cryptographic secrets")
fmt.Println("===========================")
fmt.Println()
@@ -96,19 +87,16 @@ func printAllFormats(encKey, jwtKey []byte) {
fmt.Println("ENV (.env) - recommended")
fmt.Println("------------------------")
fmt.Printf("ENCRYPTION_KEY=%s\n", base64.StdEncoding.EncodeToString(encKey))
- fmt.Printf("JWT_SECRET=%s\n", base64.StdEncoding.EncodeToString(jwtKey))
fmt.Println()
fmt.Println("Docker Compose (environment block)")
fmt.Println("-------------------------------")
fmt.Println("environment:")
fmt.Printf(" - ENCRYPTION_KEY=%s\n", base64.StdEncoding.EncodeToString(encKey))
- fmt.Printf(" - JWT_SECRET=%s\n", base64.StdEncoding.EncodeToString(jwtKey))
fmt.Println()
fmt.Println("HEX")
fmt.Println("---")
fmt.Printf("ENCRYPTION_KEY=%s\n", hex.EncodeToString(encKey))
- fmt.Printf("JWT_SECRET=%s\n", hex.EncodeToString(jwtKey))
fmt.Println()
}
diff --git a/cli/pkg/generate/secret_test.go b/cli/pkg/generate/secret_test.go
index 16d7e70d8..b2866b9db 100644
--- a/cli/pkg/generate/secret_test.go
+++ b/cli/pkg/generate/secret_test.go
@@ -57,19 +57,18 @@ func TestSecretDefaultBase64(t *testing.T) {
require.Contains(t, out, "BASE64",
"expected BASE64 header in output, got: %q", out)
- // find ENCRYPTION_KEY= and JWT_SECRET= lines and ensure they are valid base64
- var encVal, jwtVal string
+ // find the ENCRYPTION_KEY= line and ensure it is valid base64
+ var encVal string
for line := range strings.SplitSeq(out, "\n") {
if after, ok := strings.CutPrefix(line, "ENCRYPTION_KEY="); ok {
encVal = after
}
- if after, ok := strings.CutPrefix(line, "JWT_SECRET="); ok {
- jwtVal = after
- }
}
- require.False(t, encVal == "" || jwtVal == "",
- "missing keys in output: enc=%q jwt=%q out=%q", encVal, jwtVal, out)
+ require.NotEmpty(t, encVal,
+ "missing ENCRYPTION_KEY in output: %q", out)
+ require.NotContains(t, out, "JWT_SECRET",
+ "JWT_SECRET is no longer emitted, got: %q", out)
if b, err := base64.StdEncoding.DecodeString(encVal); err != nil {
require.FailNowf(t, "unexpected failure", "ENCRYPTION_KEY is not valid base64: %v (value=%q)", err, encVal)
@@ -77,12 +76,6 @@ func TestSecretDefaultBase64(t *testing.T) {
require.Len(t, b, 32,
"ENCRYPTION_KEY decoded length != 32 bytes: %d", len(b))
}
- if b, err := base64.StdEncoding.DecodeString(jwtVal); err != nil {
- require.FailNowf(t, "unexpected failure", "JWT_SECRET is not valid base64: %v (value=%q)", err, jwtVal)
- } else if len(b) != 32 {
- require.Len(t, b, 32,
- "JWT_SECRET decoded length != 32 bytes: %d", len(b))
- }
}
func TestSecretAllFormatContainsSections(t *testing.T) {
@@ -113,8 +106,8 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
}
- // verify hex values decode to 32 bytes
- var hexEnc, hexJwt string
+ // verify the hex value decodes to 32 bytes
+ var hexEnc string
for line := range strings.SplitSeq(out, "\n") {
if after, ok := strings.CutPrefix(line, "ENCRYPTION_KEY="); ok {
v := after
@@ -124,17 +117,12 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
continue
}
}
- if after, ok := strings.CutPrefix(line, "JWT_SECRET="); ok {
- v := after
- if len(v) >= 64 {
- hexJwt = v
- continue
- }
- }
}
- require.False(t, hexEnc == "" || hexJwt == "",
- "hex values not found in output (enc=%q jwt=%q) output:\n%s", hexEnc, hexJwt, out)
+ require.NotEmpty(t, hexEnc,
+ "hex value not found in output:\n%s", out)
+ require.NotContains(t, out, "JWT_SECRET",
+ "JWT_SECRET is no longer emitted, got: %q", out)
if b, err := hex.DecodeString(strings.TrimSpace(hexEnc)); err != nil {
require.FailNowf(t, "unexpected failure", "ENCRYPTION_KEY hex decode failed: %v", err)
@@ -142,10 +130,4 @@ func TestSecretAllFormatContainsSections(t *testing.T) {
require.Len(t, b, 32,
"ENCRYPTION_KEY hex decoded length != 32: %d", len(b))
}
- if b, err := hex.DecodeString(strings.TrimSpace(hexJwt)); err != nil {
- require.FailNowf(t, "unexpected failure", "JWT_SECRET hex decode failed: %v", err)
- } else if len(b) != 32 {
- require.Len(t, b, 32,
- "JWT_SECRET hex decoded length != 32: %d", len(b))
- }
}