Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add fix available filter to the security vulnerabilities table (#3944)
Kyle Mendellbf48ce6eebeb
diff --git a/backend/internal/vulnerability/handler.go b/backend/internal/vulnerability/handler.goindex 7089a18d3..7f526c111 100644--- a/backend/internal/vulnerability/handler.go+++ b/backend/internal/vulnerability/handler.go@@ -73,9 +73,10 @@ type ListAllVulnerabilitiesInput struct {Start int `query:"start" doc:"Start offset"`Limit int `query:"limit" doc:"Limit"`- Severity string `query:"severity" doc:"Comma-separated severity filter"`- ImageName string `query:"imageName" doc:"Filter by image/repo name (substring)"`- Ignored bool `query:"ignored" doc:"Show only ignored vulnerabilities instead of active ones"`+ Severity string `query:"severity" doc:"Comma-separated severity filter"`+ ImageName string `query:"imageName" doc:"Filter by image/repo name (substring)"`+ Ignored bool `query:"ignored" doc:"Show only ignored vulnerabilities instead of active ones"`+ FixAvailable bool `query:"fixAvailable" doc:"Show only vulnerabilities with a fixed version"`}// ExportVulnerabilitiesInput carries the list filters accepted by the CSV export.@@ -85,9 +86,10 @@ type ExportVulnerabilitiesInput struct {Sort string `query:"sort" doc:"Sort field"`Order string `query:"order" doc:"Sort order"`- Severity string `query:"severity" doc:"Comma-separated severity filter"`- ImageName string `query:"imageName" doc:"Filter by image/repo name (substring)"`- Ignored bool `query:"ignored" doc:"Export only ignored vulnerabilities instead of active ones"`+ Severity string `query:"severity" doc:"Comma-separated severity filter"`+ ImageName string `query:"imageName" doc:"Filter by image/repo name (substring)"`+ Ignored bool `query:"ignored" doc:"Export only ignored vulnerabilities instead of active ones"`+ FixAvailable bool `query:"fixAvailable" doc:"Export only vulnerabilities with a fixed version"`}type ListAllVulnerabilityImageOptionsInput struct {@@ -430,6 +432,9 @@ func (input *ListAllVulnerabilitiesInput) queryParamsInternal() pagination.Queryif input.Ignored {params.Filters["ignored"] = "true"}+ if input.FixAvailable {+ params.Filters["fixAvailable"] = "true"+ }return params}@@ -462,6 +467,7 @@ func (h *VulnerabilityHandler) ExportVulnerabilities(ctx context.Context, inputSeverity: input.Severity,ImageName: input.ImageName,Ignored: input.Ignored,+ FixAvailable: input.FixAvailable,}).queryParamsInternal()items, err := h.vulnerabilityService.ExportVulnerabilities(ctx, input.EnvironmentID, params)if err != nil {diff --git a/backend/internal/vulnerability/vulnerability_query.go b/backend/internal/vulnerability/vulnerability_query.goindex f014ee72f..ab29c546e 100644--- a/backend/internal/vulnerability/vulnerability_query.go+++ b/backend/internal/vulnerability/vulnerability_query.go@@ -340,6 +340,9 @@ func (s *VulnerabilityService) listAllVulnerabilitiesQueryInternal(ctx context.Cbase = base.Session(&gorm.Session{})q := pagination.ApplyFilter(base, "vulnerability_scan_items.severity", strings.ToUpper(params.Filters["severity"]))+ if params.Filters["fixAvailable"] == "true" {+ q = q.Where("vulnerability_scan_items.fixed_version <> ''")+ }if imageNameParts := splitNonEmptyCSVInternal(params.Filters["imageName"]); len(imageNameParts) > 0 {clauses := make([]string, 0, len(imageNameParts))args := make([]any, 0, len(imageNameParts))diff --git a/frontend/src/lib/utils/vulnerability.ts b/frontend/src/lib/utils/vulnerability.tsindex a506e4d0c..4b08ca6bc 100644--- a/frontend/src/lib/utils/vulnerability.ts+++ b/frontend/src/lib/utils/vulnerability.ts@@ -50,10 +50,15 @@ export function getSeverityIconVariant(severity: string): VulnerabilitySeverityIreturn severityDisplay.get(severity)?.icon ?? 'gray';}-export function withIgnoredFilter(options: SearchPaginationSortRequest, showIgnored: boolean): SearchPaginationSortRequest {+export function withVulnerabilityToggles(+ options: SearchPaginationSortRequest,+ toggles: { showIgnored: boolean; fixAvailable: boolean }+): SearchPaginationSortRequest {const filters = { ...options.filters };- if (showIgnored) filters['ignored'] = 'true';+ if (toggles.showIgnored) filters['ignored'] = 'true';else delete filters['ignored'];+ if (toggles.fixAvailable) filters['fixAvailable'] = 'true';+ else delete filters['fixAvailable'];return { ...options, filters: Object.keys(filters).length ? filters : undefined };}diff --git a/frontend/src/routes/(app)/security/+page.svelte b/frontend/src/routes/(app)/security/+page.svelteindex 5f69b7502..49ad43a54 100644--- a/frontend/src/routes/(app)/security/+page.svelte+++ b/frontend/src/routes/(app)/security/+page.svelte@@ -22,7 +22,7 @@import { environmentStore } from '#lib/stores/environment.store.svelte.js';import { activityStore } from '#lib/stores/activity.store.svelte.js';import { hasPermission } from '#lib/utils/auth.js';- import { mapVulnerabilityPage, mapVulnerabilityRequest, withIgnoredFilter } from '#lib/utils/vulnerability.js';+ import { mapVulnerabilityPage, mapVulnerabilityRequest, withVulnerabilityToggles } from '#lib/utils/vulnerability.js';import { useUrlTab } from '#lib/hooks/use-url-tab.svelte.js';let { data } = $props();@@ -34,10 +34,15 @@let vulnerabilities = $derived<Paginated<VulnerabilityRow>>(data.vulnerabilities);let requestOptions = $derived<SearchPaginationSortRequest>(data.vulnerabilityRequestOptions);let showIgnored = $state(false);+ let fixAvailable = $state(false);function toggleIgnored(next: boolean) {showIgnored = next;}++ function toggleFixAvailable(next: boolean) {+ fixAvailable = next;+ }let isLoading = $state({ refreshing: false, scanningAll: false });let scanProgress = $state({ current: 0, total: 0 });const urlTab = useUrlTab({@@ -114,7 +119,7 @@}await featureStore.refresh(requestedEnvId);if (requestedEnvId !== currentEnvId || !vulnerabilityManagementEnabled) return;- const requestForApi = mapVulnerabilityRequest(withIgnoredFilter(requestOptions, showIgnored));+ const requestForApi = mapVulnerabilityRequest(withVulnerabilityToggles(requestOptions, { showIgnored, fixAvailable }));await parallelRefresh({summary: {@@ -410,6 +415,8 @@bind:requestOptions{showIgnored}onToggleIgnored={toggleIgnored}+ {fixAvailable}+ onToggleFixAvailable={toggleFixAvailable}/></div></Tabs.Content>diff --git a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte b/frontend/src/routes/(app)/security/security-vulnerability-table.svelteindex 463ae24ab..0ce15501b 100644--- a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte+++ b/frontend/src/routes/(app)/security/security-vulnerability-table.svelte@@ -32,7 +32,7 @@mapVulnerabilityPage,mapVulnerabilityRequest,resolveSeverityFilter,- withIgnoredFilter+ withVulnerabilityToggles} from '#lib/utils/vulnerability.js';type VulnerabilityRow = VulnerabilityWithImage & { id: string };@@ -41,12 +41,16 @@vulnerabilities = $bindable(),requestOptions = $bindable(),showIgnored = false,- onToggleIgnored+ onToggleIgnored,+ fixAvailable = false,+ onToggleFixAvailable}: {vulnerabilities: Paginated<VulnerabilityRow>;requestOptions: SearchPaginationSortRequest;showIgnored?: boolean;onToggleIgnored?: (checked: boolean) => void | Promise<void>;+ fixAvailable?: boolean;+ onToggleFixAvailable?: (checked: boolean) => void | Promise<void>;} = $props();let imageNameFilterOptions = $state<string[]>([]);@@ -108,7 +112,7 @@async function refreshVulnerabilityTable(options: SearchPaginationSortRequest) {if (!vulnerabilityManagementEnabled) return vulnerabilities;const requestedEnvId = currentEnvId;- const request = mapVulnerabilityRequest(withIgnoredFilter(options, showIgnored));+ const request = mapVulnerabilityRequest(withVulnerabilityToggles(options, { showIgnored, fixAvailable }));const [response, optionsResponse] = await Promise.all([vulnerabilityService.getAllVulnerabilitiesForEnvironment(requestedEnvId, request),@@ -128,7 +132,9 @@async function handleExportCsv() {if (!vulnerabilityManagementEnabled) return;const requestedEnvId = currentEnvId;- const request = mapVulnerabilityRequest(withIgnoredFilter({ ...requestOptions, pagination: undefined }, showIgnored));+ const request = mapVulnerabilityRequest(+ withVulnerabilityToggles({ ...requestOptions, pagination: undefined }, { showIgnored, fixAvailable })+ );const operationResult = await tryCatch(vulnerabilityService.exportVulnerabilitiesForEnvironment(requestedEnvId, request));if (!mounted || requestedEnvId !== currentEnvId) return;if (operationResult.error !== null) {@@ -310,6 +316,21 @@{m.vuln_show_ignored()}</Label></div>+ <div+ class="flex min-h-9 w-full items-center gap-2 rounded-md border border-border/60 bg-muted/30 px-2.5 py-1.5 md:w-auto md:border-0 md:bg-transparent md:px-1 md:py-0"+ >+ <Switch+ id="security-fix-available"+ checked={fixAvailable}+ onCheckedChange={async (checked) => {+ await onToggleFixAvailable?.(checked === true);+ await refreshVulnerabilityTable(requestOptions);+ }}+ />+ <Label for="security-fix-available" class="mb-0 min-w-0 text-sm font-medium text-muted-foreground">+ {m.security_fixable()}+ </Label>+ </div><ArcaneButtonaction="base"size="sm"