Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: reduce handler duplication and cleanup (#2889)
Kyle Mendell7f9cdb6ae3cf
diff --git a/backend/api/handlers/activities.go b/backend/api/handlers/activities.goindex 40381f319..7eb93494a 100644--- a/backend/api/handlers/activities.go+++ b/backend/api/handlers/activities.go@@ -189,15 +189,9 @@ func (h *ActivityHandler) ListActivities(ctx context.Context, input *ListActivitreturn &ListActivitiesOutput{Body: base.Paginated[activity.Activity]{- Success: true,- Data: activities,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: activities,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/apikeys.go b/backend/api/handlers/apikeys.goindex 29a4d99c9..570c392fc 100644--- a/backend/api/handlers/apikeys.go+++ b/backend/api/handlers/apikeys.go@@ -10,7 +10,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/types/v2/apikey""github.com/getarcaneapp/arcane/types/v2/base")@@ -202,19 +201,7 @@ func (h *ApiKeyHandler) ListApiKeys(ctx context.Context, input *ListApiKeysInputreturn nil, huma.Error500InternalServerError("service not available")}- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: input.Search,- },- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- }+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)apiKeys, paginationResp, err := h.apiKeyService.ListApiKeys(ctx, params)if err != nil {@@ -223,15 +210,9 @@ func (h *ApiKeyHandler) ListApiKeys(ctx context.Context, input *ListApiKeysInputreturn &ListApiKeysOutput{Body: ApiKeyPaginatedResponse{- Success: true,- Data: apiKeys,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: apiKeys,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -266,9 +247,9 @@ func (h *ApiKeyHandler) UpdateApiKey(ctx context.Context, input *UpdateApiKeyInpreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}apiKey, err := h.apiKeyService.UpdateApiKey(ctx, user.ID, input.ID, input.Body)@@ -325,9 +306,9 @@ func (h *ApiKeyHandler) ListMyApiKeys(ctx context.Context, input *struct{}) (*Lireturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}keys, err := h.apiKeyService.ListApiKeysByUser(ctx, user.ID)@@ -353,9 +334,9 @@ func (h *ApiKeyHandler) createCurrentUserApiKeyInternal(ctx context.Context, inpreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}apiKey, err := h.apiKeyService.CreateApiKey(ctx, user.ID, input.Body)@@ -382,9 +363,9 @@ func (h *ApiKeyHandler) DeleteMyApiKey(ctx context.Context, input *DeleteApiKeyIreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}existing, err := h.apiKeyService.GetApiKey(ctx, input.ID)diff --git a/backend/api/handlers/auth.go b/backend/api/handlers/auth.goindex 7d712a09f..3ab37442f 100644--- a/backend/api/handlers/auth.go+++ b/backend/api/handlers/auth.go@@ -319,9 +319,9 @@ func (h *AuthHandler) ChangePassword(ctx context.Context, input *ChangePasswordIreturn nil, huma.Error500InternalServerError("service not available")}- userModel, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ userModel, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}if input.Body.CurrentPassword == "" {@@ -329,7 +329,7 @@ func (h *AuthHandler) ChangePassword(ctx context.Context, input *ChangePasswordI}currentSessionID, _ := humamw.GetCurrentSessionIDFromContext(ctx)- err := h.authService.ChangePassword(ctx, userModel.ID, input.Body.CurrentPassword, input.Body.NewPassword, currentSessionID)+ err = h.authService.ChangePassword(ctx, userModel.ID, input.Body.CurrentPassword, input.Body.NewPassword, currentSessionID)if err != nil {switch {case errors.Is(err, services.ErrInvalidCredentials):@@ -356,9 +356,9 @@ func (h *AuthHandler) LogoutAllOtherSessions(ctx context.Context, input *struct{return nil, huma.Error500InternalServerError("service not available")}- userModel, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ userModel, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}currentSessionID, _ := humamw.GetCurrentSessionIDFromContext(ctx)@@ -383,9 +383,9 @@ func (h *AuthHandler) UpdateMyProfile(ctx context.Context, input *UpdateMyProfilreturn nil, huma.Error500InternalServerError("service not available")}- currentUser, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ currentUser, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}isOidcUser := currentUser.OidcSubjectId != nil && *currentUser.OidcSubjectId != ""diff --git a/backend/api/handlers/container_registries.go b/backend/api/handlers/container_registries.goindex 660661911..d32312d1a 100644--- a/backend/api/handlers/container_registries.go+++ b/backend/api/handlers/container_registries.go@@ -242,15 +242,9 @@ func (h *ContainerRegistryHandler) ListRegistries(ctx context.Context, input *Lireturn &ListContainerRegistriesOutput{Body: ContainerRegistryPaginatedResponse{- Success: true,- Data: registries,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: registries,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/containers.go b/backend/api/handlers/containers.goindex bb65479fd..81657f4f8 100644--- a/backend/api/handlers/containers.go+++ b/backend/api/handlers/containers.go@@ -16,7 +16,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/projects""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/types/v2/base"@@ -261,25 +260,12 @@ func (h *ContainerHandler) ListContainers(ctx context.Context, input *ListContaireturn nil, huma.Error500InternalServerError("service not available")}- filters := make(map[string]string)+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.Updates != "" {- filters["updates"] = input.Updates+ params.Filters["updates"] = input.Updates}if input.Standalone != "" {- filters["standalone"] = input.Standalone- }-- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{Search: input.Search},- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: filters,+ params.Filters["standalone"] = input.Standalone}result, err := h.containerService.ListContainersPaginated(ctx, params, true, input.IncludeInternal, input.GroupBy)@@ -289,17 +275,11 @@ func (h *ContainerHandler) ListContainers(ctx context.Context, input *ListContaireturn &ListContainersOutput{Body: ContainerPaginatedResponse{- Success: true,- Data: result.Items,- Groups: result.Groups,- Counts: result.Counts,- Pagination: base.PaginationResponse{- TotalPages: result.Pagination.TotalPages,- TotalItems: result.Pagination.TotalItems,- CurrentPage: result.Pagination.CurrentPage,- ItemsPerPage: result.Pagination.ItemsPerPage,- GrandTotalItems: result.Pagination.GrandTotalItems,- },+ Success: true,+ Data: result.Items,+ Groups: result.Groups,+ Counts: result.Counts,+ Pagination: toPaginationResponseInternal(result.Pagination),},}, nil}@@ -553,9 +533,9 @@ func (h *ContainerHandler) CreateContainer(ctx context.Context, input *CreateConreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}config := buildContainerConfig(input.Body)@@ -677,9 +657,9 @@ func (h *ContainerHandler) runContainerActionInternal(ctx context.Context, inputreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -703,9 +683,9 @@ func (h *ContainerHandler) RedeployContainer(ctx context.Context, input *Containreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -752,9 +732,9 @@ func (h *ContainerHandler) DeleteContainer(ctx context.Context, input *DeleteConreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)diff --git a/backend/api/handlers/environments.go b/backend/api/handlers/environments.goindex 6fa778e06..c3a549520 100644--- a/backend/api/handlers/environments.go+++ b/backend/api/handlers/environments.go@@ -22,7 +22,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/utils"httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"@@ -428,20 +427,7 @@ func (h *EnvironmentHandler) ListEnvironments(ctx context.Context, input *ListEnreturn nil, huma.Error500InternalServerError("service not available")}- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: input.Search,- },- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: map[string]string{},- }+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.Type != "" {params.Filters["type"] = input.Type}@@ -456,15 +442,9 @@ func (h *EnvironmentHandler) ListEnvironments(ctx context.Context, input *ListEnreturn &ListEnvironmentsOutput{Body: EnvironmentPaginatedResponse{- Success: true,- Data: envs,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: envs,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -475,9 +455,9 @@ func (h *EnvironmentHandler) CreateEnvironment(ctx context.Context, input *Creatreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}env := &models.Environment{@@ -645,9 +625,9 @@ func (h *EnvironmentHandler) UpdateEnvironment(ctx context.Context, input *Updat// If regenerating API key, return the new keyvar newApiKey *stringif input.Body.RegenerateApiKey != nil && *input.Body.RegenerateApiKey {- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("Unauthorized")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}// Delete existing API key if anydiff --git a/backend/api/handlers/events.go b/backend/api/handlers/events.goindex e48ace47b..71c7d69fd 100644--- a/backend/api/handlers/events.go+++ b/backend/api/handlers/events.go@@ -213,15 +213,9 @@ func (h *EventHandler) ListEvents(ctx context.Context, input *ListEventsInput) (return &ListEventsOutput{Body: EventPaginatedResponse{- Success: true,- Data: events,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: events,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -252,15 +246,9 @@ func (h *EventHandler) GetEventsByEnvironment(ctx context.Context, input *GetEvereturn &GetEventsByEnvironmentOutput{Body: EventPaginatedResponse{- Success: true,- Data: events,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: events,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/federated.go b/backend/api/handlers/federated.goindex 1a399b68f..e43a8c929 100644--- a/backend/api/handlers/federated.go+++ b/backend/api/handlers/federated.go@@ -9,7 +9,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/types/v2/base"federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated""github.com/labstack/echo/v4"@@ -187,32 +186,16 @@ func (h *FederatedCredentialHandler) ListFederatedCredentials(ctx context.Contexreturn nil, huma.Error500InternalServerError("service not available")}- credentials, paginationResp, err := h.federatedCredentialService.List(ctx, pagination.QueryParams{- SearchQuery: pagination.SearchQuery{Search: input.Search},- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- })+ credentials, paginationResp, err := h.federatedCredentialService.List(ctx, buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search))if err != nil {return nil, huma.Error500InternalServerError("failed to list federated credentials")}return &ListFederatedCredentialsOutput{Body: base.Paginated[federatedtypes.FederatedCredential]{- Success: true,- Data: credentials,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: credentials,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -221,9 +204,9 @@ func (h *FederatedCredentialHandler) CreateFederatedCredential(ctx context.Conteif h.federatedCredentialService == nil {return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}credential, err := h.federatedCredentialService.Create(ctx, user.ID, input.Body)@@ -260,9 +243,9 @@ func (h *FederatedCredentialHandler) UpdateFederatedCredential(ctx context.Conteif h.federatedCredentialService == nil {return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}credential, err := h.federatedCredentialService.Update(ctx, user.ID, input.ID, input.Body)diff --git a/backend/api/handlers/git_repositories.go b/backend/api/handlers/git_repositories.goindex 938aea929..1ef123961 100644--- a/backend/api/handlers/git_repositories.go+++ b/backend/api/handlers/git_repositories.go@@ -146,15 +146,9 @@ func (h *GitRepositoryHandler) ListRepositories(ctx context.Context, input *Listreturn &ListGitRepositoriesOutput{Body: GitRepositoryPaginatedResponse{- Success: true,- Data: repositories,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: repositories,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/gitops_syncs.go b/backend/api/handlers/gitops_syncs.goindex 619e50d07..b75e6fa8d 100644--- a/backend/api/handlers/gitops_syncs.go+++ b/backend/api/handlers/gitops_syncs.go@@ -154,16 +154,10 @@ func (h *GitOpsSyncHandler) ListSyncs(ctx context.Context, input *ListGitOpsSyncreturn &ListGitOpsSyncsOutput{Body: GitOpsSyncPaginatedResponse{- Success: true,- Data: syncs,- Counts: counts,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: syncs,+ Counts: counts,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/helpers.go b/backend/api/handlers/helpers.goindex e6fe1693a..468668381 100644--- a/backend/api/handlers/helpers.go+++ b/backend/api/handlers/helpers.go@@ -4,9 +4,11 @@ import ("context""encoding/json""errors"+ "strings""github.com/danielgtaylor/huma/v2"humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"@@ -37,17 +39,17 @@ func (c ActivityAppContext) contextInternal() context.Context {// buildPaginationParamsInternal converts query parameters to pagination.QueryParams.// A limit of -1 means "show all items" (no pagination).func buildPaginationParamsInternal(start, limit int, sortCol, sortDir, search string) pagination.QueryParams {- // limit = -1 means "show all", preserve it; zero or other negative values default to 20+ // limit = -1 means "show all" and 0 means "no pagination"; only invalid values default to 20if limit < -1 {limit = 20}return pagination.QueryParams{SearchQuery: pagination.SearchQuery{- Search: search,+ Search: strings.TrimSpace(search),},SortParams: pagination.SortParams{- Sort: sortCol,+ Sort: strings.TrimSpace(sortCol),Order: pagination.SortOrder(sortDir),},Params: pagination.Params{@@ -58,6 +60,26 @@ func buildPaginationParamsInternal(start, limit int, sortCol, sortDir, search st}}+// toPaginationResponseInternal converts the pagination package's response into the API response shape.+func toPaginationResponseInternal(p pagination.Response) base.PaginationResponse {+ return base.PaginationResponse{+ TotalPages: p.TotalPages,+ TotalItems: p.TotalItems,+ CurrentPage: p.CurrentPage,+ ItemsPerPage: p.ItemsPerPage,+ GrandTotalItems: p.GrandTotalItems,+ }+}++// requireUserInternal returns the authenticated user from the request context or a 401 error.+func requireUserInternal(ctx context.Context) (*models.User, error) {+ user, exists := humamw.GetCurrentUserFromContext(ctx)+ if !exists || user == nil {+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ }+ return user, nil+}+func registerSecuredInternal[I, O any](api huma.API,op huma.Operation,diff --git a/backend/api/handlers/images.go b/backend/api/handlers/images.goindex 646694dc7..93532e7ee 100644--- a/backend/api/handlers/images.go+++ b/backend/api/handlers/images.go@@ -15,7 +15,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/getarcaneapp/arcane/types/v2/base"@@ -331,27 +330,12 @@ func (h *ImageHandler) ListImages(ctx context.Context, input *ListImagesInput) (return nil, huma.Error500InternalServerError("service not available")}- filters := make(map[string]string)+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.InUse != "" {- filters["inUse"] = input.InUse+ params.Filters["inUse"] = input.InUse}if input.Updates != "" {- filters["updates"] = input.Updates- }-- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: input.Search,- },- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: filters,+ params.Filters["updates"] = input.Updates}if params.Limit == 0 {@@ -369,15 +353,9 @@ func (h *ImageHandler) ListImages(ctx context.Context, input *ListImagesInput) (return &ListImagesOutput{Body: ImagePaginatedResponse{- Success: true,- Data: images,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: images,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -407,9 +385,9 @@ func (h *ImageHandler) RemoveImage(ctx context.Context, input *RemoveImageInput)return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}if err := h.imageService.RemoveImage(ctx, input.ImageID, input.Force, *user); err != nil {@@ -436,9 +414,9 @@ func (h *ImageHandler) PullImage(ctx context.Context, input *PullImageInput) (*hreturn nil, huma.Error400BadRequest("image name is required")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}// Get full image name with tag and credentials@@ -492,9 +470,9 @@ func (h *ImageHandler) BuildImage(ctx context.Context, input *BuildImageInput) (return nil, huma.Error400BadRequest("contextDir is required")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}return &huma.StreamResponse{@@ -567,15 +545,9 @@ func (h *ImageHandler) ListImageBuilds(ctx context.Context, input *ListImageBuilreturn &ListImageBuildsOutput{Body: ImageBuildPaginatedResponse{- Success: true,- Data: builds,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: builds,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -738,9 +710,9 @@ func (h *ImageHandler) UploadImage(ctx context.Context, input *UploadImageInput)return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}// Get file from multipart formdiff --git a/backend/api/handlers/networks.go b/backend/api/handlers/networks.goindex 85bdf2aa8..06bf39838 100644--- a/backend/api/handlers/networks.go+++ b/backend/api/handlers/networks.go@@ -15,7 +15,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/v2/base"@@ -218,24 +217,9 @@ func RegisterNetworks(api huma.API, networkSvc *services.NetworkService, dockerS}func (h *NetworkHandler) ListNetworks(ctx context.Context, input *ListNetworksInput) (*ListNetworksOutput, error) {- filters := make(map[string]string)+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.InUse != "" {- filters["inUse"] = input.InUse- }-- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: strings.TrimSpace(input.Search),- },- SortParams: pagination.SortParams{- Sort: strings.TrimSpace(input.Sort),- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: filters,+ params.Filters["inUse"] = input.InUse}networks, paginationResp, counts, err := h.networkService.ListNetworksPaginated(ctx, params)@@ -245,16 +229,10 @@ func (h *NetworkHandler) ListNetworks(ctx context.Context, input *ListNetworksInreturn &ListNetworksOutput{Body: NetworkPaginatedResponse{- Success: true,- Data: networks,- Counts: counts,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: networks,+ Counts: counts,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -278,9 +256,9 @@ func (h *NetworkHandler) GetNetworkCounts(ctx context.Context, input *GetNetwork}func (h *NetworkHandler) CreateNetwork(ctx context.Context, input *CreateNetworkInput) (*CreateNetworkOutput, error) {- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}// Convert to Docker SDK options@@ -428,9 +406,9 @@ func (h *NetworkHandler) GetNetworkTopology(ctx context.Context, input *GetNetwo}func (h *NetworkHandler) DeleteNetwork(ctx context.Context, input *DeleteNetworkInput) (*DeleteNetworkOutput, error) {- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)diff --git a/backend/api/handlers/ports.go b/backend/api/handlers/ports.goindex d9cca0808..993fd4b9b 100644--- a/backend/api/handlers/ports.go+++ b/backend/api/handlers/ports.go@@ -3,13 +3,11 @@ package handlersimport ("context""net/http"- "strings""github.com/danielgtaylor/huma/v2"humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware""github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/types/v2/base"porttypes "github.com/getarcaneapp/arcane/types/v2/port")@@ -56,19 +54,7 @@ func (h *PortHandler) ListPorts(ctx context.Context, input *ListPortsInput) (*Lireturn nil, huma.Error500InternalServerError("service not available")}- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: strings.TrimSpace(input.Search),- },- SortParams: pagination.SortParams{- Sort: strings.TrimSpace(input.Sort),- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- }+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)items, paginationResp, err := h.portService.ListPortsPaginated(ctx, params)if err != nil {@@ -77,15 +63,9 @@ func (h *PortHandler) ListPorts(ctx context.Context, input *ListPortsInput) (*Lireturn &ListPortsOutput{Body: PortPaginatedResponse{- Success: true,- Data: items,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: items,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.goindex 7b01f9e2f..4c9622c2e 100644--- a/backend/api/handlers/projects.go+++ b/backend/api/handlers/projects.go@@ -16,7 +16,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/getarcaneapp/arcane/backend/v2/pkg/authz"activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/projects""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"@@ -505,30 +504,15 @@ func (h *ProjectHandler) ListProjects(ctx context.Context, input *ListProjectsInreturn nil, huma.Error500InternalServerError("service not available")}- filters := map[string]string{}+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.Status != "" {- filters["status"] = input.Status+ params.Filters["status"] = input.Status}if input.Updates != "" {- filters["updates"] = input.Updates+ params.Filters["updates"] = input.Updates}if input.Archived != "" {- filters["archived"] = input.Archived- }-- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: input.Search,- },- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: filters,+ params.Filters["archived"] = input.Archived}projects, paginationResp, err := h.projectService.ListProjects(ctx, params)@@ -545,15 +529,9 @@ func (h *ProjectHandler) ListProjects(ctx context.Context, input *ListProjectsInreturn &ListProjectsOutput{Body: ProjectPaginatedResponse{- Success: true,- Data: projects,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: projects,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -592,9 +570,9 @@ func (h *ProjectHandler) DeployProject(ctx context.Context, input *DeployProjectreturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}return &huma.StreamResponse{@@ -653,9 +631,9 @@ func (h *ProjectHandler) DownProject(ctx context.Context, input *DownProjectInpureturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -690,9 +668,9 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProjectreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}var proj *models.Project@@ -867,9 +845,9 @@ func (h *ProjectHandler) DestroyProject(ctx context.Context, input *DestroyProjereturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}removeFiles := false@@ -919,9 +897,9 @@ func (h *ProjectHandler) UpdateProject(ctx context.Context, input *UpdateProjectreturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -968,9 +946,9 @@ func (h *ProjectHandler) UpdateProjectInclude(ctx context.Context, input *Updatereturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -1105,9 +1083,9 @@ func (h *ProjectHandler) runProjectActivityActionInternal(ctx context.Context, ereturn base.MessageResponse{}, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return base.MessageResponse{}, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return base.MessageResponse{}, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -1137,9 +1115,9 @@ func (h *ProjectHandler) ArchiveProject(ctx context.Context, input *ArchiveProjereturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}if err := h.projectService.ArchiveProject(ctx, input.ProjectID, *user); err != nil {@@ -1166,9 +1144,9 @@ func (h *ProjectHandler) UnarchiveProject(ctx context.Context, input *UnarchivePreturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}if err := h.projectService.UnarchiveProject(ctx, input.ProjectID, *user); err != nil {@@ -1193,9 +1171,9 @@ func (h *ProjectHandler) PullProjectImages(ctx context.Context, input *PullProjereturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}return &huma.StreamResponse{@@ -1254,9 +1232,9 @@ func (h *ProjectHandler) BuildProjectImages(ctx context.Context, input *BuildProreturn nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}options := services.ProjectBuildOptions{}diff --git a/backend/api/handlers/roles.go b/backend/api/handlers/roles.goindex 5ee8e805b..9e9f8aa81 100644--- a/backend/api/handlers/roles.go+++ b/backend/api/handlers/roles.go@@ -201,15 +201,9 @@ func (h *RoleHandler) ListRoles(ctx context.Context, input *ListRolesInput) (*Li}return &ListRolesOutput{Body: RolePaginatedResponse{- Success: true,- Data: dtos,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: dtos,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/swarm.go b/backend/api/handlers/swarm.goindex 4ec1fa26e..f57a79d8c 100644--- a/backend/api/handlers/swarm.go+++ b/backend/api/handlers/swarm.go@@ -867,9 +867,9 @@ func (h *SwarmHandler) GetNodeAgentDeployment(ctx context.Context, input *GetSwareturn nil, mapSwarmServiceError(err, (&common.SwarmNodeNotFoundError{Err: err}).Error())}- user, ok := humamw.GetCurrentUserFromContext(ctx)- if !ok || user == nil {- return nil, huma.Error401Unauthorized("Unauthorized")+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}env, apiKey, err := h.environmentService.EnsureSwarmNodeAgentEnvironment(@@ -1834,15 +1834,9 @@ func (h *SwarmHandler) DeleteSecret(ctx context.Context, input *DeleteSwarmSecre// Returns a SwarmPaginatedResponse with `Success` set to true.func toSwarmPaginatedResponse[T any](items []T, p pagination.Response) SwarmPaginatedResponse[T] {return SwarmPaginatedResponse[T]{- Success: true,- Data: items,- Pagination: base.PaginationResponse{- TotalPages: p.TotalPages,- TotalItems: p.TotalItems,- CurrentPage: p.CurrentPage,- ItemsPerPage: p.ItemsPerPage,- GrandTotalItems: p.GrandTotalItems,- },+ Success: true,+ Data: items,+ Pagination: toPaginationResponseInternal(p),}}diff --git a/backend/api/handlers/system.go b/backend/api/handlers/system.goindex 28fd01119..d76afd569 100644--- a/backend/api/handlers/system.go+++ b/backend/api/handlers/system.go@@ -511,14 +511,14 @@ func (h *SystemHandler) TriggerUpgrade(ctx context.Context, input *TriggerUpgradreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}slog.Info("System upgrade triggered", "user", user.Username, "userId", user.ID)- err := h.upgradeService.TriggerUpgradeViaCLI(ctx, *user)+ err = h.upgradeService.TriggerUpgradeViaCLI(ctx, *user)if err != nil {slog.Error("System upgrade failed", "error", err, "user", user.Username)diff --git a/backend/api/handlers/templates.go b/backend/api/handlers/templates.goindex 46f23a595..6f81fd5bd 100644--- a/backend/api/handlers/templates.go+++ b/backend/api/handlers/templates.go@@ -431,15 +431,9 @@ func (h *TemplateHandler) ListTemplates(ctx context.Context, input *ListTemplatereturn &ListTemplatesOutput{Body: TemplatePaginatedResponse{- Success: true,- Data: templates,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: templates,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/users.go b/backend/api/handlers/users.goindex 95df046de..8eeed7a32 100644--- a/backend/api/handlers/users.go+++ b/backend/api/handlers/users.go@@ -177,15 +177,9 @@ func (h *UserHandler) ListUsers(ctx context.Context, input *ListUsersInput) (*Lireturn &ListUsersOutput{Body: UserPaginatedResponse{- Success: true,- Data: users,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: users,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/handlers/volumes.go b/backend/api/handlers/volumes.goindex 143d6dad4..c1428e8ea 100644--- a/backend/api/handlers/volumes.go+++ b/backend/api/handlers/volumes.go@@ -662,24 +662,9 @@ func (h *VolumeHandler) ListVolumes(ctx context.Context, input *ListVolumesInputreturn nil, huma.Error500InternalServerError("service not available")}- filters := make(map[string]string)+ params := buildPaginationParamsInternal(input.Start, input.Limit, input.Sort, input.Order, input.Search)if input.InUse != "" {- filters["inUse"] = input.InUse- }-- params := pagination.QueryParams{- SearchQuery: pagination.SearchQuery{- Search: input.Search,- },- SortParams: pagination.SortParams{- Sort: input.Sort,- Order: pagination.SortOrder(input.Order),- },- Params: pagination.Params{- Start: input.Start,- Limit: input.Limit,- },- Filters: filters,+ params.Filters["inUse"] = input.InUse}if params.Limit == 0 {@@ -704,13 +689,7 @@ func (h *VolumeHandler) ListVolumes(ctx context.Context, input *ListVolumesInputUnused: counts.Unused,Total: counts.Total,},- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -740,9 +719,9 @@ func (h *VolumeHandler) CreateVolume(ctx context.Context, input *CreateVolumeInpreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}options := client.VolumeCreateOptions{@@ -792,9 +771,9 @@ func (h *VolumeHandler) RemoveVolume(ctx context.Context, input *RemoveVolumeInpreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -1144,15 +1123,9 @@ func (h *VolumeHandler) ListBackups(ctx context.Context, input *ListBackupsInputreturn &ListBackupsOutput{Body: VolumeBackupPaginatedResponse{- Success: true,- Data: backups,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: backups,+ Pagination: toPaginationResponseInternal(paginationResp),Warnings: func() []string {if warning == "" {return nil@@ -1167,9 +1140,9 @@ func (h *VolumeHandler) CreateBackup(ctx context.Context, input *CreateBackupInpif h.volumeService == nil {return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}var backup *models.VolumeBackup@@ -1206,9 +1179,9 @@ func (h *VolumeHandler) RestoreBackup(ctx context.Context, input *RestoreBackupIif h.volumeService == nil {return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -1245,9 +1218,9 @@ func (h *VolumeHandler) RestoreBackupFiles(ctx context.Context, input *RestoreBareturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}if len(input.Body.Paths) == 0 {@@ -1387,9 +1360,9 @@ func (h *VolumeHandler) UploadAndRestore(ctx context.Context, input *UploadAndReif h.volumeService == nil {return nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}files := input.RawBody.File["file"]diff --git a/backend/api/handlers/vulnerabilities.go b/backend/api/handlers/vulnerabilities.goindex 82bd69e12..c7cd49a18 100644--- a/backend/api/handlers/vulnerabilities.go+++ b/backend/api/handlers/vulnerabilities.go@@ -305,9 +305,9 @@ func (h *VulnerabilityHandler) ScanImage(ctx context.Context, input *ScanImageInreturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)@@ -428,15 +428,9 @@ func (h *VulnerabilityHandler) ListImageVulnerabilities(ctx context.Context, inpreturn &ListImageVulnerabilitiesOutput{Body: base.Paginated[vulnerability.Vulnerability]{- Success: true,- Data: items,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: items,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -492,15 +486,9 @@ func (h *VulnerabilityHandler) ListAllVulnerabilities(ctx context.Context, inputreturn &ListAllVulnerabilitiesOutput{Body: base.Paginated[vulnerability.VulnerabilityWithImage]{- Success: true,- Data: items,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: items,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}@@ -563,9 +551,9 @@ func (h *VulnerabilityHandler) IgnoreVulnerability(ctx context.Context, input *Ireturn nil, huma.Error500InternalServerError("service not available")}- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ user, err := requireUserInternal(ctx)+ if err != nil {+ return nil, err}payload := &input.Body@@ -661,15 +649,9 @@ func (h *VulnerabilityHandler) ListIgnoredVulnerabilities(ctx context.Context, ireturn &ListIgnoredVulnerabilitiesOutput{Body: base.Paginated[vulnerability.IgnoredVulnerability]{- Success: true,- Data: items,- Pagination: base.PaginationResponse{- TotalPages: paginationResp.TotalPages,- TotalItems: paginationResp.TotalItems,- CurrentPage: paginationResp.CurrentPage,- ItemsPerPage: paginationResp.ItemsPerPage,- GrandTotalItems: paginationResp.GrandTotalItems,- },+ Success: true,+ Data: items,+ Pagination: toPaginationResponseInternal(paginationResp),},}, nil}diff --git a/backend/api/ws/handler.go b/backend/api/ws/handler.goindex 30c73457a..9e08d1b7b 100644--- a/backend/api/ws/handler.go+++ b/backend/api/ws/handler.go@@ -943,10 +943,36 @@ func (h *WebSocketHandler) ContainerExec(c echo.Context) error {ctx, cancel := context.WithCancel(c.Request().Context())defer cancel()+ const execPongWait = 60 * time.Second+ _ = conn.SetReadDeadline(time.Now().Add(execPongWait))+ conn.SetPongHandler(func(string) error {+ _ = conn.SetReadDeadline(time.Now().Add(execPongWait))+ return nil+ })+ go h.pingExecConnInternal(ctx, conn, execPongWait*9/10)+h.runContainerExecInternal(ctx, cancel, conn, containerID, shell)return nil}+// pingExecConnInternal keeps the exec websocket alive; pongs refresh the read+// deadline so a silently-dead client fails the next read instead of blocking+// forever. WriteControl is safe concurrently with the exec output writer.+func (h *WebSocketHandler) pingExecConnInternal(ctx context.Context, conn *websocket.Conn, period time.Duration) {+ ticker := time.NewTicker(period)+ defer ticker.Stop()+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(time.Second)); err != nil {+ return+ }+ }+ }+}+func (h *WebSocketHandler) runContainerExecInternal(ctx context.Context, cancel context.CancelFunc, conn *websocket.Conn, containerID, shell string) {// Create exec instanceexecID, err := h.containerService.CreateExec(ctx, containerID, []string{shell})diff --git a/backend/internal/middleware/auth_middleware.go b/backend/internal/middleware/auth_middleware.goindex 180b52a6d..da6605b65 100644--- a/backend/internal/middleware/auth_middleware.go+++ b/backend/internal/middleware/auth_middleware.go@@ -2,6 +2,7 @@ package middlewareimport ("context"+ "crypto/subtle""errors""log/slog""net/http"@@ -137,20 +138,19 @@ func (m *AuthMiddleware) agentAuth(ctx context.Context, c echo.Context, next echreq := c.Request()if strings.HasPrefix(req.URL.Path, pkgutils.AgentPairingPrefix) &&- m.cfg.AgentToken != "" &&- req.Header.Get(pkgutils.HeaderAgentBootstrap) == m.cfg.AgentToken {+ agentTokenMatchesInternal(req.Header.Get(pkgutils.HeaderAgentBootstrap), m.cfg.AgentToken) {slog.InfoContext(ctx, "Agent auth: bootstrap pairing accepted", "path", req.URL.Path, "method", req.Method)agentSudoInternal(c)return next(c)}- if tok := req.Header.Get(pkgutils.HeaderAgentToken); tok != "" && m.cfg.AgentToken != "" && tok == m.cfg.AgentToken {+ if agentTokenMatchesInternal(req.Header.Get(pkgutils.HeaderAgentToken), m.cfg.AgentToken) {agentSudoInternal(c)return next(c)}// Check for API key as agent token- if tok := req.Header.Get(pkgutils.HeaderApiKey); tok != "" && m.cfg.AgentToken != "" && tok == m.cfg.AgentToken {+ if agentTokenMatchesInternal(req.Header.Get(pkgutils.HeaderApiKey), m.cfg.AgentToken) {agentSudoInternal(c)return next(c)}@@ -167,6 +167,15 @@ func (m *AuthMiddleware) agentAuth(ctx context.Context, c echo.Context, next ech})}+// agentTokenMatchesInternal compares a presented token against the configured+// agent token in constant time to avoid timing side channels.+func agentTokenMatchesInternal(presented, configured string) bool {+ if presented == "" || configured == "" {+ return false+ }+ return subtle.ConstantTimeCompare([]byte(presented), []byte(configured)) == 1+}+func (m *AuthMiddleware) managerAuth(ctx context.Context, c echo.Context, next echo.HandlerFunc) error {req := c.Request()if agentToken := req.Header.Get(pkgutils.HeaderAgentToken); agentToken != "" {diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex f4bcca2ea..5ce714620 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -7,6 +7,7 @@ import ("fmt""io""log/slog"+ "slices""strings""sync""time"@@ -31,6 +32,7 @@ import ("github.com/moby/moby/api/types/network""github.com/moby/moby/client"libupdater "go.getarcane.app/updater/pkg/labels"+ "golang.org/x/sync/singleflight")type ContainerService struct {@@ -42,6 +44,7 @@ type ContainerService struct {projectService *ProjectServicestatsHistory containerstats.StoreupdateInfoCache *cache.KeyedCache[string, *imagetypes.UpdateInfo]+ updateInfoSF singleflight.GroupiconMetaCache *cache.TTL[projects.ArcaneComposeMetadata]}@@ -1100,20 +1103,42 @@ func (s *ContainerService) getUpdateInfoMap(ctx context.Context, imageIDs []stri}updateInfoMap := make(map[string]*imagetypes.UpdateInfo, len(imageIDs))+ var uncachedIDs []stringfor _, imageID := range imageIDs {- info, err := s.updateInfoCache.GetOrFetch(ctx, imageID, nil, func(fetchCtx context.Context) (*imagetypes.UpdateInfo, error) {- infos, fetchErr := s.imageService.GetUpdateInfoByImageIDs(fetchCtx, []string{imageID})+ info, ok := s.updateInfoCache.Get(imageID)+ if !ok {+ uncachedIDs = append(uncachedIDs, imageID)+ continue+ }+ if info != nil {+ updateInfoMap[imageID] = info+ }+ }++ if len(uncachedIDs) > 0 {+ // Singleflight keyed by the uncached set so concurrent list requests+ // that miss on the same images share one batch query.+ slices.Sort(uncachedIDs)+ res, err, _ := s.updateInfoSF.Do(strings.Join(uncachedIDs, ","), func() (any, error) {+ infos, fetchErr := s.imageService.GetUpdateInfoByImageIDs(ctx, uncachedIDs)if fetchErr != nil {return nil, fetchErr}- return infos[imageID], nil+ for _, imageID := range uncachedIDs {+ // Cache nil results too so absent rows don't refetch until invalidation.+ s.updateInfoCache.Set(imageID, infos[imageID])+ }+ return infos, nil})if err != nil {- slog.WarnContext(ctx, "Failed to fetch image update info for container image", "imageID", imageID, "error", err)- continue+ slog.WarnContext(ctx, "Failed to fetch image update info for container images", "imageIDs", len(uncachedIDs), "error", err)+ return updateInfoMap}- if info != nil {- updateInfoMap[imageID] = info+ infos, _ := res.(map[string]*imagetypes.UpdateInfo)+ for _, imageID := range uncachedIDs {+ if info := infos[imageID]; info != nil {+ updateInfoMap[imageID] = info+ }}}return updateInfoMapdiff --git a/backend/internal/services/customize_search_service.go b/backend/internal/services/customize_search_service.goindex 9d001dac9..298d6e355 100644--- a/backend/internal/services/customize_search_service.go+++ b/backend/internal/services/customize_search_service.go@@ -2,6 +2,7 @@ package servicesimport ("reflect"+ "slices""sort""strings""sync"@@ -68,7 +69,7 @@ func (s *CustomizeSearchService) buildCategoriesFromModel() []category.Category}// Track category order from first appearance- if len(categories[categoryID]) == 0 && !utils.Contains(categoryOrder, categoryID) {+ if len(categories[categoryID]) == 0 && !slices.Contains(categoryOrder, categoryID) {categoryOrder = append(categoryOrder, categoryID)}diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 3db58d44f..b2e8613d3 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -492,17 +492,7 @@ func (s *NotificationService) sendImageUpdateNotificationForTargetInternal(ctx c// isEventEnabled checks if a specific event type is enabled in the configfunc (s *NotificationService) isEventEnabled(config models.JSON, eventType models.NotificationEventType) bool {- configBytes, err := json.Marshal(config)- if err != nil {- return true // Default to enabled if we can't parse- }-- var configMap map[string]any- if err := json.Unmarshal(configBytes, &configMap); err != nil {- return true // Default to enabled if we can't parse- }-- events, ok := configMap["events"].(map[string]any)+ events, ok := config["events"].(map[string]any)if !ok {return true // If no events config, default to enabled}diff --git a/backend/internal/services/settings_search_service.go b/backend/internal/services/settings_search_service.goindex a7672b3b7..c3184c2f7 100644--- a/backend/internal/services/settings_search_service.go+++ b/backend/internal/services/settings_search_service.go@@ -2,6 +2,7 @@ package servicesimport ("reflect"+ "slices""sort""strings""sync"@@ -77,7 +78,7 @@ func (s *SettingsSearchService) buildCategoriesFromModel() []category.Category {}// Track category order from first appearance- if len(categories[categoryID]) == 0 && !utils.Contains(categoryOrder, categoryID) {+ if len(categories[categoryID]) == 0 && !slices.Contains(categoryOrder, categoryID) {categoryOrder = append(categoryOrder, categoryID)}diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex 0d2b21d49..eb2f14fa6 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -599,13 +599,15 @@ func (s *SystemService) pruneNetworksInternal(ctx context.Context, options systereturn nil}+var dockerRunPrefixPattern = regexp.MustCompile(`^docker\s+run\s+`)+func (s *SystemService) ParseDockerRunCommand(command string) (*system.DockerRunCommand, error) {if command == "" {return nil, errors.New("docker run command must be a non-empty string")}cmd := strings.TrimSpace(command)- cmd = regexp.MustCompile(`^docker\s+run\s+`).ReplaceAllString(cmd, "")+ cmd = dockerRunPrefixPattern.ReplaceAllString(cmd, "")if cmd == "" {return nil, errors.New("no arguments found after 'docker run'")diff --git a/backend/pkg/pagination/search.go b/backend/pkg/pagination/search.goindex d9a3df59a..97ff67b45 100644--- a/backend/pkg/pagination/search.go+++ b/backend/pkg/pagination/search.go@@ -15,7 +15,7 @@ type SearchQuery struct {}func searchFn[T any](items []T, params SearchQuery, accessors []SearchAccessor[T]) []T {- search := strings.TrimSpace(params.Search)+ search := strings.ToLower(strings.TrimSpace(params.Search))if search == "" {return items@@ -26,7 +26,7 @@ func searchFn[T any](items []T, params SearchQuery, accessors []SearchAccessor[Tfor iIdx := range items {for aIdx := range accessors {value, err := accessors[aIdx](items[iIdx])- if err == nil && strings.Contains(strings.ToLower(value), strings.ToLower(search)) {+ if err == nil && strings.Contains(strings.ToLower(value), search) {results = append(results, items[iIdx])break}diff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.goindex 30320b86e..c3f065c80 100644--- a/backend/pkg/projects/fs_templates.go+++ b/backend/pkg/projects/fs_templates.go@@ -40,15 +40,19 @@ func ReadFolderComposeTemplate(baseDir, folder string) (string, *string, string,return string(b), envPtr, desc, true, nil}+var (+ slugInvalidCharsPattern = regexp.MustCompile(`[^a-z0-9\-_]+`)+ slugDashRunPattern = regexp.MustCompile(`-+`)+)+func Slugify(in string) string {in = strings.TrimSpace(strings.ToLower(in))if in == "" {return ""}in = strings.ReplaceAll(in, " ", "-")- re := regexp.MustCompile(`[^a-z0-9\-_]+`)- in = re.ReplaceAllString(in, "-")- in = regexp.MustCompile(`-+`).ReplaceAllString(in, "-")+ in = slugInvalidCharsPattern.ReplaceAllString(in, "-")+ in = slugDashRunPattern.ReplaceAllString(in, "-")return strings.Trim(in, "-")}diff --git a/backend/pkg/utils/cache/cache_util.go b/backend/pkg/utils/cache/cache_util.goindex edf28fcd3..54fe7e5bb 100644--- a/backend/pkg/utils/cache/cache_util.go+++ b/backend/pkg/utils/cache/cache_util.go@@ -43,6 +43,21 @@ func NewKeyed[K comparable, T any]() *KeyedCache[K, T] {}}+// Get returns the cached value for key, if present.+func (c *KeyedCache[K, T]) Get(key K) (T, bool) {+ c.mu.RLock()+ cached, ok := c.entries[key]+ c.mu.RUnlock()+ return cached, ok+}++// Set stores value for key, replacing any existing entry.+func (c *KeyedCache[K, T]) Set(key K, value T) {+ c.mu.Lock()+ c.entries[key] = value+ c.mu.Unlock()+}+func (c *KeyedCache[K, T]) GetOrFetch(ctx context.Context,key K,diff --git a/backend/pkg/utils/cache/cache_util_test.go b/backend/pkg/utils/cache/cache_util_test.gonew file mode 100644index 000000000..286e72f88--- /dev/null+++ b/backend/pkg/utils/cache/cache_util_test.go@@ -0,0 +1,30 @@+package cache++import "testing"++func TestKeyedCacheGetSet(t *testing.T) {+ c := NewKeyed[string, *int]()++ if _, ok := c.Get("missing"); ok {+ t.Fatal("expected miss for unset key")+ }++ v := 42+ c.Set("hit", &v)+ got, ok := c.Get("hit")+ if !ok || got == nil || *got != 42 {+ t.Fatalf("expected cached value 42, got %v (ok=%v)", got, ok)+ }++ // Nil values are valid entries and must report as hits.+ c.Set("nil-entry", nil)+ got, ok = c.Get("nil-entry")+ if !ok || got != nil {+ t.Fatalf("expected nil hit, got %v (ok=%v)", got, ok)+ }++ c.Invalidate("hit")+ if _, ok := c.Get("hit"); ok {+ t.Fatal("expected miss after invalidate")+ }+}diff --git a/backend/pkg/utils/reflection.go b/backend/pkg/utils/reflection.goindex e937ac88c..cbc135db6 100644--- a/backend/pkg/utils/reflection.go+++ b/backend/pkg/utils/reflection.go@@ -2,7 +2,6 @@ package utilsimport ("reflect"- "slices""strings")@@ -64,8 +63,3 @@ func ExtractCategoryMetadata(model any, categoryIDsInOrder []string) map[string]return result}--// Contains checks if a string slice contains an item-func Contains(slice []string, item string) bool {- return slices.Contains(slice, item)-}