@@ -85,7 +85,6 @@
!image.spec.isBaseImage);
+ } else if (this.selectedImageFilter.value === "includeBaseImages" || this.selectedImageFilter === "includeBaseImages") {
+ filtered = filtered.filter(image => image.spec.isBaseImage);
+ }
+ if (this.selectedCveFilter.value === "affectingCvesOnly" || this.selectedCveFilter === "affectingCvesOnly") {
+ filtered = filtered.filter(image => image.spec.hasAffectedPackages);
+ }
+ this.preprocessedDataset = this.preprocessData(filtered);
+ },
+
+ changeImageFilter(selectedImageFilter) {
+ this.selectedImageFilter = selectedImageFilter;
+ this.applyFilters();
+ },
+
+ changeCveFilter(selectedCveFilter) {
+ this.selectedCveFilter = selectedCveFilter;
+ this.applyFilters();
+ },
+ filterBySeverity(severity) {
+ this.preprocessedDataset.preprocessedImages = _.cloneDeep(this.preprocessedImagesBak);
+ if (severity) {
+ this.preprocessedDataset.preprocessedImages = this.preprocessedDataset.preprocessedImages.filter(image => (image.severity.toLowerCase() === severity.toLowerCase()));
+ }
+ },
onSelectionChange(selected) {
- console.log("selected", selected)
this.selectedRows = selected || [];
},
preprocessData(images) {
+ console.log("images", images);
const severityKeys = ['critical', 'high', 'medium', 'low', 'none'];
const chartData = {};
const repoMap = new Map();
+ const preprocessedImages = [];
for (const key of severityKeys) {
chartData[key] = 0;
@@ -165,10 +211,14 @@
const topRiskyImages = images.map(image => {
let repoRec = {};
+ let imageSeverity = "";
const mapKey = `${image.spec.repository},${image.spec.registry}`;
const currImageScanResult = {};
for (const key of severityKeys) {
currImageScanResult[key] = image.spec.scanResult[key];
+ if (!imageSeverity) {
+ imageSeverity = (image.spec.scanResult[key] || 0) > 0 ? key : "";
+ }
}
if (repoMap.has(mapKey)) {
const currRepo = repoMap.get(mapKey);
@@ -198,8 +248,12 @@
repoMap.set(mapKey, repoRec);
}
for (const key of severityKeys) {
- chartData[key] += image.spec.scanResult[key];
+ chartData[key] += imageSeverity === key ? 1 : 0;
}
+ preprocessedImages.push({
+ ...image,
+ severity: imageSeverity || "none",
+ });
return {
imageName: image.metadata.name,
cveCnt: image.spec.scanResult,
@@ -212,6 +266,7 @@
return 0;
}).slice(0, 5);
return {
+ preprocessedImages,
topRiskyImages,
chartData,
rowsByRepo: Array.from(repoMap.values())
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue
new file mode 100644
index 0000000..5b128ed
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue
@@ -0,0 +1,186 @@
+
+
+
+
row.status === status);
+ this.registryStatusList = this.registryStatusList.filter(item => item.status === status);
+ this.statusSummary = this.statusSummary[status] || {};
+ },
openAddEditRegistry() {
this.$router.push({
name: `${ PRODUCT_NAME }-c-cluster-resource-create`,
@@ -351,6 +357,7 @@
max-width: 900px;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
+ line-clamp: 1;
align-self: stretch;
overflow: hidden;
color: #717179;
@@ -365,7 +372,7 @@
.state-date-time {
overflow: hidden;
-webkit-box-orient: vertical;
- -webkit-line-clamp: 1;
+ line-clamp: 1;
color: #717179;
text-overflow: ellipsis;
font-family: Lato;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue
new file mode 100644
index 0000000..6a56d2b
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue
@@ -0,0 +1,43 @@
+
+
+
+ } An object indicating whether the reload is ready.
+ * Currently, it always returns an object with `reloadReady` set to false.
+ *
+ * @example
+ * // Example usage:
+ * refreshCharts({
+ * store: myStore,
+ * chartName: 'myChart',
+ * retry: 0,
+ * init: true
+ * }).then(result => {
+ * console.log(result.reloadReady); // false
+ * });
+ */
+export async function refreshCharts(
+ config: RefreshConfig
+): Promise {
+ const { store, chartName, init } = config;
+ let retry = config.retry ?? 0;
+
+ while (retry < 3) {
+ const rawCharts = store.getters["catalog/rawCharts"];
+ const chart = (Object.values(rawCharts) as Chart[])?.find(
+ (c) => c?.chartName === chartName
+ );
+
+ if (!chart) {
+ try {
+ // TODO: Add Custom VueX store for neuvector: { refreshingCharts: false }
+ // store.dispatch("neuvector/updateRefreshingCharts", true);
+ await store.dispatch("catalog/refresh");
+ } catch (e) {
+ handleGrowl({ error: e as any, store });
+ } finally {
+ // store.dispatch("neuvector/updateRefreshingCharts", false);
+ }
+
+ if (retry < 2 && !init) {
+ retry++;
+ continue;
+ }
+ }
+ break;
+ }
+
+ return { reloadReady: false };
+}
+
+export function getLatestStableVersion(versions: any[]): string | undefined {
+ const allVersions = versions.map(v => v.version);
+ const stableVersions = versions.filter(v => !v.version.includes('b'));
+
+ if ( isEmpty(stableVersions) && !isEmpty(allVersions) ) {
+ return semver.rsort(allVersions)[0];
+ }
+
+ return stableVersions?.sort((a, b) => {
+ const versionA = a.version.split('.').map(Number);
+ const versionB = b.version.split('.').map(Number);
+
+ for ( let i = 0; i < Math.max(versionA.length, versionB.length); i++ ) {
+ if ( versionA[i] === undefined || versionA[i] < versionB[i] ) {
+ return 1;
+ }
+ if ( versionB[i] === undefined || versionA[i] > versionB[i] ) {
+ return -1;
+ }
+ }
+
+ return 0;
+ })[0];
+}
diff --git a/pkg/sbombastic-image-vulnerability-scanner/utils/handle-growl.ts b/pkg/sbombastic-image-vulnerability-scanner/utils/handle-growl.ts
new file mode 100644
index 0000000..bcd3957
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/utils/handle-growl.ts
@@ -0,0 +1,27 @@
+export interface GrowlConfig {
+ error: {
+ data?: {
+ _statusText: String;
+ message: String;
+ };
+ _statusText: String;
+ message: String;
+ };
+ store?: any;
+ type?: String;
+}
+
+export function handleGrowl(config: GrowlConfig): void {
+ const error = config.error?.data || config.error;
+ const type = config.type || "Error";
+
+ config.store.dispatch(
+ `growl/${type.toLowerCase()}`,
+ {
+ title: error._statusText || type,
+ message: error.message,
+ timeout: 5000,
+ },
+ { root: true }
+ );
+}
@@ -18,6 +19,7 @@
:options="filterImageOptions"
:close-on-select="true"
:multiple="false"
+ @selecting="changeImageFilter"
/>
@@ -35,7 +37,7 @@
+
+
+
+
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
index 02804a4..413d8aa 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
@@ -34,7 +34,7 @@
+
+
+ 
+
+
+ + {{ t("imageScanner.dashboard.appInstall.title") }} +
+
+ {{ t("imageScanner.dashboard.appInstall.description") }}
+
+
+
+
+ {{ t('imageScanner.dashboard.appInstall.reload' ) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts b/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
index 4c123b1..dc9b916 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
@@ -1,12 +1,11 @@
import RegistryDetails from "@pkg/components/RegistryDetails.vue";
-import ComponentDemo from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ComponentDemo.vue";
-import Dashboard from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue";
import ImageOverview from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue";
-import ImageDetails from "@sbombastic-image-vulnerability-scanner/components/ImageDetails.vue";
+import ImageDetails from "@pkg/components/ImageDetails.vue";
import RegistriesConfiguration from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue";
import Vulnerabilities from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Vulnerabilities.vue";
import CreateResource from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/_resource/create.vue";
import ListResource from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/_resource/index.vue";
+import Entry from "@pkg/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue";
import {
PRODUCT_NAME,
PAGE,
@@ -14,9 +13,9 @@ import {
const routes = [
{
- name: `c-cluster-${PRODUCT_NAME}-${PAGE.DASHBOARD}`,
- path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.DASHBOARD}`,
- component: Dashboard,
+ name: `c-cluster-${ PRODUCT_NAME }-${PAGE.DASHBOARD}`,
+ path: `/c/:cluster/${ PRODUCT_NAME }/${PAGE.DASHBOARD}`,
+ component: Entry,
},
{
name: `c-cluster-${PRODUCT_NAME}-${PAGE.IMAGE_OVERVIEW}`,
@@ -33,21 +32,11 @@ const routes = [
path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.VULNERABILITY_OVERVIEW}`,
component: Vulnerabilities,
},
- {
- name: `c-cluster-${PRODUCT_NAME}-demo`,
- path: `/c/:cluster/${PRODUCT_NAME}/demo`,
- component: ComponentDemo,
- },
{
name: `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`,
path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.REGISTRIES}`,
component: RegistriesConfiguration,
},
- {
- name: `c-cluster-${PRODUCT_NAME}-${PAGE.VEX_MANAGEMENT}`,
- path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.VEX_MANAGEMENT}`,
- component: VexManagement,
- },
{
name: `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}-id`,
path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.REGISTRIES}/:ns/:id`,
diff --git a/pkg/sbombastic-image-vulnerability-scanner/types.ts b/pkg/sbombastic-image-vulnerability-scanner/types.ts
index 0a5813f..c708f09 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/types.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/types.ts
@@ -2,3 +2,4 @@ export * from "./types/sbombastic-image-vulnerability-scanner";
export * from "./types/image";
export * from "./types/registry";
export * from "./types/vex";
+export * from "./types/chart";
diff --git a/pkg/sbombastic-image-vulnerability-scanner/types/chart.ts b/pkg/sbombastic-image-vulnerability-scanner/types/chart.ts
new file mode 100644
index 0000000..4d00436
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/types/chart.ts
@@ -0,0 +1,62 @@
+export interface Version {
+ name: string;
+ home?: string;
+ version: string;
+ description: string;
+ keywords?: string[];
+ maintainers?: [
+ {
+ name?: string;
+ email?: string;
+ url?: string;
+ }
+ ];
+ icon?: string;
+ apiVersion: string;
+ appVersion: string;
+ annotations?: { [key: string]: string };
+ kubeVersion: string;
+ dependencies?: [
+ {
+ name?: string;
+ version?: string;
+ repository?: string;
+ condition?: string;
+ }
+ ];
+ type: string;
+ urls?: string[];
+ created?: string;
+ digest?: string;
+ key?: string;
+ repoType?: string;
+ repoName?: string;
+}
+
+export interface Chart {
+ key: string;
+ type: string;
+ id: string;
+ certified?: string;
+ sideLabel?: null;
+ repoType: string;
+ repoName: string;
+ repoNameDisplay?: string;
+ certifiedSort?: number;
+ icon?: string;
+ color?: string;
+ chartType: string;
+ chartName: string;
+ chartNameDisplay?: string;
+ chartDescription?: string;
+ repoKey?: string;
+ versions?: Version[];
+ categories?: string[];
+ deprecated?: boolean;
+ hidden?: boolean;
+ targetNamespace?: string;
+ targetName?: string;
+ provides?: string[];
+ windowsIncompatible?: boolean;
+ deploysOnWindows?: boolean;
+}
diff --git a/pkg/sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner.ts b/pkg/sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner.ts
index b15b1fd..93e2c7a 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner.ts
@@ -1,4 +1,9 @@
export const PRODUCT_NAME = "imageScanner";
+export const SBOMBASTIC = {
+ CONTROLLER: "neuvector",//"sbombastic",
+ SERVICE: "sbombastic-service",
+ SCHEMA: "sbombastic.rancher.io.registry",
+}
export const RESOURCE = {
REGISTRY: "sbombastic.rancher.io.registry",
SCAN_JOB: "sbombastic.rancher.io.scanjob",
diff --git a/pkg/sbombastic-image-vulnerability-scanner/utils/chart.ts b/pkg/sbombastic-image-vulnerability-scanner/utils/chart.ts
new file mode 100644
index 0000000..02a7b5c
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/utils/chart.ts
@@ -0,0 +1,101 @@
+import { Chart } from "@pkg/types";
+import { handleGrowl } from "@pkg/utils/handle-growl";
+import isEmpty from 'lodash/isEmpty';
+import semver from 'semver';
+
+export interface RefreshConfig {
+ store: any;
+ chartName: string;
+ retry?: number;
+ init?: boolean;
+}
+
+export interface ReloadReady {
+ reloadReady: boolean;
+}
+
+/**
+ * Asynchronously refreshes charts by dispatching actions to the store. It attempts to
+ * find a specific chart by its name and, if not found, dispatches actions to refresh
+ * the chart catalog. This method will retry the operation up to a maximum of three times
+ * based on the retry parameter and the presence of the chart.
+ *
+ * @param {RefreshConfig} config - The configuration object for the refresh operation.
+ * @param {any} config.store - The Vuex store instance used for state management.
+ * @param {string} config.chartName - The name of the chart to be refreshed.
+ * @param {number} [config.retry=0] - The current retry attempt count. Defaults to 0.
+ * @param {boolean} [config.init=false] - A flag indicating whether the initial load
+ * should prevent retries. Defaults to false.
+ *
+ * @returns {Promise