Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: vulnerability image filter only shows images on current page (#1908)
Kyle Mendell6377063caee9
diff --git a/backend/internal/huma/handlers/vulnerabilities.go b/backend/internal/huma/handlers/vulnerabilities.goindex 726df8006..56683a7cf 100644--- a/backend/internal/huma/handlers/vulnerabilities.go+++ b/backend/internal/huma/handlers/vulnerabilities.go@@ -95,6 +95,15 @@ type ListAllVulnerabilitiesOutput struct {Body base.Paginated[vulnerability.VulnerabilityWithImage]}+type ListAllVulnerabilityImageOptionsInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Severity string `query:"severity" doc:"Comma-separated severity filter"`+}++type ListAllVulnerabilityImageOptionsOutput struct {+ Body base.ApiResponse[[]string]+}+type GetScannerStatusInput struct {EnvironmentID string `path:"id" doc:"Environment ID"`}@@ -221,6 +230,19 @@ func RegisterVulnerability(api huma.API, vulnerabilityService *services.Vulnerab},}, h.ListAllVulnerabilities)+ huma.Register(api, huma.Operation{+ OperationID: "list-environment-vulnerability-image-options",+ Method: http.MethodGet,+ Path: "/environments/{id}/vulnerabilities/image-options",+ Summary: "List vulnerability image options",+ Description: "Retrieves available image filter options for environment vulnerabilities",+ Tags: []string{"Vulnerabilities"},+ Security: []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ },+ }, h.ListAllVulnerabilityImageOptions)+huma.Register(api, huma.Operation{OperationID: "ignore-vulnerability",Method: http.MethodPost,@@ -466,6 +488,29 @@ func (h *VulnerabilityHandler) ListAllVulnerabilities(ctx context.Context, input}, nil}+// ListAllVulnerabilityImageOptions returns available image options for vulnerability filtering.+func (h *VulnerabilityHandler) ListAllVulnerabilityImageOptions(ctx context.Context, input *ListAllVulnerabilityImageOptionsInput) (*ListAllVulnerabilityImageOptionsOutput, error) {+ if h.vulnerabilityService == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }++ items, err := h.vulnerabilityService.ListAllVulnerabilityImageOptions(ctx, input.Severity)+ if err != nil {+ return nil, huma.Error500InternalServerError((&common.VulnerabilityScanRetrievalError{Err: err}).Error())+ }++ if items == nil {+ items = []string{}+ }++ return &ListAllVulnerabilityImageOptionsOutput{+ Body: base.ApiResponse[[]string]{+ Success: true,+ Data: items,+ },+ }, nil+}+// GetScannerStatus checks if the vulnerability scanner is available.func (h *VulnerabilityHandler) GetScannerStatus(ctx context.Context, input *GetScannerStatusInput) (*GetScannerStatusOutput, error) {if h.vulnerabilityService == nil {diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex b87ccbdb4..91d214da4 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -12,6 +12,7 @@ import ("math""net""os"+ "sort""strconv""strings""sync"@@ -747,6 +748,56 @@ func (s *VulnerabilityService) ListAllVulnerabilities(ctx context.Context, envIDreturn filtered.Items, response, nil}+// ListAllVulnerabilityImageOptions returns unique image names (or image IDs when name is empty)+// for vulnerability filtering, optionally constrained by severity.+func (s *VulnerabilityService) ListAllVulnerabilityImageOptions(ctx context.Context, severityFilter string) ([]string, error) {+ if s.db == nil {+ return []string{}, nil+ }++ query := s.db.WithContext(ctx).+ Model(&models.VulnerabilityScanRecord{}).+ Select("id", "image_name").+ Where("status = ?", models.ScanStatusCompleted).+ Where("total_count > 0")++ if strings.TrimSpace(severityFilter) != "" {+ var hasPossibleMatches bool+ query, hasPossibleMatches = applyListAllVulnerabilityRecordPrefiltersInternal(query, map[string]string{+ "severity": severityFilter,+ })+ if !hasPossibleMatches {+ return []string{}, nil+ }+ }++ var records []models.VulnerabilityScanRecord+ if err := query.Find(&records).Error; err != nil {+ return nil, fmt.Errorf("failed to list vulnerability image options: %w", err)+ }++ seen := make(map[string]struct{}, len(records))+ options := make([]string, 0, len(records))+ for _, record := range records {+ label := strings.TrimSpace(record.ImageName)+ if label == "" {+ label = strings.TrimSpace(record.ID)+ }+ if label == "" {+ continue+ }+ if _, exists := seen[label]; exists {+ continue+ }++ seen[label] = struct{}{}+ options = append(options, label)+ }++ sort.Strings(options)+ return options, nil+}+func applyListAllVulnerabilityRecordPrefiltersInternal(query *gorm.DB, filters map[string]string) (*gorm.DB, bool) {if query == nil || len(filters) == 0 {return query, truediff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.goindex faa0e27d2..820da200a 100644--- a/backend/internal/services/vulnerability_service_test.go+++ b/backend/internal/services/vulnerability_service_test.go@@ -653,3 +653,52 @@ func TestVulnerabilityService_ListAllVulnerabilities_FiltersIgnoredInline(t *tesrequire.Equal(t, int64(0), page.TotalItems)require.Equal(t, int64(0), page.GrandTotalItems)}++func TestVulnerabilityService_ListAllVulnerabilityImageOptions_SeverityFilter(t *testing.T) {+ ctx := context.Background()+ db := setupVulnerabilityScanTestDB(t)+ svc := &VulnerabilityService{db: db}++ now := time.Now()+ records := []models.VulnerabilityScanRecord{+ {ID: "sha256:critical-a", ImageName: "zeta:latest", Status: models.ScanStatusCompleted, ScanTime: now, CriticalCount: 2, TotalCount: 2},+ {ID: "sha256:high-a", ImageName: "alpha:latest", Status: models.ScanStatusCompleted, ScanTime: now, HighCount: 4, TotalCount: 4},+ {ID: "sha256:critical-b", ImageName: "", Status: models.ScanStatusCompleted, ScanTime: now, CriticalCount: 1, TotalCount: 1},+ {ID: "sha256:critical-c", ImageName: "zeta:latest", Status: models.ScanStatusCompleted, ScanTime: now, CriticalCount: 1, TotalCount: 1},+ {ID: "sha256:failed", ImageName: "failed:latest", Status: models.ScanStatusFailed, ScanTime: now, CriticalCount: 9, TotalCount: 9},+ {ID: "sha256:zero", ImageName: "zero:latest", Status: models.ScanStatusCompleted, ScanTime: now, CriticalCount: 1, TotalCount: 0},+ }++ for i := range records {+ require.NoError(t, db.Create(&records[i]).Error)+ }++ items, err := svc.ListAllVulnerabilityImageOptions(ctx, "critical")+ require.NoError(t, err)+ require.Equal(t, []string{"sha256:critical-b", "zeta:latest"}, items)+}++func TestVulnerabilityService_ListAllVulnerabilityImageOptions_InvalidSeverityAndNoFilter(t *testing.T) {+ ctx := context.Background()+ db := setupVulnerabilityScanTestDB(t)+ svc := &VulnerabilityService{db: db}++ now := time.Now()+ records := []models.VulnerabilityScanRecord{+ {ID: "sha256:one", ImageName: "beta:latest", Status: models.ScanStatusCompleted, ScanTime: now, HighCount: 1, TotalCount: 1},+ {ID: "sha256:two", ImageName: "", Status: models.ScanStatusCompleted, ScanTime: now, MediumCount: 2, TotalCount: 2},+ {ID: "sha256:three", ImageName: "alpha:latest", Status: models.ScanStatusCompleted, ScanTime: now, LowCount: 1, TotalCount: 1},+ }++ for i := range records {+ require.NoError(t, db.Create(&records[i]).Error)+ }++ invalid, err := svc.ListAllVulnerabilityImageOptions(ctx, "not-a-severity")+ require.NoError(t, err)+ require.Empty(t, invalid)++ all, err := svc.ListAllVulnerabilityImageOptions(ctx, "")+ require.NoError(t, err)+ require.Equal(t, []string{"alpha:latest", "beta:latest", "sha256:two"}, all)+}diff --git a/frontend/src/lib/services/vulnerability-service.ts b/frontend/src/lib/services/vulnerability-service.tsindex a5c0c741b..a647b038b 100644--- a/frontend/src/lib/services/vulnerability-service.ts+++ b/frontend/src/lib/services/vulnerability-service.ts@@ -102,6 +102,29 @@ export class VulnerabilityService extends BaseAPIService {return res.data;}+ /**+ * Get available image filter options for environment vulnerabilities.+ * This endpoint is independent from rows pagination and currently supports severity-only filtering.+ */+ async getAllVulnerabilityImageOptions(options?: SearchPaginationSortRequest): Promise<string[]> {+ const envId = await this.resolveEnvironmentId();+ return this.getAllVulnerabilityImageOptionsForEnvironment(envId, options);+ }++ async getAllVulnerabilityImageOptionsForEnvironment(+ environmentId: string,+ options?: SearchPaginationSortRequest+ ): Promise<string[]> {+ const severityFilter = options?.filters?.severity;+ const params: Record<string, string> = {};++ if (severityFilter !== undefined && severityFilter !== null) {+ params.severity = Array.isArray(severityFilter) ? severityFilter.join(',') : String(severityFilter);+ }++ return this.handleResponse(this.api.get(`/environments/${environmentId}/vulnerabilities/image-options`, { params }));+ }+/*** Ignore a vulnerability*/diff --git a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte b/frontend/src/routes/(app)/security/security-vulnerability-table.svelteindex f4011a872..0d43cf7bd 100644--- a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte+++ b/frontend/src/routes/(app)/security/security-vulnerability-table.svelte@@ -9,7 +9,7 @@import type { VulnerabilityWithImage } from '$lib/types/vulnerability.type';import { ShieldAlertIcon, CodeIcon, CheckIcon, ImagesIcon, EyeOffIcon } from '$lib/icons';import { toast } from 'svelte-sonner';- import type { BulkAction } from '$lib/components/arcane-table/arcane-table.types.svelte';+ import { onMount } from 'svelte';const DEFAULT_PAGE_SIZE = 20;@@ -23,6 +23,8 @@requestOptions: SearchPaginationSortRequest;} = $props();+ let imageNameFilterOptions = $state<string[]>([]);+function getSeverityLabel(severity: string): string {switch (severity) {case 'CRITICAL':@@ -79,6 +81,41 @@].join('-');}+ function resolveSeverityFilter(options?: SearchPaginationSortRequest): string | undefined {+ const rawSeverity = options?.filters?.severity ?? options?.filters?.vulnSeverity;+ if (Array.isArray(rawSeverity)) {+ const values = rawSeverity.map((entry) => String(entry).trim()).filter(Boolean);+ return values.length ? values.join(',') : undefined;+ }++ if (rawSeverity === undefined || rawSeverity === null) {+ return undefined;+ }++ const value = String(rawSeverity).trim();+ return value || undefined;+ }++ function deriveImageOptionsFromRows(rows: VulnerabilityRow[]): string[] {+ return [...new Set(rows.map((row) => row.imageName || row.imageId).filter(Boolean) as string[])].sort();+ }++ async function refreshImageNameFilterOptions(options?: SearchPaginationSortRequest): Promise<string[]> {+ const severity = resolveSeverityFilter(options);+ const request: SearchPaginationSortRequest = {+ filters: severity ? { severity } : undefined+ };++ try {+ const optionsResponse = await vulnerabilityService.getAllVulnerabilityImageOptions(request);+ imageNameFilterOptions = optionsResponse;+ return optionsResponse;+ } catch (error) {+ console.error('Failed to refresh vulnerability image filter options:', error);+ return imageNameFilterOptions;+ }+ }+async function refreshVulnerabilityTable(options: SearchPaginationSortRequest) {const mergedFilters = { ...(options.filters ?? {}) };if (mergedFilters.vulnSeverity) {@@ -94,7 +131,10 @@filters: Object.keys(mergedFilters).length ? mergedFilters : undefined};- const response = await vulnerabilityService.getAllVulnerabilities(request);+ const [response, optionsResponse] = await Promise.all([+ vulnerabilityService.getAllVulnerabilities(request),+ refreshImageNameFilterOptions(request)+ ]);const page = request.pagination?.page ?? 1;const limit = request.pagination?.limit ?? DEFAULT_PAGE_SIZE;const offset = (page - 1) * limit;@@ -106,6 +146,11 @@}))};vulnerabilities = mapped;++ if (optionsResponse.length === 0) {+ imageNameFilterOptions = deriveImageOptionsFromRows(mapped.data ?? []);+ }+return mapped;}@@ -143,9 +188,9 @@{ accessorKey: 'imageName', title: m.common_image(), sortable: true, cell: ImageCell }] satisfies ColumnSpec<VulnerabilityRow>[]);- const uniqueImageNames = $derived(- [...new Set((vulnerabilities.data ?? []).map((r) => r.imageName || r.imageId).filter(Boolean) as string[])].sort()- );+ onMount(() => {+ void refreshImageNameFilterOptions(requestOptions);+ });const mobileFields = [{ id: 'vulnerabilityId', label: 'CVE', defaultVisible: true },@@ -271,6 +316,6 @@{mobileFields}persistKey="arcane-security-vuln-table"selectionDisabled- imageNameFilterOptions={uniqueImageNames}+ {imageNameFilterOptions}{rowActions}/>