Skip to content

Modern Docker Management, Designed for Everyone

feat: add vulnerability count sorting to the images table (#3945)

Kyle Mendell9f89ceefbfcd
diff --git a/backend/internal/image/image.go b/backend/internal/image/image.go
index f12daa159..4172e5291 100644
--- a/backend/internal/image/image.go
+++ b/backend/internal/image/image.go
@@ -3,6 +3,7 @@ package image
import (
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "cmp"
"context"
"io"
"log/slog"
@@ -803,25 +804,25 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio
}
}
+ var vulnerabilityMap map[string]*vulnerabilitytypes.ScanSummary
+ if s.vulnerabilityService != nil && len(imageIDs) > 0 {
+ var err error
+ vulnerabilityMap, err = s.vulnerabilityService.GetScanSummariesByImageIDs(ctx, imageIDs)
+ if err != nil {
+ return nil, pagination.Response{}, err
+ }
+ }
+
projectIDByName := s.BuildProjectIDMap(ctx, containers)
usageMap := BuildVolumeUsageMap(containers, projectIDByName)
updateMap := buildUpdateMapInternal(updateRecords)
- items := MapDockerImagesToDTOs(dockerImages, containers, usageMap, updateMap, nil)
+ items := MapDockerImagesToDTOs(dockerImages, containers, usageMap, updateMap, vulnerabilityMap)
config := s.getImagePaginationConfig()
result := config.SearchOrderAndPaginate(items, params)
- if s.vulnerabilityService != nil && len(result.Items) > 0 {
- pageImageIDs := getImageIDsFromSummariesInternal(result.Items)
- vulnerabilityMap, err := s.vulnerabilityService.GetScanSummariesByImageIDs(ctx, pageImageIDs)
- if err != nil {
- return nil, pagination.Response{}, err
- }
- applyVulnerabilitySummariesToItemsInternal(result.Items, vulnerabilityMap)
- }
-
paginationResp := pagination.BuildResponse(result.TotalCount, result.TotalAvailable, params)
return result.Items, paginationResp, nil
@@ -1024,36 +1025,6 @@ func buildUpdateMapInternal(records []imageupdate.ImageUpdateRecord) map[string]
return updateMap
}
-func getImageIDsFromSummariesInternal(items []imagetypes.Summary) []string {
- seen := make(map[string]struct{}, len(items))
- ids := make([]string, 0, len(items))
-
- for _, item := range items {
- if item.ID == "" {
- continue
- }
- if _, exists := seen[item.ID]; exists {
- continue
- }
- seen[item.ID] = struct{}{}
- ids = append(ids, item.ID)
- }
-
- return ids
-}
-
-func applyVulnerabilitySummariesToItemsInternal(items []imagetypes.Summary, vulnerabilityMap map[string]*vulnerabilitytypes.ScanSummary) {
- if len(items) == 0 || len(vulnerabilityMap) == 0 {
- return
- }
-
- for i := range items {
- if summary, exists := vulnerabilityMap[items[i].ID]; exists {
- items[i].VulnerabilityScan = summary
- }
- }
-}
-
func parseRepoAndTagFromRepoTag(repoTag string) (repo, tag string) {
if named, err := ref.ParseNormalizedNamed(repoTag); err == nil {
repo = ref.FamiliarName(named)
@@ -1180,6 +1151,14 @@ func MapDockerImagesToDTOs(dockerImages []image.Summary, containers []container.
return items
}
+func vulnerabilitySortCountsInternal(i imagetypes.Summary) vulnerabilitytypes.SeveritySummary {
+ scan := i.VulnerabilityScan
+ if scan == nil || scan.Status != vulnerabilitytypes.ScanStatusCompleted || scan.Summary == nil {
+ return vulnerabilitytypes.SeveritySummary{Total: -1}
+ }
+ return *scan.Summary
+}
+
func (s *ImageService) getImagePaginationConfig() pagination.Config[imagetypes.Summary] {
return pagination.Config[imagetypes.Summary]{
SearchAccessors: []pagination.SearchAccessor[imagetypes.Summary]{
@@ -1251,6 +1230,17 @@ func (s *ImageService) getImagePaginationConfig() pagination.Config[imagetypes.S
return 1
},
},
+ {
+ Key: "vulnerabilities",
+ Fn: func(a, b imagetypes.Summary) int {
+ ac, bc := vulnerabilitySortCountsInternal(a), vulnerabilitySortCountsInternal(b)
+ return cmp.Or(
+ cmp.Compare(ac.Total, bc.Total),
+ cmp.Compare(ac.Critical, bc.Critical),
+ cmp.Compare(ac.High, bc.High),
+ )
+ },
+ },
},
FilterAccessors: []pagination.FilterAccessor[imagetypes.Summary]{
{
diff --git a/backend/internal/image/service_test.go b/backend/internal/image/service_test.go
index f4b072181..112e778ed 100644
--- a/backend/internal/image/service_test.go
+++ b/backend/internal/image/service_test.go
@@ -35,7 +35,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
- "github.com/getarcaneapp/arcane/types/v2/vulnerability"
"github.com/moby/moby/api/types/container"
dockercontainer "github.com/moby/moby/api/types/container"
dockertypesimage "github.com/moby/moby/api/types/image"
@@ -64,38 +63,6 @@ func setupImageProjectTestDBInternal(t *testing.T) *database.DB {
return &database.DB{DB: db}
}
-func TestGetImageIDsFromSummariesInternal(t *testing.T) {
- items := []imagetypes.Summary{
- {ID: "img1"},
- {ID: "img2"},
- {ID: "img1"},
- {ID: ""},
- }
-
- got := getImageIDsFromSummariesInternal(items)
- assert.Equal(t, []string{"img1", "img2"}, got)
-}
-
-func TestApplyVulnerabilitySummariesToItemsInternal(t *testing.T) {
- items := []imagetypes.Summary{
- {ID: "img1"},
- {ID: "img2"},
- }
-
- summary := &vulnerability.ScanSummary{
- ImageID: "img1",
- Status: vulnerability.ScanStatusCompleted,
- }
- vulnerabilityMap := map[string]*vulnerability.ScanSummary{
- "img1": summary,
- }
-
- applyVulnerabilitySummariesToItemsInternal(items, vulnerabilityMap)
-
- assert.Equal(t, summary, items[0].VulnerabilityScan)
- assert.Nil(t, items[1].VulnerabilityScan)
-}
-
func TestCollectPinnedReferencesByImageIDInternal(t *testing.T) {
containers := []dockercontainer.Summary{
{
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index bbf6c0c74..0c4edc223 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -441,6 +441,7 @@
return 'scanning';
},
title: m.vuln_title(),
+ sortable: true,
cell: VulnerabilitiesCell,
align: 'center',
class: 'text-center'