Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(auth): require verified email before merging OIDC accounts (#4381)
Kyle Mendellbc6547ffc14f
diff --git a/backend/go.sum b/backend/go.sumindex 5d3d0f5a6..89c623a3a 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -661,8 +661,8 @@ github.com/shirou/gopsutil/v4 v4.26.9 h1:CaBo/hBFqvlJoLvAQEKdHdf5GD97/MN2ACfyv63github.com/shirou/gopsutil/v4 v4.26.9/go.mod h1:nKH+8wX2zxr/mDbsR+AAy6Qd2z4ZOQ7wfQaEp+yrYmg=github.com/sigstore/sigstore v1.10.8 h1:1Mgkxvkw4AXMfIP1DOjc6kw0GkUgA8pGVpveN/EfOq4=github.com/sigstore/sigstore v1.10.8/go.mod h1:f9+B/4iaYimvUkySyb2mvc73n3RLqNn24grHZM/ET8M=-github.com/sigstore/sigstore-go v1.2.2 h1:xAJ8hxaoecC0HKBYVbrwUjkeAI+GJYu6vLqbxDlD2Q0=-github.com/sigstore/sigstore-go v1.2.2/go.mod h1:MIFwBxAHJD+/lKgZzt9n/4Zhq/3T2+EuGX8iGrIsZgU=+github.com/sigstore/sigstore-go v1.3.0 h1:hnIMHREyCNTYFtOE1o7ae3Axa9B5W5EjUSBJICP2NBE=+github.com/sigstore/sigstore-go v1.3.0/go.mod h1:AyRQXfpH89py1twjE3kEZxlRersng90GSYqQV9zGJE8=github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=diff --git a/backend/internal/auth/handler.go b/backend/internal/auth/handler.goindex 11c8640da..8dc3c53a8 100644--- a/backend/internal/auth/handler.go+++ b/backend/internal/auth/handler.go@@ -265,7 +265,7 @@ func (h *AuthHandler) ChangePassword(ctx context.Context, input *ChangePasswordIcase errors.Is(err, ErrInvalidCredentials):return nil, huma.Error401Unauthorized("Current password is incorrect")case errors.Is(err, common.ErrValidation):- passwordPolicy := h.authService.passwordPolicyInternal(ctx)+ passwordPolicy := h.authService.passwordPolicy(ctx)return nil, handlerutil.Error400BadRequestWithType(err.Error(), validation.PasswordPolicyProblemType(passwordPolicy))default:return nil, huma.Error500InternalServerError("Failed to change password")@@ -291,39 +291,6 @@ func (h *AuthHandler) LogoutAllOtherSessions(ctx context.Context, input *struct{return handlerutil.MessageOutput("All other sessions signed out", ""), nil}-// validatePreferencesInternal checks the preference values Huma's enum tags-// cannot express. Everything else is constrained by the schema.-func validatePreferencesInternal(p *user.Preferences) error {- // The "default" sentinel means "no override"; anything else must be a color- // literal safe to inject into CSS.- if v := p.AccentColor; v != nil && *v != "" && *v != "default" && !settingstypes.SafeAccentColor.MatchString(*v) {- return huma.Error400BadRequest("invalid accentColor value")- }- // Keep the landing page a same-origin relative path. The frontend- // additionally validates it against the known nav pages, falling back to- // /dashboard.- if v := p.DefaultLandingPage; v != nil && (!strings.HasPrefix(*v, "/") || strings.HasPrefix(*v, "//")) {- return huma.Error400BadRequest("invalid defaultLandingPage value")- }- return nil-}--// mergePreferencesInternal copies every set (non-nil) field of src onto dst.-// Reflection keeps this merge-only update free of per-field branches, the same-// way the settings update path walks its DTO, so a new preference needs no-// handler change.-func mergePreferencesInternal(dst, src *user.Preferences) {- dstValue := reflect.ValueOf(dst).Elem()- srcValue := reflect.ValueOf(src).Elem()-- for i := range srcValue.NumField() {- field := srcValue.Field(i)- if field.Kind() == reflect.Pointer && !field.IsNil() {- dstValue.Field(i).Set(field)- }- }-}-// UpdateMyProfile lets the current user update their own displayName and email.// OIDC-managed accounts are read-only here.func (h *AuthHandler) UpdateMyProfile(ctx context.Context, input *UpdateMyProfileInput) (*handlerutil.Out[user.User], error) {@@ -363,10 +330,27 @@ func (h *AuthHandler) UpdateMyProfile(ctx context.Context, input *UpdateMyProfiluserModel.FontSize = input.Body.FontSize}if p := input.Body.Preferences; p != nil {- if validatePreferencesErr := validatePreferencesInternal(p); validatePreferencesErr != nil {- return nil, validatePreferencesErr+ // Huma's enum tags cannot express these checks. The "default" accent+ // sentinel means "no override"; anything else must be a color literal+ // safe to inject into CSS.+ if v := p.AccentColor; v != nil && *v != "" && *v != "default" && !settingstypes.SafeAccentColor.MatchString(*v) {+ return nil, huma.Error400BadRequest("invalid accentColor value")+ }+ // Keep the landing page a same-origin relative path. The frontend+ // additionally validates it against the known nav pages, falling back to+ // /dashboard.+ if v := p.DefaultLandingPage; v != nil && (!strings.HasPrefix(*v, "/") || strings.HasPrefix(*v, "//")) {+ return nil, huma.Error400BadRequest("invalid defaultLandingPage value")+ }+ // Copy every set (non-nil) field. Reflection keeps this merge-only update+ // free of per-field branches, so a new preference needs no handler change.+ dstValue := reflect.ValueOf(&userModel.Preferences).Elem()+ srcValue := reflect.ValueOf(p).Elem()+ for i := range srcValue.NumField() {+ if field := srcValue.Field(i); field.Kind() == reflect.Pointer && !field.IsNil() {+ dstValue.Field(i).Set(field)+ }}- mergePreferencesInternal(&userModel.Preferences, p)}updated, err := h.userService.UpdateUser(ctx, userModel, nil)@@ -410,7 +394,12 @@ func (h *AuthHandler) UploadMyAvatar(ctx context.Context, input *UploadMyAvatarI}defer func() { _ = f.Close() }()- maxSizeMb := h.avatarMaxUploadSizeMbInternal(ctx)+ const defaultAvatarMaxUploadSizeMb = 2+ maxSizeMb := defaultAvatarMaxUploadSizeMb+ if h.settingsService != nil {+ maxSizeMb = h.settingsService.GetIntSetting(ctx, "avatarMaxUploadSizeMb", defaultAvatarMaxUploadSizeMb)+ maxSizeMb = kit.Ternary(maxSizeMb <= 0, defaultAvatarMaxUploadSizeMb, maxSizeMb)+ }maxSizeBytes := int64(maxSizeMb) * 1024 * 1024// Read one byte past the configured ceiling so oversized files are rejected@@ -425,12 +414,12 @@ func (h *AuthHandler) UploadMyAvatar(ctx context.Context, input *UploadMyAvatarI}data := buf.Bytes()- // Detect and validate image format- mimeType, err := detectAvatarMimeTypeInternal(data)- if err != nil {+ // Only PNG, JPEG, and WebP avatars are accepted.+ mimeType := http.DetectContentType(data)+ if mimeType != "image/png" && mimeType != "image/jpeg" && mimeType != "image/webp" {return nil, huma.Error400BadRequest("unsupported image format: only PNG, JPEG and WebP are accepted")}- data, mimeType = normalizeAvatarImageInternal(data, mimeType)+ data, mimeType = normalizeAvatarImage(data, mimeType)if uploadAvatarErr := h.userService.UploadAvatar(ctx, currentUser.ID, data, mimeType); uploadAvatarErr != nil {slog.ErrorContext(ctx, "Failed to save avatar", "userId", currentUser.ID, "error", uploadAvatarErr)@@ -457,15 +446,6 @@ func (h *AuthHandler) UploadMyAvatar(ctx context.Context, input *UploadMyAvatarI}, nil}-func (h *AuthHandler) avatarMaxUploadSizeMbInternal(ctx context.Context) int {- const defaultAvatarMaxUploadSizeMb = 2- if h.settingsService == nil {- return defaultAvatarMaxUploadSizeMb- }- maxSizeMb := h.settingsService.GetIntSetting(ctx, "avatarMaxUploadSizeMb", defaultAvatarMaxUploadSizeMb)- return kit.Ternary(maxSizeMb <= 0, defaultAvatarMaxUploadSizeMb, maxSizeMb)-}-// DeleteMyAvatar removes the current user's custom profile picture.func (h *AuthHandler) DeleteMyAvatar(ctx context.Context, input *struct{}) (*handlerutil.Out[user.User], error) {currentUser, err := requireUser(ctx)@@ -497,19 +477,7 @@ func (h *AuthHandler) DeleteMyAvatar(ctx context.Context, input *struct{}) (*han}, nil}-// detectAvatarMimeTypeInternal validates that data is a supported image format and returns its MIME type.-// Supported formats: PNG, JPEG, WebP.-func detectAvatarMimeTypeInternal(data []byte) (string, error) {- mimeType := http.DetectContentType(data)- switch mimeType {- case "image/png", "image/jpeg", "image/webp":- return mimeType, nil- default:- return "", errors.New("unsupported image format: only PNG, JPEG and WebP are accepted")- }-}--func normalizeAvatarImageInternal(data []byte, mimeType string) ([]byte, string) {+func normalizeAvatarImage(data []byte, mimeType string) ([]byte, string) {const maxAvatarNormalizePixels = 16 * 1024 * 1024if mimeType != "image/png" {return data, mimeType@@ -524,7 +492,7 @@ func normalizeAvatarImageInternal(data []byte, mimeType string) ([]byte, string)}img, err := png.Decode(bytes.NewReader(data))- if err != nil || imageHasTransparencyInternal(img) {+ if err != nil || imageHasTransparency(img) {return data, mimeType}@@ -539,7 +507,7 @@ func normalizeAvatarImageInternal(data []byte, mimeType string) ([]byte, string)return out.Bytes(), "image/jpeg"}-func imageHasTransparencyInternal(img image.Image) bool {+func imageHasTransparency(img image.Image) bool {bounds := img.Bounds()for y := bounds.Min.Y; y < bounds.Max.Y; y++ {for x := bounds.Min.X; x < bounds.Max.X; x++ {@@ -563,8 +531,8 @@ type operationProvider interface {Operation() *huma.Operation}-// parseSecurityRequirementsInternal extracts security requirements from a Huma operation.-func parseSecurityRequirementsInternal(api huma.API, ctx operationProvider) securityRequirements {+// parseSecurityRequirements extracts security requirements from a Huma operation.+func parseSecurityRequirements(api huma.API, ctx operationProvider) securityRequirements {reqs := securityRequirements{}if ctx.Operation() == nil {return reqs@@ -597,47 +565,19 @@ func parseSecurityRequirementsInternal(api huma.API, ctx operationProvider) secureturn reqs}-// tryBearerAuthInternal attempts Bearer token authentication. Returns the+// tryBearerAuth attempts Bearer token authentication. Returns the// authenticated user on success, or the underlying error from VerifyToken so// the caller can distinguish a missing/invalid token from a token-version// mismatch (which requires clearing the stale cookie).-func tryBearerAuthInternal(ctx huma.Context, authService *AuthService) (*userdomain.User, string, error) {- token, fromCookie := extractBearerTokenInternal(ctx)+func tryBearerAuth(ctx huma.Context, authService *AuthService) (*userdomain.User, string, error) {+ token, fromCookie := extractBearerToken(ctx)if token == "" {return nil, "", nil}- var authenticatedUser *userdomain.User- var sessionID string- var err error- if fromCookie {- authenticatedUser, sessionID, err = authService.VerifyBrowserToken(ctx.Context(), token)- } else {- authenticatedUser, sessionID, err = authService.VerifyToken(ctx.Context(), token)- }- if err != nil {- return nil, "", err- }- return authenticatedUser, sessionID, nil+ return kit.Ternary(fromCookie, authService.VerifyBrowserToken, authService.VerifyToken)(ctx.Context(), token)}-// tryApiKeyAuthInternal checks if API key authentication should be allowed-// through. Returns the resolved user plus the API key record so the caller-// can resolve permissions according to the key's kind.-func tryApiKeyAuthInternal(ctx huma.Context, apiKeyService *apikey.ApiKeyService) (*userdomain.User, *apikey.ApiKey, bool) {- apiKey := ctx.Header(middleware.HeaderApiKey)- if apiKey == "" {- return nil, nil, false- }-- authenticatedUser, key, err := apiKeyService.ValidateApiKeyWithID(ctx.Context(), apiKey)- if err != nil || authenticatedUser == nil {- return nil, nil, false- }-- return authenticatedUser, key, true-}--func tryEnvironmentAccessTokenAuthInternal(ctx huma.Context, resolver EnvironmentAccessTokenResolver, token string) (*userdomain.User, *environment.Environment, bool) {+func tryEnvironmentAccessTokenAuth(ctx huma.Context, resolver EnvironmentAccessTokenResolver, token string) (*userdomain.User, *environment.Environment, bool) {if resolver == nil || strings.TrimSpace(token) == "" {return nil, nil, false}@@ -647,41 +587,13 @@ func tryEnvironmentAccessTokenAuthInternal(ctx huma.Context, resolver Environmenreturn nil, nil, false}- return createEnvironmentUserInternal(env), env, true+ return createEnvironmentUser(env), env, true}-// tryAgentAuthInternal checks if the request is from an authenticated agent.-// Returns a sudo agent user if the agent token is valid.-func tryAgentAuthInternal(ctx huma.Context, cfg *config.Config) (*userdomain.User, bool) {- if cfg == nil || !cfg.AgentMode {- return nil, false- }-- path := ctx.URL().Path-- // Check for agent bootstrap pairing- if strings.HasPrefix(path, middleware.AgentPairingPrefix) &&- AgentTokenMatches(ctx.Header(middleware.HeaderAgentBootstrap), cfg.AgentToken) {- return createAgentSudoUserInternal(), true- }-- // Check for agent token- if AgentTokenMatches(ctx.Header(middleware.HeaderAgentToken), cfg.AgentToken) {- return createAgentSudoUserInternal(), true- }-- // Check for API key as agent token- if AgentTokenMatches(ctx.Header(middleware.HeaderApiKey), cfg.AgentToken) {- return createAgentSudoUserInternal(), true- }-- return nil, false-}--// createAgentSudoUserInternal creates a sudo user for agent authentication.+// createAgentSudoUser creates a sudo user for agent authentication.// The sudo PermissionSet attached to the context by the agent token path// bypasses every check; the user's Roles field is intentionally empty.-func createAgentSudoUserInternal() *userdomain.User {+func createAgentSudoUser() *userdomain.User {return &userdomain.User{ID: "agent",Email: new("[email protected]"),@@ -689,7 +601,7 @@ func createAgentSudoUserInternal() *userdomain.User {}}-// applyProxiedIconCatalogInternal copies the requesting user's icon catalog+// applyProxiedIconCatalog copies the requesting user's icon catalog// preference, forwarded by the manager, onto the synthetic user this request// authenticates as. Without it the synthetic user has no preferences and every// proxied icon resolves against the default catalog.@@ -697,7 +609,7 @@ func createAgentSudoUserInternal() *userdomain.User {// Only called on synthetic-user auth paths (agent token, environment access// token), where the header is set by the manager after it strips any// client-supplied value. Real-user auth paths never read it.-func applyProxiedIconCatalogInternal(ctx huma.Context, authenticatedUser *userdomain.User) {+func applyProxiedIconCatalog(ctx huma.Context, authenticatedUser *userdomain.User) {if authenticatedUser == nil {return}@@ -708,7 +620,7 @@ func applyProxiedIconCatalogInternal(ctx huma.Context, authenticatedUser *userdoauthenticatedUser.Preferences.IconCatalog = &catalog}-func createEnvironmentUserInternal(env *environment.Environment) *userdomain.User {+func createEnvironmentUser(env *environment.Environment) *userdomain.User {return &userdomain.User{ID: "environment:" + env.ID,Username: env.Name,@@ -739,31 +651,37 @@ func NewHumaMiddleware(return}- if newCtx, ok := tryAgentAuthCtxInternal(ctx, cfg); ok {+ if newCtx, ok := tryAgentAuth(ctx, cfg); ok {next(newCtx)return}- reqs := parseSecurityRequirementsInternal(api, ctx)+ reqs := parseSecurityRequirements(api, ctx)if !reqs.isRequired {- next(opportunisticBearerAuthInternal(ctx, authService, permResolver))+ // Public routes (e.g. logout) still learn who the caller is when a+ // valid bearer token is present, but never fail the request.+ if authenticatedUser, sessionID, err := tryBearerAuth(ctx, authService); err == nil && authenticatedUser != nil {+ newCtx := setUserInContext(ctx.Context(), authenticatedUser, resolveUserPermissions(ctx.Context(), permResolver, authenticatedUser))+ ctx = huma.WithContext(ctx, context.WithValue(newCtx, middleware.ContextKeyCurrentSessionID, sessionID))+ }+ next(ctx)return}if reqs.apiKeyAuth && ctx.Header(middleware.HeaderApiKey) != "" {- handleApiKeyAuthInternal(api, ctx, authService, apiKeyService, permResolver, envTokenResolver, reqs.bearerAuth, next)+ handleApiKeyAuth(api, ctx, authService, apiKeyService, permResolver, envTokenResolver, reqs.bearerAuth, next)return}- if authenticatedUser, env, ok := tryEnvironmentAccessTokenAuthInternal(ctx, envTokenResolver, ctx.Header(middleware.HeaderAgentToken)); ok {- applyProxiedIconCatalogInternal(ctx, authenticatedUser)- newCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, authz.EnvironmentPermissionSet(env.ID))+ if authenticatedUser, env, ok := tryEnvironmentAccessTokenAuth(ctx, envTokenResolver, ctx.Header(middleware.HeaderAgentToken)); ok {+ applyProxiedIconCatalog(ctx, authenticatedUser)+ newCtx := setUserInContext(ctx.Context(), authenticatedUser, authz.EnvironmentPermissionSet(env.ID))next(huma.WithContext(ctx, newCtx))return}if reqs.bearerAuth {- nextCtx, handled := handleBearerAuthInternal(api, ctx, authService, permResolver)+ nextCtx, handled := handleBearerAuth(api, ctx, authService, permResolver)if handled {if nextCtx != nil {next(nextCtx)@@ -776,16 +694,22 @@ func NewHumaMiddleware(}}-func tryAgentAuthCtxInternal(ctx huma.Context, cfg *config.Config) (huma.Context, bool) {+// tryAgentAuth authenticates an agent-mode request presenting the+// agent token as a bootstrap pairing, agent token, or API key header.+func tryAgentAuth(ctx huma.Context, cfg *config.Config) (huma.Context, bool) {if cfg == nil || !cfg.AgentMode {return ctx, false}- authenticatedUser, ok := tryAgentAuthInternal(ctx, cfg)- if !ok {+ bootstrapPairing := strings.HasPrefix(ctx.URL().Path, middleware.AgentPairingPrefix) &&+ AgentTokenMatches(ctx.Header(middleware.HeaderAgentBootstrap), cfg.AgentToken)+ if !bootstrapPairing &&+ !AgentTokenMatches(ctx.Header(middleware.HeaderAgentToken), cfg.AgentToken) &&+ !AgentTokenMatches(ctx.Header(middleware.HeaderApiKey), cfg.AgentToken) {return ctx, false}- applyProxiedIconCatalogInternal(ctx, authenticatedUser)- authCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, authz.SudoPermissionSet())+ authenticatedUser := createAgentSudoUser()+ applyProxiedIconCatalog(ctx, authenticatedUser)+ authCtx := setUserInContext(ctx.Context(), authenticatedUser, authz.SudoPermissionSet())updatePath := strings.Contains(ctx.URL().Path, "/containers/") && strings.HasSuffix(ctx.URL().Path, "/update")if ctx.Method() == http.MethodPost && updatePath {if initiatorID := strings.TrimSpace(ctx.Header(middleware.HeaderUpdateInitiatorID)); initiatorID != "" {@@ -802,26 +726,10 @@ func tryAgentAuthCtxInternal(ctx huma.Context, cfg *config.Config) (huma.Contextreturn huma.WithContext(ctx, authCtx), true}-// opportunisticBearerAuthInternal populates the user/session context if a valid-// bearer token is present, but never fails the request. Used for public routes-// (e.g. logout) that still need to know who the caller is when a token exists.-func opportunisticBearerAuthInternal(ctx huma.Context, authService *AuthService, permResolver PermissionResolver) huma.Context {- if token, _ := extractBearerTokenInternal(ctx); token == "" {- return ctx- }- authenticatedUser, sessionID, err := tryBearerAuthInternal(ctx, authService)- if err != nil || authenticatedUser == nil {- return ctx- }- newCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, resolveUserPermissionsInternal(ctx.Context(), permResolver, authenticatedUser))- newCtx = context.WithValue(newCtx, middleware.ContextKeyCurrentSessionID, sessionID)- return huma.WithContext(ctx, newCtx)-}--// handleApiKeyAuthInternal handles the API-key-present branch. Invalid user+// handleApiKeyAuth handles the API-key-present branch. Invalid user// keys fail closed; only recognized environment tokens defer to bearer auth// when both credentials are present on a bearer-capable operation.-func handleApiKeyAuthInternal(+func handleApiKeyAuth(api huma.API,ctx huma.Context,authService *AuthService,@@ -833,23 +741,26 @@ func handleApiKeyAuthInternal(huma.Context,),) {- if authenticatedUser, key, ok := tryApiKeyAuthInternal(ctx, apiKeyService); ok {+ if authenticatedUser, key, err := apiKeyService.ValidateApiKeyWithID(ctx.Context(), ctx.Header(middleware.HeaderApiKey)); err == nil && authenticatedUser != nil {// Personal keys inherit the owner's role permissions (same resolution// as session auth); scoped keys are limited to their own grants.var ps *authz.PermissionSetif key.Kind == apikey.ApiKeyKindPersonal {- ps = resolveUserPermissionsInternal(ctx.Context(), permResolver, authenticatedUser)- } else {- ps = resolveApiKeyPermissionsInternal(ctx.Context(), permResolver, key.ID)+ ps = resolveUserPermissions(ctx.Context(), permResolver, authenticatedUser)+ } else if permResolver != nil && key.ID != "" {+ if ps, err = permResolver.ResolveApiKeyPermissions(ctx.Context(), key.ID); err != nil {+ slog.WarnContext(ctx.Context(), "failed to resolve api key permissions", "error", err, "apiKeyId", key.ID)+ ps = nil+ }}- newCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, ps)+ newCtx := setUserInContext(ctx.Context(), authenticatedUser, ps)newCtx = context.WithValue(newCtx, middleware.ContextKeyApiKeyID, key.ID)next(huma.WithContext(ctx, newCtx))return}- if authenticatedUser, env, ok := tryEnvironmentAccessTokenAuthInternal(ctx, envTokenResolver, ctx.Header(middleware.HeaderApiKey)); ok {- if token, _ := extractBearerTokenInternal(ctx); allowBearerFallback && token != "" {- nextCtx, handled := handleBearerAuthInternal(api, ctx, authService, permResolver)+ if authenticatedUser, env, ok := tryEnvironmentAccessTokenAuth(ctx, envTokenResolver, ctx.Header(middleware.HeaderApiKey)); ok {+ if token, _ := extractBearerToken(ctx); allowBearerFallback && token != "" {+ nextCtx, handled := handleBearerAuth(api, ctx, authService, permResolver)if handled {if nextCtx != nil {next(nextCtx)@@ -857,19 +768,19 @@ func handleApiKeyAuthInternal(return}}- applyProxiedIconCatalogInternal(ctx, authenticatedUser)- newCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, authz.EnvironmentPermissionSet(env.ID))+ applyProxiedIconCatalog(ctx, authenticatedUser)+ newCtx := setUserInContext(ctx.Context(), authenticatedUser, authz.EnvironmentPermissionSet(env.ID))next(huma.WithContext(ctx, newCtx))return}_ = huma.WriteErr(api, ctx, http.StatusUnauthorized, "Unauthorized: invalid API key")}-func handleBearerAuthInternal(api huma.API, ctx huma.Context, authService *AuthService, permResolver PermissionResolver) (huma.Context, bool) {- authenticatedUser, sessionID, err := tryBearerAuthInternal(ctx, authService)+func handleBearerAuth(api huma.API, ctx huma.Context, authService *AuthService, permResolver PermissionResolver) (huma.Context, bool) {+ authenticatedUser, sessionID, err := tryBearerAuth(ctx, authService)if err == nil && authenticatedUser != nil {- ps := resolveUserPermissionsInternal(ctx.Context(), permResolver, authenticatedUser)- newCtx := setUserInContextInternal(ctx.Context(), authenticatedUser, ps)+ ps := resolveUserPermissions(ctx.Context(), permResolver, authenticatedUser)+ newCtx := setUserInContext(ctx.Context(), authenticatedUser, ps)newCtx = context.WithValue(newCtx, middleware.ContextKeyCurrentSessionID, sessionID)return huma.WithContext(ctx, newCtx), true}@@ -890,11 +801,11 @@ func handleBearerAuthInternal(api huma.API, ctx huma.Context, authService *AuthSreturn nil, false}-// resolveUserPermissionsInternal asks the RoleService for the user's resolved+// resolveUserPermissions asks the RoleService for the user's resolved// PermissionSet. If RoleService is unavailable or the lookup fails (boot-time// edge cases, broken DB) it returns nil and logs a warning — handlers then// see deny-all, which is the safe default.-func resolveUserPermissionsInternal(ctx context.Context, permResolver PermissionResolver, authenticatedUser *userdomain.User) *authz.PermissionSet {+func resolveUserPermissions(ctx context.Context, permResolver PermissionResolver, authenticatedUser *userdomain.User) *authz.PermissionSet {if permResolver == nil || authenticatedUser == nil {return nil}@@ -906,20 +817,8 @@ func resolveUserPermissionsInternal(ctx context.Context, permResolver Permissionreturn ps}-func resolveApiKeyPermissionsInternal(ctx context.Context, permResolver PermissionResolver, apiKeyID string) *authz.PermissionSet {- if permResolver == nil || apiKeyID == "" {- return nil- }- ps, err := permResolver.ResolveApiKeyPermissions(ctx, apiKeyID)- if err != nil {- slog.WarnContext(ctx, "failed to resolve api key permissions", "error", err, "apiKeyId", apiKeyID)- return nil- }- return ps-}--// extractBearerTokenInternal extracts the JWT token and reports whether it came from a cookie.-func extractBearerTokenInternal(ctx huma.Context) (string, bool) {+// extractBearerToken extracts the JWT token and reports whether it came from a cookie.+func extractBearerToken(ctx huma.Context) (string, bool) {// Try Authorization header firstauthHeader := ctx.Header("Authorization")if len(authHeader) > 7 && strings.ToLower(authHeader[:7]) == "bearer " {@@ -936,10 +835,10 @@ func extractBearerTokenInternal(ctx huma.Context) (string, bool) {return "", false}-// setUserInContextInternal adds the authenticated user and the resolved+// setUserInContext adds the authenticated user and the resolved// PermissionSet to the context. Callers must supply a non-nil PermissionSet;// pass authz.NewPermissionSet() to express deny-all.-func setUserInContextInternal(ctx context.Context, authenticatedUser *userdomain.User, ps *authz.PermissionSet) context.Context {+func setUserInContext(ctx context.Context, authenticatedUser *userdomain.User, ps *authz.PermissionSet) context.Context {if ps == nil {ps = authz.NewPermissionSet()}@@ -1029,7 +928,7 @@ func (m *AuthMiddleware) Add() echo.MiddlewareFunc {}func (m *AuthMiddleware) agentAuth(ctx context.Context, c *echo.Context, next echo.HandlerFunc) error {- if isPreflightInternal(c) {+ if c.Request().Method == http.MethodOptions {return next(c)}@@ -1037,18 +936,18 @@ func (m *AuthMiddleware) agentAuth(ctx context.Context, c *echo.Context, next ecif strings.HasPrefix(req.URL.Path, middleware.AgentPairingPrefix) &&AgentTokenMatches(req.Header.Get(middleware.HeaderAgentBootstrap), m.cfg.AgentToken) {slog.InfoContext(ctx, "Agent auth: bootstrap pairing accepted", "path", req.URL.Path, "method", req.Method)- agentSudoInternal(c)+ agentSudo(c)return next(c)}if AgentTokenMatches(req.Header.Get(middleware.HeaderAgentToken), m.cfg.AgentToken) {- agentSudoInternal(c)+ agentSudo(c)return next(c)}// Check for API key as agent tokenif AgentTokenMatches(req.Header.Get(middleware.HeaderApiKey), m.cfg.AgentToken) {- agentSudoInternal(c)+ agentSudo(c)return next(c)}@@ -1078,8 +977,8 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c *echo.Context, nextreq := c.Request()if agentToken := req.Header.Get(middleware.HeaderAgentToken); agentToken != "" {if env, ok := m.resolveEnvironmentAccessToken(ctx, agentToken).Get(); ok {- ps := environmentScopedInternal(c, env)- return m.authorizeAndContinueInternal(c, next, ps)+ ps := environmentScoped(c, env)+ return m.authorizeAndContinue(c, next, ps)}}@@ -1088,7 +987,10 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c *echo.Context, nextreturn m.apiKeyHeaderAuth(ctx, c, next, apiKey)}- token, fromCookie := extractBearerOrCookieTokenInternal(c)+ token, hasBearer := strings.CutPrefix(req.Header.Get("Authorization"), "Bearer ")+ if !hasBearer {+ token, _ = cookie.GetTokenCookie(req)+ }if token == "" {if m.options.SuccessOptional {return next(c)@@ -1099,14 +1001,8 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c *echo.Context, next})}- var authenticatedUser *userdomain.User- var sessionID string- var err error- if fromCookie {- authenticatedUser, sessionID, err = m.authService.VerifyBrowserToken(ctx, token)- } else {- authenticatedUser, sessionID, err = m.authService.VerifyToken(ctx, token)- }+ verify := kit.Ternary(hasBearer, m.authService.VerifyToken, m.authService.VerifyBrowserToken)+ authenticatedUser, sessionID, err := verify(ctx, token)if err != nil {// A version mismatch means the app self-updated; the session is still valid// (the refresh path tolerates the version change and rotates the token), so do@@ -1140,7 +1036,7 @@ func (m *AuthMiddleware) managerAuth(ctx context.Context, c *echo.Context, nextc.Set(string(middleware.ContextKeyCurrentUser), authenticatedUser)c.Set(string(middleware.ContextKeyCurrentSessionID), sessionID)c.Set(string(middleware.ContextKeyUserPermissions), ps)- return m.authorizeAndContinueInternal(c, next, ps)+ return m.authorizeAndContinue(c, next, ps)}// apiKeyHeaderAuth authenticates an X-API-Key credential: a user-owned API key@@ -1152,21 +1048,29 @@ func (m *AuthMiddleware) apiKeyHeaderAuth(ctx context.Context, c *echo.Context,// Personal keys inherit the owner's role permissions (same// resolution as session auth); scoped keys use their own grants.var ps *authz.PermissionSet- if key.Kind == apikey.ApiKeyKindPersonal {+ // Falling back to the owner's role permissions would defeat per-key+ // scoping, so scoped-key resolution failures are explicitly denied.+ switch {+ case key.Kind == apikey.ApiKeyKindPersonal:ps = m.resolvePermissionsOrDeny(ctx, authenticatedUser)- } else {- ps = m.resolveApiKeyPermissionsOrDeny(ctx, key.ID)+ case m.roleResolver == nil || key.ID == "":+ ps = authz.NewPermissionSet()+ default:+ if ps, err = m.roleResolver.ResolveApiKeyPermissions(ctx, key.ID); err != nil || ps == nil {+ slog.WarnContext(ctx, "failed to resolve api key permissions for Echo auth", "error", err)+ ps = authz.NewPermissionSet()+ }}c.Set(string(middleware.ContextKeyUserID), authenticatedUser.ID)c.Set(string(middleware.ContextKeyCurrentUser), authenticatedUser)c.Set(string(middleware.ContextKeyUserPermissions), ps)c.Set(string(middleware.ContextKeyAuthMethod), "api_key")- return m.authorizeAndContinueInternal(c, next, ps)+ return m.authorizeAndContinue(c, next, ps)}}if env, ok := m.resolveEnvironmentAccessToken(ctx, apiKey).Get(); ok {- ps := environmentScopedInternal(c, env)- return m.authorizeAndContinueInternal(c, next, ps)+ ps := environmentScoped(c, env)+ return m.authorizeAndContinue(c, next, ps)}return c.JSON(http.StatusUnauthorized, common.APIError{Code: common.APIErrorCodeUnauthorized,@@ -1174,7 +1078,7 @@ func (m *AuthMiddleware) apiKeyHeaderAuth(ctx context.Context, c *echo.Context,})}-func (m *AuthMiddleware) authorizeAndContinueInternal(c *echo.Context, next echo.HandlerFunc, ps *authz.PermissionSet) error {+func (m *AuthMiddleware) authorizeAndContinue(c *echo.Context, next echo.HandlerFunc, ps *authz.PermissionSet) error {if m.options.AdminRequired && !ps.IsGlobalAdmin() {return c.JSON(http.StatusForbidden, common.APIError{Code: "FORBIDDEN",@@ -1199,21 +1103,6 @@ func (m *AuthMiddleware) resolvePermissionsOrDeny(ctx context.Context, authenticreturn ps}-// resolveApiKeyPermissionsOrDeny returns the API key's per-key PermissionSet,-// or an empty (deny-all) set on failure. Falling back to the owner's role-// permissions would defeat per-key scoping, so failures are explicitly denied.-func (m *AuthMiddleware) resolveApiKeyPermissionsOrDeny(ctx context.Context, apiKeyID string) *authz.PermissionSet {- if m.roleResolver == nil || apiKeyID == "" {- return authz.NewPermissionSet()- }- ps, err := m.roleResolver.ResolveApiKeyPermissions(ctx, apiKeyID)- if err != nil || ps == nil {- slog.WarnContext(ctx, "failed to resolve api key permissions for Echo auth", "error", err)- return authz.NewPermissionSet()- }- return ps-}-func (m *AuthMiddleware) resolveEnvironmentAccessToken(ctx context.Context, token string) mo.Option[*environment.Environment] {if m.envTokenResolver == nil {return mo.None[*environment.Environment]()@@ -1227,27 +1116,16 @@ func (m *AuthMiddleware) resolveEnvironmentAccessToken(ctx context.Context, tokereturn mo.Some(env)}-func isPreflightInternal(c *echo.Context) bool {- return c.Request().Method == http.MethodOptions-}--func agentSudoInternal(c *echo.Context) {- agentUser := &userdomain.User{- ID: "agent",- Email: new("[email protected]"),- Username: "agent",- }+func agentSudo(c *echo.Context) {+ agentUser := createAgentSudoUser()c.Set(string(middleware.ContextKeyUserID), agentUser.ID)c.Set(string(middleware.ContextKeyCurrentUser), agentUser)c.Set(string(middleware.ContextKeyUserPermissions), authz.SudoPermissionSet())c.Set(string(middleware.ContextKeyAuthMethod), "agent_token")}-func environmentScopedInternal(c *echo.Context, env *environment.Environment) *authz.PermissionSet {- envUser := &userdomain.User{- ID: "environment:" + env.ID,- Username: env.Name,- }+func environmentScoped(c *echo.Context, env *environment.Environment) *authz.PermissionSet {+ envUser := createEnvironmentUser(env)c.Set(string(middleware.ContextKeyUserID), envUser.ID)c.Set(string(middleware.ContextKeyCurrentUser), envUser)ps := authz.EnvironmentPermissionSet(env.ID)@@ -1255,15 +1133,3 @@ func environmentScopedInternal(c *echo.Context, env *environment.Environment) *ac.Set(string(middleware.ContextKeyAuthMethod), "environment_access_token")return ps}--func extractBearerOrCookieTokenInternal(c *echo.Context) (string, bool) {- req := c.Request()- authHeader := req.Header.Get("Authorization")- if after, ok := strings.CutPrefix(authHeader, "Bearer "); ok {- return after, false- }- if tok, err := cookie.GetTokenCookie(req); err == nil && tok != "" {- return tok, true- }- return "", false-}diff --git a/backend/internal/auth/handler_test.go b/backend/internal/auth/handler_test.goindex 7e5ff96d5..fa4220a5c 100644--- a/backend/internal/auth/handler_test.go+++ b/backend/internal/auth/handler_test.go@@ -100,13 +100,13 @@ func TestNewHumaMiddleware_AcceptsEnvironmentAccessTokenViaAPIKey(t *testing.T)}func TestNewHumaMiddleware_UsesBearerWhenLoopbackProxySendsEnvironmentAccessToken(t *testing.T) {- db := setupAuthMiddlewareTestDBInternal(t)+ db := setupAuthMiddlewareTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)sessionSvc := session.NewSessionService(db)- signingKey := newTestSigningKeyInternal()+ signingKey := newTestSigningKey()authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, &config.Config{JWTRefreshExpiry: 24 * time.Hour}).WithSigningKey(signingKey)- bearerToken := mintHumaMiddlewareTestTokenInternal(t, userSvc, sessionSvc, signingKey, "u-loopback")+ bearerToken := mintHumaMiddlewareTestToken(t, userSvc, sessionSvc, signingKey, "u-loopback")ps := authz.NewPermissionSet()ps.AddEnv("0", authz.PermContainersStart)@@ -122,7 +122,7 @@ func TestNewHumaMiddleware_UsesBearerWhenLoopbackProxySendsEnvironmentAccessToke}api := humaecho.NewWithGroup(router, apiGroup, humaConfig)- api.UseMiddleware(NewHumaMiddleware(api, authSvc, nil, staticPermissionResolverInternal{ps: ps}, testEnvironmentAccessResolver{+ api.UseMiddleware(NewHumaMiddleware(api, authSvc, nil, staticPermissionResolver{ps: ps}, testEnvironmentAccessResolver{env: &environment.Environment{ID: "remote-env",Name: "Remote Env",@@ -255,7 +255,7 @@ func TestParseSecurityRequirements(t *testing.T) {for _, testCase := range testCases {t.Run(testCase.name, func(t *testing.T) {- require.Equal(t, testCase.expected, parseSecurityRequirementsInternal(api, testOperationProvider{+ require.Equal(t, testCase.expected, parseSecurityRequirements(api, testOperationProvider{operation: &huma.Operation{Security: testCase.security},}))})@@ -263,11 +263,11 @@ func TestParseSecurityRequirements(t *testing.T) {}func TestNewHumaMiddleware_OpportunisticAuthOnPublicRoute(t *testing.T) {- db := setupAuthMiddlewareTestDBInternal(t)+ db := setupAuthMiddlewareTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)sessionSvc := session.NewSessionService(db)- signingKey := newTestSigningKeyInternal()+ signingKey := newTestSigningKey()cfg := &config.Config{JWTRefreshExpiry: 24 * time.Hour}authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, cfg).WithSigningKey(signingKey)@@ -291,7 +291,7 @@ func TestNewHumaMiddleware_OpportunisticAuthOnPublicRoute(t *testing.T) {"username": "logouttest","roles": []string{"user"},}- token := signJWXTokenInternal(t, signingKey, claims)+ token := signJWXToken(t, signingKey, claims)router := echo.New()apiGroup := router.Group("/api")@@ -350,11 +350,11 @@ func TestNewHumaMiddleware_OpportunisticAuthOnPublicRoute(t *testing.T) {// middleware returns a refreshable 401 and must NOT clear the auth cookies — otherwise// the user is logged out on every update.func TestNewHumaMiddleware_VersionMismatchIsRecoverable(t *testing.T) {- db := setupAuthMiddlewareTestDBInternal(t)+ db := setupAuthMiddlewareTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)sessionSvc := session.NewSessionService(db)- signingKey := newTestSigningKeyInternal()+ signingKey := newTestSigningKey()browserSigningKey := bytes.Repeat([]byte{0x24}, browserSessionSigningKeySize)cfg := &config.Config{JWTRefreshExpiry: 24 * time.Hour}authSvc := NewAuthService(userSvc, nil, nil, sessionSvc, nil, cfg).WithSigningKey(signingKey)@@ -485,7 +485,7 @@ func (r testEnvironmentAccessResolver) ResolveEnvironmentByAccessToken(_ contextreturn nil, context.Canceled}-func setupAuthMiddlewareTestDBInternal(t *testing.T) *database.DB {+func setupAuthMiddlewareTestDB(t *testing.T) *database.DB {t.Helper()db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})require.NoError(t, err)@@ -493,7 +493,7 @@ func setupAuthMiddlewareTestDBInternal(t *testing.T) *database.DB {return &database.DB{DB: db}}-func mintHumaMiddlewareTestTokenInternal(t *testing.T, userSvc *user.UserService, sessionSvc *session.SessionService, signingKey *mldsa.PrivateKey, userID string) string {+func mintHumaMiddlewareTestToken(t *testing.T, userSvc *user.UserService, sessionSvc *session.SessionService, signingKey *mldsa.PrivateKey, userID string) string {t.Helper()_, err := userSvc.CreateUser(t.Context(), &user.User{@@ -515,18 +515,18 @@ func mintHumaMiddlewareTestTokenInternal(t *testing.T, userSvc *user.UserService"user_id": userID,"username": userID,}- return signJWXTokenInternal(t, signingKey, claims)+ return signJWXToken(t, signingKey, claims)}-type staticPermissionResolverInternal struct {+type staticPermissionResolver struct {ps *authz.PermissionSet}-func (r staticPermissionResolverInternal) ResolvePermissions(_ context.Context, _ string) (*authz.PermissionSet, error) {+func (r staticPermissionResolver) ResolvePermissions(_ context.Context, _ string) (*authz.PermissionSet, error) {return r.ps, nil}-func (r staticPermissionResolverInternal) ResolveApiKeyPermissions(_ context.Context, _ string) (*authz.PermissionSet, error) {+func (r staticPermissionResolver) ResolveApiKeyPermissions(_ context.Context, _ string) (*authz.PermissionSet, error) {return r.ps, nil}@@ -624,10 +624,10 @@ func TestAuthMiddleware_ManagerAuthResolvesPermissionsByKeyKind(t *testing.T) {t.Run("browser cookie uses owner role permissions", func(t *testing.T) {ctx := t.Context()- db := setupAuthMiddlewareTestDBInternal(t)+ db := setupAuthMiddlewareTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)sessionSvc := session.NewSessionService(db)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, ctx, db)require.NoError(t, err)authSvc := newTestAuthService()authSvc.userService = userSvc@@ -640,7 +640,7 @@ func TestAuthMiddleware_ManagerAuthResolvesPermissionsByKeyKind(t *testing.T) {expiresAt := time.Now().Add(time.Hour)browserSession, refreshJTI, err := sessionSvc.CreateSession(ctx, browserUser.ID, expiresAt, auth.SessionMeta{})require.NoError(t, err)- tokenPair, err := authSvc.buildTokenPairInternal(ctx, browserUser, browserSession, refreshJTI)+ tokenPair, err := authSvc.buildTokenPair(ctx, browserUser, browserSession, refreshJTI)require.NoError(t, err)router := echo.New()diff --git a/backend/internal/auth/helpers.go b/backend/internal/auth/helpers.goindex e329c5f16..76f308873 100644--- a/backend/internal/auth/helpers.go+++ b/backend/internal/auth/helpers.go@@ -58,7 +58,7 @@ var tokenParseOptions = []jwt.ParseOption{jwt.WithRequiredClaim(claimUserID),}-func parseAccessTokenInternal(ctx context.Context, rawToken string, key *mldsa.PublicKey) (*accessTokenClaims, error) {+func parseAccessToken(ctx context.Context, rawToken string, key *mldsa.PublicKey) (*accessTokenClaims, error) {token, err := jwt.ParseString(rawToken, append(tokenParseOptions, jwt.WithKey(jwa.MLDSA87(), key), jwt.WithContext(ctx))...)if err != nil {switch {@@ -88,7 +88,7 @@ func parseAccessTokenInternal(ctx context.Context, rawToken string, key *mldsa.Preturn new(accessTokenClaims{UserID: userID, SessionID: sessionID, Username: username, AppVersion: appVersion, ExpiresAt: expiresAt}), nil}-func parseBrowserTokenInternal(ctx context.Context, rawToken string, key []byte) (*accessTokenClaims, error) {+func parseBrowserToken(ctx context.Context, rawToken string, key []byte) (*accessTokenClaims, error) {token, err := jwt.ParseString(rawToken, append(tokenParseOptions, jwt.WithKey(jwa.HS512(), key), jwt.WithContext(ctx))...)if err != nil {switch {@@ -117,7 +117,7 @@ func parseBrowserTokenInternal(ctx context.Context, rawToken string, key []byte)return new(accessTokenClaims{UserID: userID, SessionID: sessionID, AppVersion: appVersion, ExpiresAt: expiresAt}), nil}-func signedTokenAlgorithmInternal(rawToken string) (string, bool) {+func signedTokenAlgorithm(rawToken string) (string, bool) {message, err := jws.Parse([]byte(rawToken), jws.WithCompact())if err != nil {return "", false@@ -133,7 +133,7 @@ func signedTokenAlgorithmInternal(rawToken string) (string, bool) {return algorithm.String(), true}-func parseRefreshTokenInternal(ctx context.Context, rawToken string, key *mldsa.PublicKey) (*refreshTokenClaims, error) {+func parseRefreshToken(ctx context.Context, rawToken string, key *mldsa.PublicKey) (*refreshTokenClaims, error) {token, err := jwt.ParseString(rawToken, append(tokenParseOptions, jwt.WithKey(jwa.MLDSA87(), key), jwt.WithContext(ctx))...)if err != nil {claimErr := errors.Is(err, jwt.MissingRequiredClaimError{}) || errors.Is(err, jwt.ClaimValidationError{})diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.goindex a8b4a2eb4..08a999bfd 100644--- a/backend/internal/auth/service.go+++ b/backend/internal/auth/service.go@@ -1,6 +1,7 @@package authimport (+ "cmp""context""crypto/mldsa""errors"@@ -48,13 +49,6 @@ type TokenPair struct {ExpiresAt time.Time `json:"expiresAt"`}-type AuthSettings struct {- LocalAuthEnabled bool `json:"localAuthEnabled"`- OidcEnabled bool `json:"oidcEnabled"`- SessionTimeout int `json:"sessionTimeout"`- Oidc *settings.OidcConfig `json:"oidc,omitempty"`-}-type verifiedTokenEntry struct {User user.UserSessionID string@@ -105,43 +99,6 @@ func NewAuthService(}}-func (s *AuthService) getAuthSettings(ctx context.Context) (*AuthSettings, error) {- appSettings, err := s.settingsService.GetSettings(ctx)- if err != nil {- return nil, fmt.Errorf("failed to get settings: %w", err)- }-- timeoutMinutes, _ := s.GetSessionTimeout(ctx)-- authSettings := &AuthSettings{- LocalAuthEnabled: appSettings.AuthLocalEnabled.IsTrue(),- OidcEnabled: appSettings.OidcEnabled.IsTrue(),- SessionTimeout: timeoutMinutes,- }-- if authSettings.OidcEnabled {- oidcConfig := &settings.OidcConfig{- ClientID: appSettings.OidcClientId.Value,- ClientSecret: appSettings.OidcClientSecret.Value,- IssuerURL: appSettings.OidcIssuerUrl.Value,- AuthorizationEndpoint: appSettings.OidcAuthorizationEndpoint.Value,- TokenEndpoint: appSettings.OidcTokenEndpoint.Value,- UserinfoEndpoint: appSettings.OidcUserinfoEndpoint.Value,- JwksURI: appSettings.OidcJwksEndpoint.Value,- DeviceAuthorizationEndpoint: appSettings.OidcDeviceAuthorizationEndpoint.Value,- Scopes: appSettings.OidcScopes.Value,- GroupsClaim: appSettings.OidcGroupsClaim.Value,- SkipTlsVerify: appSettings.OidcSkipTlsVerify.IsTrue(),- }-- if oidcConfig.ClientID != "" || oidcConfig.IssuerURL != "" {- authSettings.Oidc = oidcConfig- }- }-- return authSettings, nil-}-func (s *AuthService) GetOidcConfigurationStatus(ctx context.Context) (*auth.OidcStatusInfo, error) {oidcEnvForced := s.settingsService != nil && s.settingsService.IsEnvOverrideActive("oidcEnabled")@@ -217,16 +174,27 @@ func (s *AuthService) IsOidcEnabled(ctx context.Context) (bool, error) {}func (s *AuthService) GetOidcConfig(ctx context.Context) (*settings.OidcConfig, error) {- authSettings, err := s.getAuthSettings(ctx)+ appSettings, err := s.settingsService.GetSettings(ctx)if err != nil {- return nil, err+ return nil, fmt.Errorf("failed to get settings: %w", err)}-- if !authSettings.OidcEnabled || authSettings.Oidc == nil {+ if !appSettings.OidcEnabled.IsTrue() || (appSettings.OidcClientId.Value == "" && appSettings.OidcIssuerUrl.Value == "") {return nil, ErrOidcAuthDisabled}- return authSettings.Oidc, nil+ return &settings.OidcConfig{+ ClientID: appSettings.OidcClientId.Value,+ ClientSecret: appSettings.OidcClientSecret.Value,+ IssuerURL: appSettings.OidcIssuerUrl.Value,+ AuthorizationEndpoint: appSettings.OidcAuthorizationEndpoint.Value,+ TokenEndpoint: appSettings.OidcTokenEndpoint.Value,+ UserinfoEndpoint: appSettings.OidcUserinfoEndpoint.Value,+ JwksURI: appSettings.OidcJwksEndpoint.Value,+ DeviceAuthorizationEndpoint: appSettings.OidcDeviceAuthorizationEndpoint.Value,+ Scopes: appSettings.OidcScopes.Value,+ GroupsClaim: appSettings.OidcGroupsClaim.Value,+ SkipTlsVerify: appSettings.OidcSkipTlsVerify.IsTrue(),+ }, nil}// AuthenticateLocalPrimary validates the local primary factor without@@ -313,7 +281,14 @@ func (s *AuthService) CompleteLogin(ctx context.Context, localUser *user.User, mmeta.MFAVerifiedAt = &now}- tokenPair, err := s.createSessionAndTokensInternal(ctx, localUser, meta)+ if s.sessionService == nil {+ return nil, common.Classify(common.ErrUnavailable, errors.New("Session service is not configured")) //nolint:staticcheck // Preserve the existing error message.+ }+ localSession, refreshJTI, err := s.sessionService.CreateSession(ctx, localUser.ID, time.Now().Add(s.refreshExpiry), meta)+ if err != nil {+ return nil, err+ }+ tokenPair, err := s.buildTokenPair(ctx, localUser, localSession, refreshJTI)if err != nil {return nil, err}@@ -395,15 +370,41 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo auth.Oi}if localUser != nil {- return s.updateExistingOidcUser(ctx, localUser, userInfo, tokenResp)- }-- mergedUser, merged, err := s.tryMergeOidcUser(ctx, userInfo, tokenResp)- if err != nil {- return nil, false, err- }- if merged {- return mergedUser, false, nil+ updated, updateErr := s.updateOidcUser(ctx, localUser, userInfo, tokenResp)+ return updated, false, updateErr+ }++ if userInfo.Email != "" {+ if localSettings, settingsErr := s.settingsService.GetSettings(ctx); settingsErr == nil && localSettings.OidcMergeAccounts.IsTrue() {+ existingUser, emailErr := s.userService.GetUserByEmail(ctx, userInfo.Email)+ switch {+ case emailErr != nil && !errors.Is(emailErr, common.ErrUserNotFound):+ return nil, false, emailErr+ case existingUser == nil:+ case !userInfo.EmailVerified:+ // Only a provider-verified email may claim an existing account.+ return nil, false, errors.New("email not verified by OIDC provider; cannot merge accounts")+ default:+ slog.InfoContext(ctx, "Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)+ // Perform the merge atomically to avoid races when multiple OIDC subjects share the same email+ merged, mergeErr := s.userService.AttachOidcSubjectTransactional(ctx, existingUser.ID, userInfo.Subject, func(u *user.User) {+ if userInfo.Name != "" && u.DisplayName == nil {+ u.DisplayName = new(userInfo.Name)+ }+ s.persistOidcTokens(u, tokenResp)+ u.LastLogin = new(time.Now())+ })+ if mergeErr != nil {+ return nil, false, mergeErr+ }+ if merged != nil {+ if syncErr := s.syncOidcRoleAssignments(ctx, merged, userInfo, tokenResp); syncErr != nil {+ slog.WarnContext(ctx, "failed to sync OIDC role assignments on user merge", "error", syncErr, "userId", merged.ID)+ }+ }+ return existingUser, false, nil+ }+ }}created, err := s.createOidcUser(ctx, userInfo, tokenResp)@@ -412,67 +413,16 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo auth.Oi// account between our lookup and the insert; resolve to it// instead of failing the login.if existing, lookupErr := s.userService.GetUserByOidcSubjectId(ctx, userInfo.Subject); lookupErr == nil {- return s.updateExistingOidcUser(ctx, existing, userInfo, tokenResp)+ updated, updateErr := s.updateOidcUser(ctx, existing, userInfo, tokenResp)+ return updated, false, updateErr}return nil, false, err}return created, true, nil}-func (s *AuthService) updateExistingOidcUser(ctx context.Context, localUser *user.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*user.User, bool, error) {- if err := s.updateOidcUser(ctx, localUser, userInfo, tokenResp); err != nil {- return nil, false, err- }- return localUser, false, nil-}--func (s *AuthService) tryMergeOidcUser(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*user.User, bool, error) {- if userInfo.Email == "" || !s.isOidcMergeEnabled(ctx) {- return nil, false, nil- }-- existingUser, emailErr := s.userService.GetUserByEmail(ctx, userInfo.Email)- if emailErr != nil {- return nil, false, kit.Ternary(errors.Is(emailErr, common.ErrUserNotFound), nil, emailErr)- }- if existingUser == nil {- return nil, false, nil- }-- if err := s.validateMergeEmailVerification(ctx, userInfo); err != nil {- return nil, false, err- }-- slog.InfoContext(ctx, "Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)- if mergeErr := s.mergeOidcWithExistingUser(ctx, existingUser, userInfo, tokenResp); mergeErr != nil {- return nil, false, mergeErr- }- return existingUser, true, nil-}--func (s *AuthService) isOidcMergeEnabled(ctx context.Context) bool {- localSettings, settingsErr := s.settingsService.GetSettings(ctx)- return settingsErr == nil && localSettings.OidcMergeAccounts.IsTrue()-}--func (s *AuthService) validateMergeEmailVerification(ctx context.Context, userInfo auth.OidcUserInfo) error {- emailVerifiedPresent := false- if userInfo.Extra != nil {- if _, ok := userInfo.Extra["email_verified"]; ok {- emailVerifiedPresent = true- }- }- if emailVerifiedPresent && !userInfo.EmailVerified {- return errors.New("email not verified by OIDC provider; cannot merge accounts")- }- if !emailVerifiedPresent {- slog.WarnContext(ctx, "OIDC email_verified claim missing; allowing merge", "email", userInfo.Email, "subject", userInfo.Subject)- }- return nil-}-func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*user.User, error) {- username, err := s.resolveOidcUsernameInternal(ctx, userInfo)+ username, err := s.resolveOidcUsername(ctx, userInfo)if err != nil {return nil, err}@@ -504,7 +454,7 @@ func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUservar createErr errorfor attempt := range 3 {if attempt > 0 {- if localUser.Username, err = s.resolveOidcUsernameInternal(ctx, userInfo); err != nil {+ if localUser.Username, err = s.resolveOidcUsername(ctx, userInfo); err != nil {return nil, err}}@@ -521,10 +471,10 @@ func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUserreturn localUser, nil}-// resolveOidcUsernameInternal returns the preferred username for a new OIDC+// resolveOidcUsername returns the preferred username for a new OIDC// user, or a currently unclaimed collision-free candidate when an existing// account already owns it.-func (s *AuthService) resolveOidcUsernameInternal(ctx context.Context, userInfo auth.OidcUserInfo) (string, error) {+func (s *AuthService) resolveOidcUsername(ctx context.Context, userInfo auth.OidcUserInfo) (string, error) {var username stringif userInfo.PreferredUsername == "" {username = generateUsernameFromEmail(userInfo.Email, userInfo.Subject)@@ -541,7 +491,7 @@ func (s *AuthService) resolveOidcUsernameInternal(ctx context.Context, userInforeturn "", lookupErr}- base := uniqueOidcUsernameInternal(username, userInfo.Subject)+ base := uniqueOidcUsername(username, userInfo.Subject)unique := basefor i := 2; ; i++ {_, candidateErr := s.userService.GetUserByUsername(ctx, unique)@@ -557,7 +507,7 @@ func (s *AuthService) resolveOidcUsernameInternal(ctx context.Context, userInfo}}-func (s *AuthService) updateOidcUser(ctx context.Context, localUser *user.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) error {+func (s *AuthService) updateOidcUser(ctx context.Context, localUser *user.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*user.User, error) {if userInfo.Name != "" && localUser.DisplayName == nil {localUser.DisplayName = new(userInfo.Name)}@@ -569,32 +519,12 @@ func (s *AuthService) updateOidcUser(ctx context.Context, localUser *user.User,localUser.LastLogin = new(time.Now())if _, err := s.userService.UpdateUser(ctx, localUser, nil); err != nil {- return err+ return nil, err}if err := s.syncOidcRoleAssignments(ctx, localUser, userInfo, tokenResp); err != nil {slog.WarnContext(ctx, "failed to sync OIDC role assignments on user update", "error", err, "userId", localUser.ID)}- return nil-}--func (s *AuthService) mergeOidcWithExistingUser(ctx context.Context, localUser *user.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) error {- // Perform the merge atomically to avoid races when multiple OIDC subjects share the same email- merged, err := s.userService.AttachOidcSubjectTransactional(ctx, localUser.ID, userInfo.Subject, func(u *user.User) {- if userInfo.Name != "" && u.DisplayName == nil {- u.DisplayName = new(userInfo.Name)- }- s.persistOidcTokens(u, tokenResp)- u.LastLogin = new(time.Now())- })- if err != nil {- return err- }- if merged != nil {- if syncErr := s.syncOidcRoleAssignments(ctx, merged, userInfo, tokenResp); syncErr != nil {- slog.WarnContext(ctx, "failed to sync OIDC role assignments on user merge", "error", syncErr, "userId", merged.ID)- }- }- return nil+ return localUser, nil}// syncOidcRoleAssignments rebuilds the user's `source='oidc'` role assignments@@ -644,20 +574,21 @@ func (s *AuthService) syncOidcRoleAssignments(ctx context.Context, localUser *us// to "groups"). Falls back to userInfo.Groups if no value is found at the// configured path.func (s *AuthService) extractOidcGroups(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) []string {- claim := s.oidcGroupsClaim(ctx)+ claim := "groups"+ if localSettings, err := s.settingsService.GetSettings(ctx); err == nil {+ claim = cmp.Or(strings.TrimSpace(localSettings.OidcGroupsClaim.Value), "groups")+ }- if claim != "" {- if v, ok := jwtclaims.GetByPath(userInfo.Extra, claim).Get(); ok {- if groups := jwtclaims.GetStringSliceClaim(map[string]any{"groups": v}, "groups"); len(groups) > 0 {- return groups- }+ if v, ok := jwtclaims.GetByPath(userInfo.Extra, claim).Get(); ok {+ if groups := jwtclaims.GetStringSliceClaim(map[string]any{"groups": v}, "groups"); 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 := jwtclaims.GetStringSliceClaim(map[string]any{"groups": v}, "groups"); 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 := jwtclaims.GetStringSliceClaim(map[string]any{"groups": v}, "groups"); len(groups) > 0 {+ return groups}}}@@ -666,15 +597,6 @@ func (s *AuthService) extractOidcGroups(ctx context.Context, userInfo auth.OidcUreturn userInfo.Groups}-func (s *AuthService) oidcGroupsClaim(ctx context.Context) string {- localSettings, err := s.settingsService.GetSettings(ctx)- if err != nil {- return "groups"- }- v := strings.TrimSpace(localSettings.OidcGroupsClaim.Value)- return kit.Ternary(v == "", "groups", v)-}-func (s *AuthService) persistOidcTokens(localUser *user.User, tokenResp *auth.OidcTokenResponse) {if tokenResp == nil {return@@ -695,7 +617,7 @@ func (s *AuthService) WithSigningKey(key *mldsa.PrivateKey) *AuthService {return s}-func (s *AuthService) signingKeyInternal(ctx context.Context) (*mldsa.PrivateKey, error) {+func (s *AuthService) loadSigningKey(ctx context.Context) (*mldsa.PrivateKey, error) {s.signingKeyMu.Lock()defer s.signingKeyMu.Unlock()if s.signingKey != nil {@@ -712,7 +634,7 @@ func (s *AuthService) signingKeyInternal(ctx context.Context) (*mldsa.PrivateKeyreturn key, nil}-func (s *AuthService) browserSigningKeyInternal(ctx context.Context) ([]byte, error) {+func (s *AuthService) loadBrowserSigningKey(ctx context.Context) ([]byte, error) {s.signingKeyMu.Lock()defer s.signingKeyMu.Unlock()if len(s.browserSigningKey) == browserSessionSigningKeySize {@@ -733,11 +655,11 @@ func (s *AuthService) browserSigningKeyInternal(ctx context.Context) ([]byte, er}func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, meta auth.SessionMeta) (*TokenPair, error) {- signingKey, err := s.signingKeyInternal(ctx)+ signingKey, err := s.loadSigningKey(ctx)if err != nil {return nil, err}- claims, err := parseRefreshTokenInternal(ctx, refreshToken, signingKey.PublicKey())+ claims, err := parseRefreshToken(ctx, refreshToken, signingKey.PublicKey())if err != nil {return nil, err}@@ -771,45 +693,45 @@ func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string, metreturn nil, err}- return s.buildTokenPairInternal(ctx, localUser, rotatedSession, refreshJTI)+ return s.buildTokenPair(ctx, localUser, rotatedSession, refreshJTI)}func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*user.User, string, error) {tokenHash := kit.SHA256Hex(accessToken)- if localUser, sessionID, ok := s.cachedVerificationInternal(tokenHash); ok {+ if localUser, sessionID, ok := s.cachedVerification(tokenHash); ok {return localUser, sessionID, nil}- signingKey, err := s.signingKeyInternal(ctx)+ signingKey, err := s.loadSigningKey(ctx)if err != nil {return nil, "", err}- claims, err := parseAccessTokenInternal(ctx, accessToken, signingKey.PublicKey())+ claims, err := parseAccessToken(ctx, accessToken, signingKey.PublicKey())if err != nil {return nil, "", err}- return s.verifyTokenClaimsInternal(ctx, tokenHash, claims)+ return s.verifyTokenClaims(ctx, tokenHash, claims)}func (s *AuthService) VerifyBrowserToken(ctx context.Context, browserToken string) (*user.User, string, error) {tokenHash := "browser:" + kit.SHA256Hex(browserToken)- if localUser, sessionID, ok := s.cachedVerificationInternal(tokenHash); ok {+ if localUser, sessionID, ok := s.cachedVerification(tokenHash); ok {return localUser, sessionID, nil}- algorithm, ok := signedTokenAlgorithmInternal(browserToken)+ algorithm, ok := signedTokenAlgorithm(browserToken)if !ok {return nil, "", common.ErrInvalidToken}switch algorithm {case jwa.HS512().String():- key, err := s.browserSigningKeyInternal(ctx)+ key, err := s.loadBrowserSigningKey(ctx)if err != nil {return nil, "", err}- claims, err := parseBrowserTokenInternal(ctx, browserToken, key)+ claims, err := parseBrowserToken(ctx, browserToken, key)if err != nil {return nil, "", err}- return s.verifyTokenClaimsInternal(ctx, tokenHash, claims)+ return s.verifyTokenClaims(ctx, tokenHash, claims)case jwa.MLDSA87().String():return s.VerifyToken(ctx, browserToken)default:@@ -817,7 +739,7 @@ func (s *AuthService) VerifyBrowserToken(ctx context.Context, browserToken strin}}-func (s *AuthService) cachedVerificationInternal(tokenHash string) (*user.User, string, bool) {+func (s *AuthService) cachedVerification(tokenHash string) (*user.User, string, bool) {cached, ok, _ := s.tokenCache.Get(tokenHash)if !ok {return nil, "", false@@ -830,7 +752,7 @@ func (s *AuthService) cachedVerificationInternal(tokenHash string) (*user.User,return new(cached.User), cached.SessionID, true}-func (s *AuthService) verifyTokenClaimsInternal(ctx context.Context, tokenHash string, claims *accessTokenClaims) (*user.User, string, error) {+func (s *AuthService) verifyTokenClaims(ctx context.Context, tokenHash string, claims *accessTokenClaims) (*user.User, string, error) {gen := s.cacheGen.Load()if claims.AppVersion != "" && claims.AppVersion != config.Version {slog.InfoContext(ctx, "Token version mismatch detected", "tokenVersion", claims.AppVersion, "currentVersion", config.Version, "user", claims.Username)@@ -884,7 +806,7 @@ func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPasswor}}- policy := s.passwordPolicyInternal(ctx)+ policy := s.passwordPolicy(ctx)if validatePasswordPolicyErr := validation.ValidatePasswordPolicy(newPassword, policy); validatePasswordPolicyErr != nil {return common.Classify(common.ErrValidation, validatePasswordPolicyErr)}@@ -897,7 +819,7 @@ func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPassworreturn nil}-func (s *AuthService) passwordPolicyInternal(ctx context.Context) string {+func (s *AuthService) passwordPolicy(ctx context.Context) string {if s.settingsService == nil {return validation.PasswordPolicyStrong}@@ -911,10 +833,10 @@ func (s *AuthService) InvalidateUserTokenCache(userID string) {if s.tokenCache == nil || strings.TrimSpace(userID) == "" {return}- s.invalidateTokenCacheInternal(func(entry verifiedTokenEntry) bool { return entry.User.ID == userID })+ s.invalidateTokenCache(func(entry verifiedTokenEntry) bool { return entry.User.ID == userID })}-func (s *AuthService) invalidateTokenCacheInternal(matches func(verifiedTokenEntry) bool) {+func (s *AuthService) invalidateTokenCache(matches func(verifiedTokenEntry) bool) {s.cacheFillMu.Lock()defer s.cacheFillMu.Unlock()s.cacheGen.Add(1)@@ -935,7 +857,7 @@ func (s *AuthService) RevokeSession(ctx context.Context, sessionID string) errorif err := s.sessionService.RevokeSession(ctx, sessionID); err != nil {return err}- s.invalidateTokenCacheInternal(func(entry verifiedTokenEntry) bool { return entry.SessionID == sessionID })+ s.invalidateTokenCache(func(entry verifiedTokenEntry) bool { return entry.SessionID == sessionID })return nil}@@ -948,30 +870,18 @@ func (s *AuthService) LogoutAllOtherSessions(ctx context.Context, userID, currenif err := s.sessionService.RevokeAllUserSessionsExcept(ctx, userID, currentSessionID); err != nil {return err}- s.invalidateTokenCacheInternal(func(entry verifiedTokenEntry) bool {+ s.invalidateTokenCache(func(entry verifiedTokenEntry) bool {return entry.User.ID == userID && entry.SessionID != currentSessionID})return nil}-func (s *AuthService) createSessionAndTokensInternal(ctx context.Context, localUser *user.User, meta auth.SessionMeta) (*TokenPair, error) {- if s.sessionService == nil {- return nil, common.Classify(common.ErrUnavailable, errors.New("Session service is not configured")) //nolint:staticcheck // Preserve the existing error message.- }- refreshExpiry := time.Now().Add(s.refreshExpiry)- localSession, refreshJTI, err := s.sessionService.CreateSession(ctx, localUser.ID, refreshExpiry, meta)- if err != nil {- return nil, err- }- return s.buildTokenPairInternal(ctx, localUser, localSession, refreshJTI)-}--func (s *AuthService) buildTokenPairInternal(ctx context.Context, localUser *user.User, localSession *session.UserSession, refreshJTI string) (*TokenPair, error) {+func (s *AuthService) buildTokenPair(ctx context.Context, localUser *user.User, localSession *session.UserSession, refreshJTI string) (*TokenPair, error) {sessionTimeout, _ := s.GetSessionTimeout(ctx)now := time.Now()accessTokenExpiry := now.Add(time.Duration(sessionTimeout) * time.Minute)- signingKey, err := s.signingKeyInternal(ctx)+ signingKey, err := s.loadSigningKey(ctx)if err != nil {return nil, err}@@ -1023,7 +933,7 @@ func (s *AuthService) buildTokenPairInternal(ctx context.Context, localUser *usereturn nil, err}- browserSigningKey, err := s.browserSigningKeyInternal(ctx)+ browserSigningKey, err := s.loadBrowserSigningKey(ctx)if err != nil {return nil, err}@@ -1071,7 +981,7 @@ func (s *AuthService) IssueFederatedToken(ctx context.Context, localUser *user.Ureturn nil, err}- signingKey, err := s.signingKeyInternal(ctx)+ signingKey, err := s.loadSigningKey(ctx)if err != nil {return nil, err}@@ -1125,10 +1035,10 @@ func generateUsernameFromEmail(email, subject string) string {return "user_" + subject}-// uniqueOidcUsernameInternal derives a collision-free username candidate by+// uniqueOidcUsername derives a collision-free username candidate by// suffixing the tail of the OIDC subject, mirroring generateUsernameFromEmail's// fallback format.-func uniqueOidcUsernameInternal(base, subject string) string {+func uniqueOidcUsername(base, subject string) string {suffix := subjectif len(suffix) > 8 {suffix = suffix[len(suffix)-8:]diff --git a/backend/internal/auth/service_buildables_test.go b/backend/internal/auth/service_buildables_test.goindex 2e9ec7321..f9f722e34 100644--- a/backend/internal/auth/service_buildables_test.go+++ b/backend/internal/auth/service_buildables_test.go@@ -25,7 +25,7 @@ func TestGetAutoLoginConfig_Enabled(t *testing.T) {ctx := t.Context()db := setupAuthServiceTestDB(t)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, ctx, db)require.NoError(t, err)require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))require.NoError(t, settingsSvc.SetBoolSetting(ctx, "authLocalEnabled", true))@@ -51,7 +51,7 @@ func TestGetAutoLoginConfig_DisabledWhenLocalAuthDisabled(t *testing.T) {ctx := t.Context()db := setupAuthServiceTestDB(t)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, ctx, db)require.NoError(t, err)require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))require.NoError(t, settingsSvc.SetBoolSetting(ctx, "authLocalEnabled", false))diff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.goindex 47b1ef4aa..ab361675a 100644--- a/backend/internal/auth/service_test.go+++ b/backend/internal/auth/service_test.go@@ -52,7 +52,7 @@ func setupAuthServiceTestDB(t *testing.T) *database.DB {return &database.DB{DB: db}}-func newSettingsServiceForAuthTestInternal(t testing.TB, ctx context.Context, db *database.DB) (*settings.SettingsService, error) {+func newSettingsServiceForAuthTest(t testing.TB, ctx context.Context, db *database.DB) (*settings.SettingsService, error) {t.Helper()svc, err := settings.NewSettingsService(ctx, db)if err == nil {@@ -61,7 +61,7 @@ func newSettingsServiceForAuthTestInternal(t testing.TB, ctx context.Context, dbreturn svc, err}-func newTestSigningKeyInternal() *mldsa.PrivateKey {+func newTestSigningKey() *mldsa.PrivateKey {key, err := mldsa.GenerateKey(mldsa.MLDSA87())if err != nil {panic(err)@@ -71,7 +71,7 @@ func newTestSigningKeyInternal() *mldsa.PrivateKey {func newTestAuthService() *AuthService {return &AuthService{- signingKey: newTestSigningKeyInternal(),+ signingKey: newTestSigningKey(),browserSigningKey: bytes.Repeat([]byte{0x42}, browserSessionSigningKeySize),refreshExpiry: 24 * time.Hour,config: &config.Config{},@@ -82,7 +82,7 @@ func newTestAuthService() *AuthService {}}-func signLegacyTokenInternal(t testing.TB, key *mldsa.PrivateKey, claims map[string]any) string {+func signLegacyToken(t testing.TB, key *mldsa.PrivateKey, claims map[string]any) string {t.Helper()header, err := json.Marshal(map[string]string{"alg": jwa.MLDSA87().String(), "typ": "JWT"})require.NoError(t, err)@@ -94,7 +94,7 @@ func signLegacyTokenInternal(t testing.TB, key *mldsa.PrivateKey, claims map[strreturn signingInput + "." + base64.RawURLEncoding.EncodeToString(signature)}-func signJWXTokenInternal(t testing.TB, key *mldsa.PrivateKey, claims map[string]any) string {+func signJWXToken(t testing.TB, key *mldsa.PrivateKey, claims map[string]any) string {t.Helper()payload, err := json.Marshal(claims)require.NoError(t, err)@@ -105,7 +105,7 @@ func signJWXTokenInternal(t testing.TB, key *mldsa.PrivateKey, claims map[stringreturn string(signed)}-func signUnsignedTokenInternal(t testing.TB, claims map[string]any) string {+func signUnsignedToken(t testing.TB, claims map[string]any) string {t.Helper()payload, err := json.Marshal(claims)require.NoError(t, err)@@ -134,10 +134,10 @@ func makeAccessToken(t *testing.T, key *mldsa.PrivateKey, subject, id, username"display_name": displayName,"app_version": config.Version,}- return signLegacyTokenInternal(t, key, claims)+ return signLegacyToken(t, key, claims)}-func makeRefreshTokenInternal(t *testing.T, key *mldsa.PrivateKey, id string, exp time.Time, userIDAndSessionID ...string) string {+func makeRefreshToken(t *testing.T, key *mldsa.PrivateKey, id string, exp time.Time, userIDAndSessionID ...string) string {t.Helper()userID := idsessionID := ""@@ -156,7 +156,7 @@ func makeRefreshTokenInternal(t *testing.T, key *mldsa.PrivateKey, id string, ex"sid": sessionID,"app_version": config.Version,}- return signLegacyTokenInternal(t, key, claims)+ return signLegacyToken(t, key, claims)}func createTestSession(t *testing.T, db *database.DB, userID string, expiresAt time.Time) (*session.UserSession, string) {@@ -170,11 +170,6 @@ func createTestSession(t *testing.T, db *database.DB, userID string, expiresAt treturn localSession, refreshJTI}-func makeUnsignedToken(t *testing.T, claims map[string]any) string {- t.Helper()- return signUnsignedTokenInternal(t, claims)-}-func TestVerifyToken_ValidClaims(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)@@ -274,7 +269,7 @@ func TestVerifyToken_InvalidSubject(t *testing.T) {func TestVerifyToken_InvalidSignature(t *testing.T) {s := newTestAuthService()exp := time.Now().Add(5 * time.Minute)- otherKey := newTestSigningKeyInternal()+ otherKey := newTestSigningKey()token := makeAccessToken(t, otherKey, "access", "u1", "bob", []string{"user"}, "", "", exp)@@ -310,13 +305,13 @@ func TestGenerateUsernameFromEmail(t *testing.T) {"short subject username %q", u3)}-func TestUniqueOidcUsernameInternal(t *testing.T) {- u := uniqueOidcUsernameInternal("alice", "1234567890abcdef")+func TestUniqueOidcUsername(t *testing.T) {+ u := uniqueOidcUsername("alice", "1234567890abcdef")assert.Equal(t, "alice_90abcdef", u,"suffixed username %q", u)- u2 := uniqueOidcUsernameInternal("alice", "short")+ u2 := uniqueOidcUsername("alice", "short")assert.Equal(t, "alice_short", u2,"short subject username %q", u2)@@ -371,7 +366,7 @@ func TestVerifyToken_VersionMismatch(t *testing.T) {func TestRefreshToken_Valid(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s := newTestAuthService()s.userService = userSvc@@ -387,7 +382,7 @@ func TestRefreshToken_Valid(t *testing.T) {exp := time.Now().Add(5 * time.Minute)localSession, refreshJTI := createTestSession(t, db, "u-refresh", exp)- token := makeRefreshTokenInternal(t, s.signingKey, refreshJTI, exp, "u-refresh", localSession.ID)+ token := makeRefreshToken(t, s.signingKey, refreshJTI, exp, "u-refresh", localSession.ID)tokenPair, err := s.RefreshToken(t.Context(), token, auth.SessionMeta{})require.NoError(t, err)@@ -397,13 +392,13 @@ func TestRefreshToken_Valid(t *testing.T) {require.NotEmpty(t, tokenPair.RefreshToken)require.Less(t, len(tokenPair.BrowserToken), 1024)- accessAlgorithm, ok := signedTokenAlgorithmInternal(tokenPair.AccessToken)+ accessAlgorithm, ok := signedTokenAlgorithm(tokenPair.AccessToken)require.True(t, ok)require.Equal(t, jwa.MLDSA87().String(), accessAlgorithm)- browserAlgorithm, ok := signedTokenAlgorithmInternal(tokenPair.BrowserToken)+ browserAlgorithm, ok := signedTokenAlgorithm(tokenPair.BrowserToken)require.True(t, ok)require.Equal(t, jwa.HS512().String(), browserAlgorithm)- refreshAlgorithm, ok := signedTokenAlgorithmInternal(tokenPair.RefreshToken)+ refreshAlgorithm, ok := signedTokenAlgorithm(tokenPair.RefreshToken)require.True(t, ok)require.Equal(t, jwa.MLDSA87().String(), refreshAlgorithm)}@@ -414,7 +409,7 @@ func TestRefreshToken_Valid(t *testing.T) {func TestRefreshToken_VersionMismatchRotates(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s := newTestAuthService()s.userService = userSvc@@ -434,7 +429,7 @@ func TestRefreshToken_VersionMismatchRotates(t *testing.T) {oldVersion := config.Versiont.Cleanup(func() { config.Version = oldVersion })config.Version = "1.0.0"- token := makeRefreshTokenInternal(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)+ token := makeRefreshToken(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)config.Version = "2.0.0"tokenPair, err := s.RefreshToken(t.Context(), token, auth.SessionMeta{})@@ -579,7 +574,7 @@ func TestVerifyToken_RejectsRevokedCachedSession(t *testing.T) {func TestRefreshToken_RotatesJTI(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s := newTestAuthService()s.userService = userSvc@@ -595,7 +590,7 @@ func TestRefreshToken_RotatesJTI(t *testing.T) {exp := time.Now().Add(5 * time.Minute)localSession, refreshJTI := createTestSession(t, db, localUser.ID, exp)- token := makeRefreshTokenInternal(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)+ token := makeRefreshToken(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)tokenPair, err := s.RefreshToken(t.Context(), token, auth.SessionMeta{})require.NoError(t, err)@@ -608,7 +603,7 @@ func TestRefreshToken_RotatesJTI(t *testing.T) {func TestRefreshToken_RejectsRevokedSession(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s := newTestAuthService()s.userService = userSvc@@ -625,7 +620,7 @@ func TestRefreshToken_RejectsRevokedSession(t *testing.T) {exp := time.Now().Add(5 * time.Minute)localSession, refreshJTI := createTestSession(t, db, localUser.ID, exp)require.NoError(t, s.RevokeSession(t.Context(), localSession.ID))- token := makeRefreshTokenInternal(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)+ token := makeRefreshToken(t, s.signingKey, refreshJTI, exp, localUser.ID, localSession.ID)_, err = s.RefreshToken(t.Context(), token, auth.SessionMeta{})require.ErrorIs(t, err, common.ErrSessionRevoked)@@ -694,7 +689,7 @@ func TestChangePassword_KeepsCurrentSessionAlive(t *testing.T) {func TestRefreshToken_RejectsNonHMACAlg(t *testing.T) {s := newTestAuthService()exp := time.Now().Add(5 * time.Minute)- token := makeUnsignedToken(t, map[string]any{+ token := signUnsignedToken(t, map[string]any{"jti": "u1","sub": "refresh","iat": time.Now().Unix(),@@ -712,7 +707,7 @@ func TestGetOidcConfigurationStatus(t *testing.T) {// Disableds := newTestAuthService()s.config = &config.Config{}- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s.settingsService = settingsSvc@@ -731,7 +726,7 @@ func TestGetOidcConfigurationStatus(t *testing.T) {// Explicit env override to false should still be treated as forcedt.Setenv("OIDC_ENABLED", "false")- settingsSvc, err = newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err = newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s.settingsService = settingsSvcs.config.OidcEnabled = false@@ -745,7 +740,7 @@ func TestGetOidcConfigurationStatus(t *testing.T) {// Enabled but missing fieldst.Setenv("OIDC_ENABLED", "true")- settingsSvc, err = newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err = newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s.settingsService = settingsSvcs.config.OidcEnabled = true@@ -773,7 +768,7 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_NoExistingUser_Creatctx := t.Context()db := setupAuthServiceTestDB(t)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, ctx, db)require.NoError(t, err)require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))@@ -823,96 +818,86 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_NoExistingUser_Creatrequire.NotEqual(t, created.Username, other.Username)}-func TestFindOrCreateOidcUser_MergeEnabled_EmailNotVerified_WithExistingUser_ReturnsError(t *testing.T) {- ctx := t.Context()- db := setupAuthServiceTestDB(t)-- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)- require.NoError(t, err)- require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))- require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))-- userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- // Seed an existing local user with matching email- email := "[email protected]"- existing := &user.User{- ID: "u1",- Username: "existing",- Email: &email,- }- _, err = userSvc.CreateUser(ctx, existing)- require.NoError(t, err)-- authSvc := newTestAuthService()- authSvc.userService = userSvc- authSvc.settingsService = settingsSvc-- userInfo := auth.OidcUserInfo{- Subject: "sub-merge",- Email: email,- EmailVerified: false,- Extra: map[string]any{- "email_verified": false,- },- }-- _, _, err = authSvc.findOrCreateOidcUser(ctx, userInfo, &auth.OidcTokenResponse{AccessToken: "at"})- require.Error(t, err)-- // Ensure existing user is not linked- fetched, err := userSvc.GetUserByID(ctx, existing.ID)- require.NoError(t, err)- require.True(t, fetched.OidcSubjectId == nil || *fetched.OidcSubjectId == "")-}--func TestFindOrCreateOidcUser_MergeEnabled_EmailVerificationMissing_WithExistingUser_Merges(t *testing.T) {- ctx := t.Context()- db := setupAuthServiceTestDB(t)-- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, ctx, db)- require.NoError(t, err)- require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))- require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))-- userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- // Seed an existing local user with matching email- email := "[email protected]"- existing := &user.User{- ID: "u1",- Username: "existing",- Email: &email,+func TestFindOrCreateOidcUser_MergeEnabled_WithExistingUser(t *testing.T) {+ tests := []struct {+ name string+ emailVerified bool+ extra map[string]any+ wantMerge bool+ }{+ {name: "verified email merges", emailVerified: true, extra: map[string]any{"email_verified": true}, wantMerge: true},+ {name: "explicit false rejected", extra: map[string]any{"email_verified": false}},+ {name: "missing claim with nil extra rejected"},+ {name: "missing claim with empty extra rejected", extra: map[string]any{}},}- _, err = userSvc.CreateUser(ctx, existing)- require.NoError(t, err)+ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ ctx := t.Context()+ db := setupAuthServiceTestDB(t)++ settingsSvc, err := newSettingsServiceForAuthTest(t, ctx, db)+ require.NoError(t, err)+ require.NoError(t, settingsSvc.EnsureDefaultSettings(ctx))+ require.NoError(t, settingsSvc.SetBoolSetting(ctx, "oidcMergeAccounts", true))++ userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)+ email := "[email protected]"+ existing := &user.User{ID: "u1", Username: "existing", Email: &email}+ _, err = userSvc.CreateUser(ctx, existing)+ require.NoError(t, err)++ authSvc := newTestAuthService()+ authSvc.userService = userSvc+ authSvc.settingsService = settingsSvc++ userInfo := auth.OidcUserInfo{+ Subject: "sub-merge",+ Email: email,+ Name: "OIDC Name",+ EmailVerified: tc.emailVerified,+ Extra: tc.extra,+ }- authSvc := newTestAuthService()- authSvc.userService = userSvc- authSvc.settingsService = settingsSvc+ got, isNew, err := authSvc.findOrCreateOidcUser(ctx, userInfo, &auth.OidcTokenResponse{AccessToken: "at", RefreshToken: "rt", ExpiresIn: 60})+ fetched, fetchErr := userSvc.GetUserByID(ctx, existing.ID)+ require.NoError(t, fetchErr)++ if tc.wantMerge {+ require.NoError(t, err)+ require.False(t, isNew)+ require.Equal(t, existing.ID, got.ID)+ require.NotNil(t, fetched.OidcSubjectId)+ require.Equal(t, userInfo.Subject, *fetched.OidcSubjectId)+ require.NotNil(t, fetched.OidcAccessToken)+ require.Equal(t, "at", *fetched.OidcAccessToken)+ return+ }- userInfo := auth.OidcUserInfo{- Subject: "sub-merge-missing-verified",- Email: email,- EmailVerified: false,- Extra: map[string]any{},+ require.EqualError(t, err, "email not verified by OIDC provider; cannot merge accounts")+ require.Nil(t, got)+ require.False(t, isNew)++ var userCount int64+ require.NoError(t, db.Model(&user.User{}).Count(&userCount).Error)+ require.Equal(t, int64(1), userCount, "no separate account should be created")+ var roleAssignments int64+ require.NoError(t, db.Model(&role.UserRoleAssignment{}).Where("user_id = ?", existing.ID).Count(&roleAssignments).Error)+ require.Zero(t, roleAssignments)++ require.True(t, fetched.OidcSubjectId == nil || *fetched.OidcSubjectId == "")+ require.Nil(t, fetched.OidcAccessToken)+ require.Nil(t, fetched.OidcRefreshToken)+ require.Nil(t, fetched.OidcAccessTokenExpiresAt)+ require.Nil(t, fetched.DisplayName)+ require.Nil(t, fetched.LastLogin)+ })}-- mergedUser, isNew, err := authSvc.findOrCreateOidcUser(ctx, userInfo, &auth.OidcTokenResponse{AccessToken: "at"})- require.NoError(t, err)- require.False(t, isNew)- require.NotNil(t, mergedUser)- require.Equal(t, existing.ID, mergedUser.ID)-- // Ensure existing user is linked- fetched, err := userSvc.GetUserByID(ctx, existing.ID)- require.NoError(t, err)- require.NotNil(t, fetched.OidcSubjectId)- require.Equal(t, userInfo.Subject, *fetched.OidcSubjectId)}func TestAuthenticateLocalPrimary_EmailFallback(t *testing.T) {db := setupAuthServiceTestDB(t)userSvc := user.NewUserService(db, nil, session.RevokeAllUserSessionsExceptInDB)- settingsSvc, err := newSettingsServiceForAuthTestInternal(t, t.Context(), db)+ settingsSvc, err := newSettingsServiceForAuthTest(t, t.Context(), db)require.NoError(t, err)s := newTestAuthService()s.userService = userSvcdiff --git a/backend/internal/oidc/service.go b/backend/internal/oidc/service.goindex aa32f7ac9..f35c87700 100644--- a/backend/internal/oidc/service.go+++ b/backend/internal/oidc/service.go@@ -461,6 +461,10 @@ func (s *OidcService) buildUserInfo(case claims == nil:userInfoErr = errors.New("userinfo endpoint not configured")}+ if userInfoErr == nil && idToken != nil && userInfoClaims != nil && kit.As(userInfoClaims["sub"], "") != idToken.Subject {+ slog.WarnContext(ctx, "HandleCallback: discarding userinfo claims for a different subject", "subject", idToken.Subject)+ userInfoErr = errors.New("userinfo subject does not match ID token subject")+ }if userInfoErr != nil {slog.DebugContext(ctx, "HandleCallback: userinfo request failed", "error", userInfoErr)if claims == nil {@@ -471,6 +475,12 @@ func (s *OidcService) buildUserInfo(}if merged := maps.Clone(userInfoClaims); merged != nil {maps.Copy(merged, claims)+ // email_verified must come from the same source as the selected email.+ _, idTokenHasEmail := claims["email"]+ delete(merged, "email_verified")+ if verified, ok := kit.Ternary(idTokenHasEmail, claims, userInfoClaims)["email_verified"]; ok {+ merged["email_verified"] = verified+ }claims = merged}@@ -484,7 +494,7 @@ func (s *OidcService) buildUserInfo(Subject: subject,Name: jwtclaims.GetStringClaim(claims, "name"),Email: jwtclaims.GetStringClaim(claims, "email"),- EmailVerified: jwtclaims.GetBoolClaim(claims, "email_verified"),+ EmailVerified: kit.As(claims["email_verified"], false),PreferredUsername: jwtclaims.GetStringClaim(claims, "preferred_username"),GivenName: jwtclaims.GetStringClaim(claims, "given_name"),FamilyName: jwtclaims.GetStringClaim(claims, "family_name"),diff --git a/cli/go.mod b/cli/go.modindex 6bff932d6..599011449 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -31,14 +31,22 @@ require (go.getarcane.app/docker v0.1.0go.getarcane.app/kit v0.4.0go.yaml.in/yaml/v4 v4.0.0-rc.6+ google.golang.org/protobuf v1.36.12)require (+ cloud.google.com/go/compute/metadata v0.10.0 // indirect+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1 // indirect+ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1 // indirectgithub.com/Azure/go-ansiterm v0.0.0-20261006220739-8c912ac31dd4 // indirect+ github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0 // indirectgithub.com/DmitriyVTitov/size v1.5.0 // indirectgithub.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 // indirectgithub.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirectgithub.com/atotto/clipboard v0.1.4 // indirect+ github.com/aws/aws-sdk-go-v2 v1.47.2 // indirect+ github.com/aws/aws-sdk-go-v2/config v1.33.8 // indirect+ github.com/aws/aws-sdk-go-v2/credentials v1.20.8 // indirectgithub.com/beorn7/perks v1.0.1 // indirectgithub.com/blang/semver v3.5.1+incompatible // indirectgithub.com/cenkalti/backoff/v5 v5.0.3 // indirect@@ -53,12 +61,16 @@ require (github.com/compose-spec/compose-go/v2 v2.16.1 // indirectgithub.com/containerd/errdefs v1.0.0 // indirectgithub.com/containerd/errdefs/pkg v0.3.0 // indirect+ github.com/coreos/go-oidc/v3 v3.21.0 // indirectgithub.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect+ github.com/danieljoos/wincred v1.2.3 // indirectgithub.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirectgithub.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirectgithub.com/distribution/reference v0.6.0 // indirectgithub.com/docker/go-connections v0.8.2 // indirectgithub.com/felixge/httpsnoop v1.1.0 // indirect+ github.com/go-chi/chi/v5 v5.3.1 // indirect+ github.com/go-jose/go-jose/v4 v4.1.5 // indirectgithub.com/go-logfmt/logfmt v0.6.1 // indirectgithub.com/go-logr/logr v1.4.4 // indirectgithub.com/go-logr/stdr v1.2.2 // indirect@@ -85,15 +97,18 @@ require (github.com/go-openapi/swag/yamlutils v0.28.0 // indirectgithub.com/go-openapi/validate v0.26.1 // indirectgithub.com/go-viper/mapstructure/v2 v2.5.0 // indirect+ github.com/godbus/dbus/v5 v5.2.2 // indirectgithub.com/google/certificate-transparency-go v1.3.3 // indirect- github.com/google/go-containerregistry v0.21.7 // indirect+ github.com/google/go-containerregistry v0.22.1 // indirectgithub.com/google/uuid v1.6.0 // indirectgithub.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirectgithub.com/in-toto/attestation v1.2.0 // indirectgithub.com/in-toto/in-toto-golang v0.11.0 // indirectgithub.com/inconshreveable/mousetrap v1.1.0 // indirect+ github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirectgithub.com/lucasb-eyer/go-colorful v1.4.1 // indirectgithub.com/mattn/go-shellwords v1.0.16 // indirect+ github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirectgithub.com/moby/docker-image-spec v1.3.1 // indirectgithub.com/moby/moby/api v1.56.1 // indirectgithub.com/moby/moby/client v0.6.2 // indirect@@ -127,23 +142,25 @@ require (github.com/xhit/go-str2duration/v2 v2.1.0 // indirectgithub.com/xo/terminfo v1.0.0 // indirectgithub.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect+ github.com/zalando/go-keyring v0.2.6 // indirectgo.opentelemetry.io/auto/sdk v1.2.1 // indirectgo.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 // indirectgo.opentelemetry.io/otel v1.46.0 // indirectgo.opentelemetry.io/otel/metric v1.46.0 // indirectgo.opentelemetry.io/otel/trace v1.46.0 // indirectgo.yaml.in/yaml/v3 v3.0.5 // indirect- golang.org/x/crypto v0.56.0 // indirect+ golang.org/x/crypto v0.57.0 // indirectgolang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirectgolang.org/x/mod v0.41.0 // indirect- golang.org/x/net v0.58.0 // indirect+ golang.org/x/net v0.60.0 // indirect+ golang.org/x/oauth2 v0.37.0 // indirectgolang.org/x/sync v0.23.0 // indirectgolang.org/x/sys v0.48.0 // indirect- golang.org/x/term v0.45.0 // indirect+ golang.org/x/term v0.46.0 // indirectgolang.org/x/text v0.42.0 // indirect- google.golang.org/genproto/googleapis/api v0.0.0-20260904194346-d0f1323225a4 // indirect- google.golang.org/genproto/googleapis/rpc v0.0.0-20260904194346-d0f1323225a4 // indirect- google.golang.org/grpc v1.83.2 // indirect- google.golang.org/protobuf v1.36.12 // indirect+ golang.org/x/time v0.16.0 // indirect+ google.golang.org/genproto/googleapis/api v0.0.0-20260908043556-f8649ddbbfe6 // indirect+ google.golang.org/genproto/googleapis/rpc v0.0.0-20260908043556-f8649ddbbfe6 // indirect+ google.golang.org/grpc v1.84.0 // indirectk8s.io/klog/v2 v2.140.0 // indirect)diff --git a/cli/go.sum b/cli/go.sumindex aac228032..e0519640b 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -1,3 +1,5 @@+al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=+al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=charm.land/bubbles/v2 v2.2.1 h1:Fq1+qm5hV6GkvzLQDhCBpXXE5tLgvh1PRriCLwSvIQU=charm.land/bubbles/v2 v2.2.1/go.mod h1:wdMgn+sje1KNXdwFizIWjbf328fIUBxqEmJ/vYPo8yc=charm.land/bubbletea/v2 v2.1.0 h1:A9fj9h5LFrvQhQHFNggp8K8rvY6CUfgn9dMbb6p2HIw=@@ -14,8 +16,8 @@ cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=+cloud.google.com/go/compute/metadata v0.10.0 h1:pyKMUQSwchgkIBBJGdILqQbs/BNJXqwSA7Ej6LAvvtY=+cloud.google.com/go/compute/metadata v0.10.0/go.mod h1:rGFHRrIif570kSibjFTMbt6/4/tzgJWFGI/HVol4GIk=cloud.google.com/go/iam v1.11.0 h1:KieQ9Pb+LLPak1O3Rv3GgCxhnmkYf7Xyh0P5HfF1jFM=cloud.google.com/go/iam v1.11.0/go.mod h1:KP+nKGugNJW4LcLx1uEZcq1ok5sQHFaQehQNl4QDgV4=cloud.google.com/go/kms v1.31.0 h1:LS8N92OxFDgOLg5NCo3OmbvjtQAIVT5gUHVLKIDHaFE=@@ -28,10 +30,10 @@ filippo.io/mldsa v0.0.0-20260215214346-43d0283efc3e h1:VsUbObBMxXlc23Eb9VeeJYE4jfilippo.io/mldsa v0.0.0-20260215214346-43d0283efc3e/go.mod h1:32qQ5yj3R24Eu03iWFWchdC3OB653wPvoepWejkefbY=github.com/AdamKorcz/go-fuzz-headers-1 v0.0.0-20230919221257-8b5d3ce2d11d h1:zjqpY4C7H15HjRPEenkS4SAn3Jy2eRRjkjZbGR30TOg=github.com/AdamKorcz/go-fuzz-headers-1 v0.0.0-20230919221257-8b5d3ce2d11d/go.mod h1:XNqJ7hv2kY++g8XEHREpi+JqZo3+0l+CH2egBVN4yqM=-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1 h1:jHb/wfvRikGdxMXYV3QG/SzUOPYN9KEUUuC0Yd0/vC0=-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1/go.mod h1:pzBXCYn05zvYIrwLgtK8Ap8QcjRg+0i76tMQdWN6wOk=-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1 h1:zvXfGJCWvywnCA814d8ZiVyt+fm9nnTE8xSb99zRyfo=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1/go.mod h1:iptorS+VYKFL2N6PnebpS91dubG35eAOEERnT4PJbQU=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1 h1:u93s+zU2JD62im61Bm5CZIc1ZrOJaIAWEg0WOrMVkEo=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1/go.mod h1:oXtinPO4OLj9d1DOTrqrL1oRwGhcqadvAmrl6wTeGlk=github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 h1:fhqpLE3UEXi9lPaBRpQ6XuRW0nU7hgg4zlmZZa+a9q4=github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0/go.mod h1:7dCRMLwisfRH3dBupKeNCioWYUZ4SS09Z14H+7i8ZoY=github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.5.0 h1:MaKvxE6D0KkjOg6Wd9M00iqP5PR0kUxCfiezes4JweM=@@ -40,48 +42,46 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 h1:nCYfggithub.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0/go.mod h1:ucUjca2JtSZboY8IoUqyQyuuXvwbMBVwFOm0vdQPNhA=github.com/Azure/go-ansiterm v0.0.0-20261006220739-8c912ac31dd4 h1:m2xcjRABtG288vnlV3U/PKh/HnPURxZp50RKNUwBxM8=github.com/Azure/go-ansiterm v0.0.0-20261006220739-8c912ac31dd4/go.mod h1:MTUE7ZuZO89FAtAwozGg6AWD83pcdefnEq5gF82MB8s=-github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0 h1:4iB+IesclUXdP0ICgAabvq2FYLXrJWKx1fJQ+GxSo3Y=-github.com/AzureAD/microsoft-authentication-library-for-go v1.7.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=+github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0 h1:MDT4FxAPve5FnYn6vOL1r7RCRDG+l9cI7a5LlCuHsqA=+github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0/go.mod h1:Y33QHnf0FfdVewFFISOGe20mkZbxX4H839o955/PoeI=github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0=github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 h1:0kQAzHq8vLs7Pptv+7TxjdETLf/nIqJpIB4oC6Ba4vY=github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0=-github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=-github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=-github.com/aws/aws-sdk-go-v2 v1.41.9 h1:/rYeyO2+HrMztAmxAq9++XJtFMqSIpSsNA0yDGALYq4=-github.com/aws/aws-sdk-go-v2 v1.41.9/go.mod h1:+HsoOEX80qAVUitj1A2DhCNTjmb3edVyuDypb6LNEeo=-github.com/aws/aws-sdk-go-v2/config v1.32.20 h1:8VMDnWc/kEzxsI/1ngGM9mG81a8IGmIHD8KLcYGwagc=-github.com/aws/aws-sdk-go-v2/config v1.32.20/go.mod h1:PuwEpciweIXGULWeOeSTXtSbH4CW9mWdWrhdCKQI1sM=-github.com/aws/aws-sdk-go-v2/credentials v1.19.19 h1:yuFzSV1U0aRNYCQGVaTY2zW2M/L93pYHnXnrJUphYhU=-github.com/aws/aws-sdk-go-v2/credentials v1.19.19/go.mod h1:7y63L1kGzeoDlJaQ3Z578KrnmfBut96JjvJUzGwR+YE=-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25 h1:0w6dCiO8iez+YKwRhRBlL1CH/E3GTfdkuzrwj1by8vo=-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25/go.mod h1:9FDWUothyr5RCRAHc45XOiVCzUR8n/IhCYX+uVqw6vk=-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25 h1:Uii3frf9ztec/ABM2/FSH9/z7PLzxfpG8h4RpkUFflQ=-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25/go.mod h1:G6kntsA2GorAxDPbap6xgB2F+amSLUF8GJTi7PUoX44=-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25 h1:r1+/l6m+WaUJF9HISEsNOLHSNj5EXYQxK8VX6Cz9NlA=-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25/go.mod h1:cKf+D+NMDK1LndD7BowHbBZPgR9V0/5HubH0PFWvA+c=-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 h1:A1PmWU2zfkIm9EyFlJncFXL4W4phML+h8KjltUsCvNQ=-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26/go.mod h1:dY4MRzXEizrD4hqtpKvWVGPX7QleSGGVY+EBolo1RmM=-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg=-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig=-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25 h1:dD3dhHNglpd98gs72my22Ndqi1hqQGllFFg1F+twfxg=-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25/go.mod h1:0yAbjPfd64gG7mj85RW+fMEYdfBgCRZw8g/oWcL1pjc=+github.com/aws/aws-sdk-go-v2 v1.47.2 h1:4vrR4S7MUdvPiv/fxlYI/FaZCgwKuir2LpXxwCUtwWY=+github.com/aws/aws-sdk-go-v2 v1.47.2/go.mod h1:LYKdgB/k1/omdrfoQuyt6T10CvF1yw27ByBjd+ku1jk=+github.com/aws/aws-sdk-go-v2/config v1.33.8 h1:I9S23gMufs97T0CE0ZUzvdl/i2TDnxOJzgxw18d1RBo=+github.com/aws/aws-sdk-go-v2/config v1.33.8/go.mod h1:/WlDmOxSaE2dhWUmEcFF3QnckmOPH49GxsQI0CzRAtg=+github.com/aws/aws-sdk-go-v2/credentials v1.20.8 h1:ibO101be+3jJOMBCJphBXzXm9UzIq+zxr8plM2V3FHw=+github.com/aws/aws-sdk-go-v2/credentials v1.20.8/go.mod h1:gAFU+h+59h6frPO/KUG7sgcToVf1ti8i/VMImKiFpcM=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.2 h1:b4FhKL3xhR6BVxUTU+h1K8gK2XYhb+pU/sRiwJwLuCs=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.2/go.mod h1:FprVEOVKR2fKunYpdjOCpt1/n76MnL72PcTKylXlYRs=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.5 h1:JwchTNw8oqkFWMYrmFmdoS4sYgE6JJcnO+ElvME+uH4=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.5/go.mod h1:8pc+vcibD0We5t3f/LqHxjBPkXXfgcjYQN3upxqz/Nw=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.5 h1:CNgkOhhgJ1anuboBDmjRLCpVlBKFV9cEvT16d4QNl/w=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.5/go.mod h1:SS3HIANtO8edxa4QkX+8SvbMxRm+k78QoE6EIRI81tU=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.5 h1:rkxirozlOuMs3QuaGsDV3ll5suBdeeH6iSLFPyA5zNk=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.5/go.mod h1:OQjoYoCdNx6tLyZNEuD0HRfHQVStBIfQyigewExdEVU=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.20 h1:XBYeuBbMY5LRAKOdZgzUQO1BVj3B07uYAROSapq/IWg=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.20/go.mod h1:XL6ZfC3ePnooN2u2LT4RNhpr/xs5TiboydyUbgr8Dmg=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.5 h1:Q2MWL+9cTKHHiXWcsPobHiOD+wx8tTc8sWZaFvFSk9Q=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.5/go.mod h1:U8tTityyPbgc90QwGOha8XsrQpLIjpGUS7+Q+4prM+Q=github.com/aws/aws-sdk-go-v2/service/kms v1.52.0 h1:QNtg+Mtj1zmepk568+UKBD5DFfqh+ESTUUqQT27JkQc=github.com/aws/aws-sdk-go-v2/service/kms v1.52.0/go.mod h1:Y0+uxvxz6ib4KktRdK0V4X45Vcs/JyYoz8H71pO8xeI=-github.com/aws/aws-sdk-go-v2/service/signin v1.1.1 h1:1VwbP3qMNfxUDEXWki4rCE5iA+44VA1lokTz9HasGzw=-github.com/aws/aws-sdk-go-v2/service/signin v1.1.1/go.mod h1:vUtyoSj0OPji3kjIVSc/GlKuWEiL33f/WFxl6dmpy/A=-github.com/aws/aws-sdk-go-v2/service/sso v1.30.19 h1:N6pIsdFOW1Kd9S4KyFKXdGRBojPPxkP32+uHFWLv4Hc=-github.com/aws/aws-sdk-go-v2/service/sso v1.30.19/go.mod h1:3gt5WJArFooNmyLONS+h/R4J+o86II8du38IgCwj9dE=-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2 h1:hc+lBYiiTr8Zk4MTzIsQ92MeDWCIDvWGmzKUWOaBcOg=-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2/go.mod h1:hU6fqB3OJA6/ePheD47LQnxvjYk6br6PtQxs+Q9ojvk=-github.com/aws/aws-sdk-go-v2/service/sts v1.42.3 h1:ErklX/7uhSbkAAeyQD/Y1OoQ9hO3SJXQNEgksORW3Js=-github.com/aws/aws-sdk-go-v2/service/sts v1.42.3/go.mod h1:ULe4HCzfKPiR6R3HEurE3b1upEkuk8AkMrOKtaOxKO8=-github.com/aws/smithy-go v1.26.0 h1:9ouqbi+NyKP7fV3Te7UElCwdAb6Y8uk7LGwPE5tVe/s=-github.com/aws/smithy-go v1.26.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=+github.com/aws/aws-sdk-go-v2/service/signin v1.10.3 h1:lRyGlN6mXianMWMQdvTFCnJE5DkmD54N9PC3m+U/GgA=+github.com/aws/aws-sdk-go-v2/service/signin v1.10.3/go.mod h1:9Y78vT13MZ36q2uxrSKqHJnk/6n9sbSgGp3ZOZS1s4w=+github.com/aws/aws-sdk-go-v2/service/sso v1.38.3 h1:NYlE1/vPhIhdPTLUnmvz/PSXS3klsToqQY6KVtsynhs=+github.com/aws/aws-sdk-go-v2/service/sso v1.38.3/go.mod h1:nVwtZaAwWFpiXGfNE0GPxbpjhWNVGJbJEZDOfrDCEm4=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.3 h1:Glo50xPemPwHaioR66Rl5BTEq62Ohet0dyxzt6L0H1M=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.3/go.mod h1:LaCSuxpt5Z2a8oThoMtWWB71u2MOmylEqHaQdp3J4aw=+github.com/aws/aws-sdk-go-v2/service/sts v1.51.3 h1:L5w+LXVzMaacz3iotdx2fWtU/O+TIrplsK2JVMNbXeA=+github.com/aws/aws-sdk-go-v2/service/sts v1.51.3/go.mod h1:8E586vK6OTj+qVzsTygGzw1GlZnOgNjul8toJEdtX5s=+github.com/aws/smithy-go v1.28.4 h1:vzBmFpcRUtotqGPfmnro2W2Pgg3mk103n9sZhNJY9YU=+github.com/aws/smithy-go v1.28.4/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=@@ -124,15 +124,15 @@ github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYGgithub.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=-github.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc=-github.com/coreos/go-oidc/v3 v3.17.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=+github.com/coreos/go-oidc/v3 v3.21.0 h1:wZo4Q9Pum8dYEj0eMUPrqR+kvuGkeUplbLpNCkBqoWM=+github.com/coreos/go-oidc/v3 v3.21.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4=github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=-github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=-github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=+github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=+github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=github.com/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49/go.mod h1:SKVExuS+vpu2l9IoOc0RwqE7NYnb0JlcFHFnEJkVDzc=github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 h1:ge14PCmCvPjpMQMIAH7uKg0lrtNSOdpYsRXlwk3QbaE=github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352/go.mod h1:SKVExuS+vpu2l9IoOc0RwqE7NYnb0JlcFHFnEJkVDzc=@@ -146,10 +146,10 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc=github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE=-github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM=-github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=-github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=-github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=+github.com/go-chi/chi/v5 v5.3.1 h1:3j4HZLGZQ3JpMCrPJF/Jl3mYJfWLKBfNJ6quurUGCf8=+github.com/go-chi/chi/v5 v5.3.1/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=+github.com/go-jose/go-jose/v4 v4.1.5 h1:RjgjO2LOtWOJKUC5wpwY9LR3B3vwVAz6JS2YHfYU6eA=+github.com/go-jose/go-jose/v4 v4.1.5/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=@@ -211,8 +211,8 @@ github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=+github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=+github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=github.com/gofrs/flock v0.13.1 h1:jjREztyBeSKBZYAC+mgc1laB+xsgy4kYMf3FbKF2UBo=github.com/gofrs/flock v0.13.1/go.mod h1:sf4BFiHwnvgxa25DlQoDqXQnwRMEOwqxRq37P6MzzmE=github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=@@ -226,8 +226,8 @@ github.com/google/certificate-transparency-go v1.3.3 h1:hq/rSxztSkXN2tx/3jQqF6Xcgithub.com/google/certificate-transparency-go v1.3.3/go.mod h1:iR17ZgSaXRzSa5qvjFl8TnVD5h8ky2JMVio+dzoKMgA=github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=-github.com/google/go-containerregistry v0.21.7 h1:/vPFuVXDjtFREsVArW+0h1CIl5urnOhzei4X2DMW9IU=-github.com/google/go-containerregistry v0.21.7/go.mod h1:kjSbt7/zMsKLWfnHrIvKvhXHUw91jbe9DNjPPJ32gXE=+github.com/google/go-containerregistry v0.22.1 h1:RZuuSYhTvlDvtsK+NkutoCZ//C0X2ebLK8X8l3ULs84=+github.com/google/go-containerregistry v0.22.1/go.mod h1:bJR35SK8XgisYmhg/FMQ/5RK0S/XrOAqLBV5/LR2XE0=github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=github.com/google/trillian v1.7.3 h1:hziW+vo4czis48tzx2GK5xRBl/ZxBA9B0/UR5avXOro=@@ -270,8 +270,8 @@ github.com/in-toto/in-toto-golang v0.11.0 h1:nfidMYBFx+E0lnmX5KUnN2Pdm8zdNKal1aygithub.com/in-toto/in-toto-golang v0.11.0/go.mod h1:u3PjTnwFKjp5a1YCcw8SJg0G+tMeKfVoWsWeFMDCMtw=github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=-github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b h1:ZGiXF8sz7PDk6RgkP+A/SFfUD0ZR/AgG6SpRNEDKZy8=-github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b/go.mod h1:hQmNrgofl+IY/8L+n20H6E6PWBBTokdsv+q49j0QhsU=+github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=+github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E=github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP4mnWdTY=github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=@@ -286,8 +286,8 @@ github.com/mattn/go-shellwords v1.0.16 h1:RRxAaRzU1YbzOSCj9NJqg2/VIbSWv0dnPoD3Ewgithub.com/mattn/go-shellwords v1.0.16/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=+github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=+github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=github.com/moby/moby/api v1.56.1 h1:PpWkvVPB7Fr/No8w+TfyJ/I6rWZ2YPZhT3JorIg+06c=@@ -405,8 +405,8 @@ github.com/xo/terminfo v1.0.0 h1:2ZpYzqWzyyytjk3TP6aJVDhkMAkc99/1xKQdA3TDTBY=github.com/xo/terminfo v1.0.0/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=-github.com/zalando/go-keyring v0.2.3 h1:v9CUu9phlABObO4LPWycf+zwMG7nlbb3t/B5wa97yms=-github.com/zalando/go-keyring v0.2.3/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=+github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=+github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=go.getarcane.app/acfs v0.6.2 h1:5cO8uWPz16lg+aP/iQe+k5IIDTToccCqoakwoDfUOOE=go.getarcane.app/acfs v0.6.2/go.mod h1:Z+0Gs4LGNjvGMLq+TKv/oGKh29FRbAH6mcVPwY5KhFI=go.getarcane.app/builds v0.4.4 h1:r9e97gmG2vic6kZB1UfTp9vSpqb1nPYA6CBlbaCvH64=@@ -446,38 +446,38 @@ go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4=go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=-golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y=-golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2I=+golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=+golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba h1:Ck8QetSgk912qxWLMCKxd0in+aiyBQyDSMae6e/xmpU=golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba/go.mod h1:50RgIsmK7OwqzTTeqcSXQW8SswW0o8fRcDxmqGluJ8E=golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=-golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=-golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=+golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=+golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=+golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=+golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=-golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=-golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=+golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=+golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=-golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=-golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=google.golang.org/api v0.283.0 h1:0lkp8u0MPwJVHqRL+nJlMAoZVVzbmiXmFHXMOTmSPik=google.golang.org/api v0.283.0/go.mod h1:6Wssta4c5n9qHq5CBhmlai5h/PUa1djdDAIhYEHyvcM=google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=-google.golang.org/genproto/googleapis/api v0.0.0-20260904194346-d0f1323225a4 h1:NCe/UiklGd/9xjT+ROBVhJ1kf6TRQaFedsR+z7u1gvo=-google.golang.org/genproto/googleapis/api v0.0.0-20260904194346-d0f1323225a4/go.mod h1:fJ2lYaWjqNknJyQBOCd0fA3HnEElJqGplH71a2txi+g=-google.golang.org/genproto/googleapis/rpc v0.0.0-20260904194346-d0f1323225a4 h1:5t+ZydAFj5kGVLrgCvLmpmCf9ylGRd64hpEronfRaws=-google.golang.org/genproto/googleapis/rpc v0.0.0-20260904194346-d0f1323225a4/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA=-google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=-google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8=+google.golang.org/genproto/googleapis/api v0.0.0-20260908043556-f8649ddbbfe6 h1:O4Tjo2vlGeGM3+tNgwJrGj5fQHO2V71gDkFqbm328C8=+google.golang.org/genproto/googleapis/api v0.0.0-20260908043556-f8649ddbbfe6/go.mod h1:r4KD2hOq82JBWpTWkJ9NZLf6EwmRvAPIFmk7hPNtd+0=+google.golang.org/genproto/googleapis/rpc v0.0.0-20260908043556-f8649ddbbfe6 h1:ieEbjQ6lzbvntOXUB9nMx9uH+yIU/HbgkNDjnk/mJuk=+google.golang.org/genproto/googleapis/rpc v0.0.0-20260908043556-f8649ddbbfe6/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA=+google.golang.org/grpc v1.84.0 h1:soMyaPJ8pAak5PIQ0DGBUir0XRo2fRoMqhNWMLlLxO0=+google.golang.org/grpc v1.84.0/go.mod h1:ljCht0DrxQrXBDRTZp52Qxh3Ffk8CdYm2sj4O2QN2C0=google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=diff --git a/go.work.sum b/go.work.sumindex 42a3e73e2..4ddaf04d4 100644--- a/go.work.sum+++ b/go.work.sum@@ -133,7 +133,6 @@ cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hcloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=cloud.google.com/go/compute/metadata v0.9.1 h1:CTE1OWBQ0vnF5uHwdFAQJvMQ0Fi/KRcqqKTo9V0F8Ik=cloud.google.com/go/compute/metadata v0.9.1/go.mod h1:NtnlvB6X3t4R6xSWyVX/ZWk493PCxGQlhI/iqxh4M8I=-cloud.google.com/go/compute/metadata v0.10.0 h1:pyKMUQSwchgkIBBJGdILqQbs/BNJXqwSA7Ej6LAvvtY=cloud.google.com/go/compute/metadata v0.10.0/go.mod h1:rGFHRrIif570kSibjFTMbt6/4/tzgJWFGI/HVol4GIk=cloud.google.com/go/contactcenterinsights v1.17.4 h1:wA4j99BhsoeYlLx6xEIqrNN1aOTtUme0wimHZegg80s=cloud.google.com/go/contactcenterinsights v1.17.4/go.mod h1:kZe6yOnKDfpPz2GphDHynxk/Spx+53UX/pGf+SmWAKM=@@ -333,6 +332,8 @@ cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pEcloud.google.com/go/trace v1.11.3/go.mod h1:pt7zCYiDSQjC9Y2oqCsh9jF4GStB/hmjrYLsxRR27q8=cloud.google.com/go/trace v1.11.7 h1:kDNDX8JkaAG3R2nq1lIdkb7FCSi1rCmsEtKVsty7p+U=cloud.google.com/go/trace v1.11.7/go.mod h1:TNn9d5V3fQVf6s4SCveVMIBS2LJUqo73GACmq/Tky0s=+cloud.google.com/go/translate v1.10.3 h1:g+B29z4gtRGsiKDoTF+bNeH25bLRokAaElygX2FcZkE=+cloud.google.com/go/translate v1.10.3/go.mod h1:GW0vC1qvPtd3pgtypCv4k4U8B7EdgK9/QEF2aJEUovs=cloud.google.com/go/translate v1.12.7 h1:aSxMbfJ3MVmEdQzu5jGXmPPxCAb1ySsor2yBMCI5MT4=cloud.google.com/go/translate v1.12.7/go.mod h1:wwJp14NZyWvcrFANhIXutXj0pOBkYciBHwSlUOykcjI=cloud.google.com/go/video v1.27.1 h1:Hp+2AeM7b3AagdHcyh2820UTzSbGyqpFJVMu0nHbBcw=@@ -398,14 +399,14 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRgithub.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 h1:JXg2dwJUmPB9JmtVmdEB16APJ7jurfbY5jnfXpJoRMc=github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1 h1:zvXfGJCWvywnCA814d8ZiVyt+fm9nnTE8xSb99zRyfo=github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1/go.mod h1:iptorS+VYKFL2N6PnebpS91dubG35eAOEERnT4PJbQU=github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 h1:MhRfI58HblXzCtWEZCO0feHs8LweePB3s90r7WaR1KU=github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0/go.mod h1:okZ+ZURbArNdlJ+ptXoyHNuOETzOl1Oww19rm8I2WLA=-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1 h1:u93s+zU2JD62im61Bm5CZIc1ZrOJaIAWEg0WOrMVkEo=github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1/go.mod h1:oXtinPO4OLj9d1DOTrqrL1oRwGhcqadvAmrl6wTeGlk=github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=+github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.4.0 h1:xFaZZ+IubdftrDHnGGwZ6QvQ3KHTtWl2MCK+GMt2vxs=+github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.4.0/go.mod h1:mCBhUhlMjLLJKr5aqw2TNS/VqJOie8MzWq3DAMJeKso=github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3 h1:ldKsKtEIblsgsr6mPwrd9yRntoX6uLz/K89wsldwx/k=github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3/go.mod h1:MAm7bk0oDLmD8yIkvfbxPW04fxzphPyL+7GzwHxOp6Y=github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=@@ -430,7 +431,6 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJgithub.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=-github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0 h1:MDT4FxAPve5FnYn6vOL1r7RCRDG+l9cI7a5LlCuHsqA=github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0/go.mod h1:Y33QHnf0FfdVewFFISOGe20mkZbxX4H839o955/PoeI=github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=@@ -557,6 +557,8 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAugithub.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=+github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=+github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=@@ -1109,7 +1111,6 @@ github.com/danielgtaylor/shorthand/v2 v2.2.0 h1:hVsemdRq6v3JocP6YRTfu9rOoghZI9PFgithub.com/danielgtaylor/shorthand/v2 v2.2.0/go.mod h1:t5QfaNf7DPru9ZLIIhPQSO7Gyvajm3euw7LxB/MTUqE=github.com/danielgtaylor/shorthand/v2 v2.4.0 h1:IeVgSkTMPXQ/CC3f+pfCiipoJXtXbBO9oVzjaPRXfEM=github.com/danielgtaylor/shorthand/v2 v2.4.0/go.mod h1:+JG16ZY99pciTkGphx18ruwefahdwHCv/jmllgUGKSM=-github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=github.com/data-accelerator/zdfs v0.1.5 h1:F7td8AwicTZ3t618SsEYr8CMyMcxBE1KjkoyYO4T2GI=github.com/data-accelerator/zdfs v0.1.5/go.mod h1:/MyNTsQHHKVLznaRBz+PivhIDwglu+wuXKoZxUNmLKI=@@ -1132,8 +1133,12 @@ github.com/depot/depot-go v0.5.2/go.mod h1:QQtSqwRn0flx4KxrUVSJGlh0hTFeZ19MLYvOcgithub.com/dgraph-io/badger/v3 v3.2103.5 h1:ylPa6qzbjYRQMU6jokoj4wzcaweHylt//CH0AKt0akg=github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw=github.com/dgraph-io/badger/v4 v4.8.0/go.mod h1:U6on6e8k/RTbUWxqKR0MvugJuVmkxSNc79ap4917h4w=+github.com/dgraph-io/badger/v4 v4.9.1 h1:DocZXZkg5JJHJPtUErA0ibyHxOVUDVoXLSCV6t8NC8w=+github.com/dgraph-io/badger/v4 v4.9.1/go.mod h1:5/MEx97uzdPUHR4KtkNt8asfI2T4JiEiQlV7kWUo8c0=github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=+github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM=+github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI=github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38=github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=@@ -1395,7 +1400,6 @@ github.com/gocsaf/csaf/v3 v3.5.1/go.mod h1:pga89lE+iWJm7smTdzYcXuetYUbgY8caXfaIPgithub.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=-github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=github.com/gofiber/fiber/v2 v2.52.7 h1:6xJpE4sSqErvMiEZo9ZpJLRSVcpkNBvioeqAHKwhTZY=github.com/gofiber/fiber/v2 v2.52.7/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=@@ -1485,6 +1489,8 @@ github.com/google/deck v1.1.0 h1:kePIz/wtlpsFSx3+sEmYnlBPudF0x3u0QqB91EC8l38=github.com/google/deck v1.1.0/go.mod h1:VyLix33qBTXGsn4vbF85lWLv/9ushseSAoqS27uX6Zg=github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM=github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=+github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=+github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=github.com/google/go-attestation v0.5.1 h1:jqtOrLk5MNdliTKjPbIPrAaRKJaKW+0LIU2n/brJYms=@@ -1700,7 +1706,6 @@ github.com/jdx/go-netrc v1.0.0 h1:QbLMLyCZGj0NA8glAhxUpf1zDg6cxnWgMBbjq40W0gQ=github.com/jdx/go-netrc v1.0.0/go.mod h1:Gh9eFQJnoTNIRHXl2j5bJXA1u84hQWJWgGh569zF3v8=github.com/jedib0t/go-pretty/v6 v6.7.8 h1:BVYrDy5DPBA3Qn9ICT+PokP9cvCv1KaHv2i+Hc8sr5o=github.com/jedib0t/go-pretty/v6 v6.7.8/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=-github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E=github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=@@ -2005,7 +2010,6 @@ github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zgithub.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=-github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=@@ -2111,6 +2115,7 @@ github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=@@ -2631,7 +2636,6 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=-github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=@@ -3265,6 +3269,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5 h1:google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5/go.mod h1:3LhxRw4YYkf+ylAfgaY9JlVLFKhokkCV8duhLLe7+t0=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260511170946-3700d4141b60 h1:d6u4PP57tPS8aHP9OdAMdFvuOCDaK1IbK31tQUdPa1Q=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260511170946-3700d4141b60/go.mod h1:6TABGosqSqU2l1+fJ3jdvOYPPVryeKybxYF0cCZkTBE=+google.golang.org/genproto/googleapis/bytestream v0.0.0-20260523011958-0a33c5d7ca68 h1:oLrrfrPtevKV9DqgGDKHUxMfolE7ikepJ9j2vNQbGt8=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:6TABGosqSqU2l1+fJ3jdvOYPPVryeKybxYF0cCZkTBE=google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=