Q4 2024 integration branch1 (#122)

checkmarx-ltd · Dec 18, 2024 · 378762e · 378762e
1 parent b792bfa
commit 378762e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@checkmarx/cx-common-js-client",
-  "version": "0.1.89",
+  "version": "0.1.90",
   "description": "Client for interaction with Checkmarx products.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/dto/sca/scaReportResults.ts b/src/dto/sca/scaReportResults.ts
@@ -65,7 +65,7 @@ export class ScaReportResults {
         let sum: number;
         (this._packages || []).forEach(pckg => {
             if (pckg) {
-                sum = pckg.criticalVulnerabilityCount +
+                sum = pckg.criticalVulnerabilityCount != undefined ? pckg.criticalVulnerabilityCount : 0 +
                     pckg.highVulnerabilityCount +
                     pckg.mediumVulnerabilityCount +
                     pckg.lowVulnerabilityCount;

diff --git a/src/services/clients/cxClient.ts b/src/services/clients/cxClient.ts
@@ -649,28 +649,24 @@ export class CxClient {
         const newInfo = (result.newInfoCount > 0 && result.failBuildForNewVulnerabilitiesEnabled) ? " (" + result.newInfoCount + " new)" : "";
         if(result.criticalResults != undefined)
         {
-            this.log.info(`----------------------------Checkmarx Scan Results(CxSAST):-------------------------------
-Critical severity results: ${result.criticalResults}${newCritical}
-High severity results: ${result.highResults}${newHigh}
-Medium severity results: ${result.mediumResults}${newMedium}
-Low severity results: ${result.lowResults}${newLow}
-Info severity results: ${result.infoResults}${newInfo}
-
-Scan results location:  ${result.sastScanResultsLink}
-------------------------------------------------------------------------------------------
-            `);
+            this.log.info(`----------------------------Checkmarx Scan Results(CxSAST):-------------------------------`);
+            this.log.info(`Critical severity results: ${result.criticalResults}${newCritical}`);
+            this.log.info(`High severity results: ${result.highResults}${newHigh}`);
+            this.log.info(`Medium severity results: ${result.mediumResults}${newMedium}`);
+            this.log.info(`Low severity results: ${result.lowResults}${newLow}`);
+            this.log.info(`Info severity results: ${result.infoResults}${newInfo} \n`);
+            this.log.info(`Scan results location:  ${result.sastScanResultsLink}`);
+            this.log.info(`------------------------------------------------------------------------------------------`);
         }
         else
         {
-            this.log.info(`----------------------------Checkmarx Scan Results(CxSAST):-------------------------------
-High severity results: ${result.highResults}${newHigh}
-Medium severity results: ${result.mediumResults}${newMedium}
-Low severity results: ${result.lowResults}${newLow}
-Info severity results: ${result.infoResults}${newInfo}
-
-Scan results location:  ${result.sastScanResultsLink}
-------------------------------------------------------------------------------------------
-            `);
+            this.log.info(`----------------------------Checkmarx Scan Results(CxSAST):-------------------------------`);
+            this.log.info(`High severity results: ${result.highResults}${newHigh}`);
+            this.log.info(`Medium severity results: ${result.mediumResults}${newMedium}`);
+            this.log.info(`Low severity results: ${result.lowResults}${newLow}`);
+            this.log.info(`Info severity results: ${result.infoResults}${newInfo} \n`);
+            this.log.info(`Scan results location:  ${result.sastScanResultsLink}`);
+            this.log.info(`------------------------------------------------------------------------------------------`);
         }
     }
 
@@ -682,7 +678,8 @@ Scan results location:  ${result.sastScanResultsLink}
             JSON.stringify({
                 name: query.$.name,
                 severity: query.$.Severity,
-                resultLength: this.getQueryResultCount(query.Result)
+                resultLength: this.getQueryResultCount(query.Result),
+                SeverityIndex : query.$.SeverityIndex
             })
         ).join(SEPARATOR);
     }
@@ -799,10 +796,7 @@ The Build Failed for the Following Reasons:
 
     private logPolicyCheckSummary(policyCheck: { wasPerformed: boolean; violatedPolicyNames: string[] }) {
         if (policyCheck.wasPerformed) {
-            this.log.info(
-                `-----------------------------------------------------------------------------------------
-Policy Management:
---------------------`);
+            this.log.info(`---------------------------- Policy Management: --------------------`);
             if (policyCheck.violatedPolicyNames.length) {
                 this.log.info('Project policy status: violated');
 
@@ -811,7 +805,7 @@ Policy Management:
             } else {
                 this.log.info('Project policy status: compliant');
             }
-            this.log.info('-----------------------------------------------------------------------------------------');
+            this.log.info('--------------------------------------------------------------------');
         }
     }
 

diff --git a/src/services/clients/scaClient.ts b/src/services/clients/scaClient.ts
@@ -583,10 +583,10 @@ The Build Failed for the Following Reasons:
                 let rules: PolicyRule[] = [];
                 const pol = policy[index];
 
-                this.log.info("  Policy name: " + pol.name + " | Violated:" + pol.isViolated + " | Policy Description: " + pol.description);
+                this.log.info("Policy name: " + pol.name + " | Violated:" + pol.isViolated + " | Policy Description: " + pol.description);
                 rules = pol.rules;
                 rules.forEach((value) => {
-                    this.log.info("     Rule name: " + value.name + " | Violated: " + value.isViolated);
+                    this.log.info("Rule name: " + value.name + " | Violated: " + value.isViolated);
                 });
             }
             this.log.info("-----------------------------------------------------------");
@@ -660,7 +660,7 @@ The Build Failed for the Following Reasons:
     }
 
     private printSummaryResult(summary: ScaSummaryResults) {
-        this.log.info("\n----CxSCA risk report summary----");
+        this.log.info("----CxSCA risk report summary----");
         this.log.info("Created on: " + summary.createdOn);
         this.log.info("Direct packages: " + summary.directPackages);
         this.log.info("Critical vulnerabilities: " + summary.criticalVulnerabilityCount);