Count total unique vulnerabilities across severities (#3776)

Signed-off-by: Cintia Sanchez Garcia <[email protected]>
artifacthub · Apr 18, 2024 · b48907b · b48907b
1 parent c43ccf9
commit b48907b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/web/src/layout/package/securityReport/Modal.tsx b/web/src/layout/package/securityReport/Modal.tsx
@@ -9,7 +9,6 @@ import API from '../../../api';
 import { FixableVulnerabilitiesInReport, RepositoryKind, SecurityReport, SecurityReportSummary } from '../../../types';
 import alertDispatcher from '../../../utils/alertDispatcher';
 import isFuture from '../../../utils/isFuture';
-import sumObjectValues from '../../../utils/sumObjectValues';
 import {
   filterFixableVulnerabilities,
   prepareFixableSummary,
@@ -86,10 +85,10 @@ const SecurityModal = (props: Props) => {
       const fixableVulnerabilities = filterFixableVulnerabilities(currentReport);
       setFixableReport(fixableVulnerabilities);
       setFixableReportSummary(prepareFixableSummary(fixableVulnerabilities));
-      const uniqueSummary = prepareUniqueVulnerabilitiesSummary(currentReport);
-      setUniqueSummary(uniqueSummary);
-      if (!isNull(uniqueSummary)) {
-        setTotalUniqueVulnerabilities(sumObjectValues(uniqueSummary));
+      const uniqueVulnerabilities = prepareUniqueVulnerabilitiesSummary(currentReport);
+      if (!isNull(uniqueVulnerabilities)) {
+        setUniqueSummary(uniqueVulnerabilities.summary);
+        setTotalUniqueVulnerabilities(uniqueVulnerabilities.total);
       }
       activateTargetWhenIsOnlyOne(currentReport);
       setIsLoading(false);

diff --git a/web/src/layout/package/securityReport/Summary.tsx b/web/src/layout/package/securityReport/Summary.tsx
@@ -25,9 +25,9 @@ const SecuritySummary = (props: Props) => {
   };
 
   const getExtraData = (): JSX.Element => {
-    if (props.totalFixableVulnerabilities > 0 || props.totalUniqueVulnerabilities > 0) {
-      const visibleFixable = props.totalFixableVulnerabilities > 0 && !props.allVulnerabilitiesAreFixable;
+    const visibleFixable = props.totalFixableVulnerabilities > 0 && !props.allVulnerabilitiesAreFixable;
 
+    if (visibleFixable || props.totalUniqueVulnerabilities > 0) {
       return (
         <>
           (

diff --git a/web/src/utils/vulnerabilities.ts b/web/src/utils/vulnerabilities.ts
@@ -38,18 +38,22 @@ const prepareFixableSummary = (
   return fixReport;
 };
 
-const prepareUniqueVulnerabilitiesSummary = (currentReport: SecurityReport | null): SecurityReportSummary | null => {
+const prepareUniqueVulnerabilitiesSummary = (
+  currentReport: SecurityReport | null
+): { summary: SecurityReportSummary; total: number } | null => {
   if (isNull(currentReport)) return null;
 
   const fullReportSumary: SecurityReportSummary = {};
   const summary: any = {};
   const uniqueSummaryReport: SecurityReportSummary = {};
+  const allVulnerabilities: string[] = [];
 
   Object.keys(currentReport).forEach((img: string) => {
     currentReport[img].Results.forEach((target: SecurityReportResult) => {
       if (target.Vulnerabilities) {
         target.Vulnerabilities.forEach((vulnerability: Vulnerability) => {
           const severity = vulnerability.Severity.toLowerCase() as VulnerabilitySeverity;
+          allVulnerabilities.push(vulnerability.VulnerabilityID);
           if (isUndefined(summary[severity])) {
             summary[severity] = [vulnerability.VulnerabilityID];
             fullReportSumary[severity] = 1;
@@ -69,7 +73,7 @@ const prepareUniqueVulnerabilitiesSummary = (currentReport: SecurityReport | nul
   if (isEqual(fullReportSumary, uniqueSummaryReport)) {
     return null;
   } else {
-    return uniqueSummaryReport;
+    return { summary: uniqueSummaryReport, total: new Set(allVulnerabilities).size };
   }
 };