Update Vorpal Name to ASCA(AST-65647) (#759)

cx-miryam-foifer · github-actions · cx-ben-alvo · web-flow · commit ed9e9ae89c72 · 2024-09-23T14:58:54.000+03:00
* Update Vorpal Name to ASCA

* update ast-cli to pre-release version

* update ast-cli to pre-release version - 2

* Track Checkmarx CLI binaries with Git LFS

* Update checkmarx-ast-cli to 2.2.6

---------

Co-authored-by: github-actions &lt;github-actions@github.com&gt;
Co-authored-by: AlvoBen &lt;144705560+AlvoBen@users.noreply.github.com&gt;
Co-authored-by: AlvoBen &lt;alvo@post.bgu.ac.il&gt;
diff --git a/checkmarx-ast-cli.version b/checkmarx-ast-cli.version
@@ -1 +1 @@
-2.2.5
+2.2.6
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/main/asca/AscaScanDetail.ts b/src/main/asca/AscaScanDetail.ts
@@ -1,4 +1,4 @@
-export default class VorpalScanDetail {
+export default class AscaScanDetail {
     ruleId: number;
     language: string;
     ruleName: string;
diff --git a/src/main/asca/CxAsca.ts b/src/main/asca/CxAsca.ts
@@ -1,10 +1,10 @@
-import VorpalScanDetail from "./VorpalScanDetail";
+import AscaScanDetail from "./AscaScanDetail";
 
-export default class CxVorpal {
+export default class CxAsca {
     requestId: string;
     status: boolean;
     message: string;
-    scanDetails: VorpalScanDetail[];
+    scanDetails: AscaScanDetail[];
     error: any;
 
     constructor() {
@@ -15,16 +15,16 @@ export default class CxVorpal {
         this.error = null;
     }
 
-    static parseScan(resultObject: any): CxVorpal {
-        const scan = new CxVorpal();
+    static parseScan(resultObject: any): CxAsca {
+        const scan = new CxAsca();
         scan.requestId = resultObject.request_id;
         scan.status = resultObject.status;
         scan.message = resultObject.message;
         scan.error = resultObject.error;
 
         if (resultObject.scan_details instanceof Array) {
             scan.scanDetails = resultObject.scan_details.map((detail: any) => {
-                const scanDetail = new VorpalScanDetail();
+                const scanDetail = new AscaScanDetail();
                 scanDetail.ruleId = detail.rule_id;
                 scanDetail.language = detail.language;
                 scanDetail.ruleName = detail.rule_name;
diff --git a/src/main/wrapper/CxConstants.ts b/src/main/wrapper/CxConstants.ts
@@ -65,9 +65,9 @@ export enum CxConstants {
     FORMAT_HTML_CLI = "summaryHTML",
     FILTER = "--filter",
     SCAN_ID = "--scan-id",
-    CMD_VORPAL = "vorpal",
+    CMD_ASCA = "asca",
     SOURCE_FILE = "--file-source",
-    VORPAL_UPDATE_VERSION = "--vorpal-latest-version",
+    ASCA_UPDATE_VERSION = "--asca-latest-version",
     PROJECT_ID = "--project-id",
     SIMILARITY_ID = "--similarity-id",
     QUERY_ID = "--query-id",
@@ -81,7 +81,7 @@ export enum CxConstants {
     ADDITONAL_PARAMS = "--additional-params",
     ENGINE = "--engine",
     SCAN_TYPE = "CxScan",
-    SCAN_VORPAL = "CxVorpal",
+    SCAN_ASCA = "CxAsca",
     PROJECT_TYPE = "CxProject",
     PREDICATE_TYPE = "CxPredicate",
     CODE_BASHING_TYPE = "CxCodeBashing",
diff --git a/src/main/wrapper/CxWrapper.ts b/src/main/wrapper/CxWrapper.ts
@@ -125,11 +125,11 @@ export class CxWrapper {
         return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_TYPE);
     }
 
-    async scanVorpal(sourceFile: string, updateVersion = false, agent?: string | null): Promise<CxCommandOutput> {
-        const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.CMD_VORPAL, CxConstants.SOURCE_FILE, sourceFile];
+    async scanAsca(sourceFile: string, updateVersion = false, agent?: string | null): Promise<CxCommandOutput> {
+        const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.CMD_ASCA, CxConstants.SOURCE_FILE, sourceFile];
 
         if (updateVersion) {
-            commands.push(CxConstants.VORPAL_UPDATE_VERSION);
+            commands.push(CxConstants.ASCA_UPDATE_VERSION);
         }
         if (agent) {
             commands.push(CxConstants.AGENT);
@@ -144,7 +144,7 @@ export class CxWrapper {
 
         commands.push(...this.initializeCommands(false));
         const exec = new ExecutionService();
-        return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_VORPAL);
+        return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_ASCA);
     }
 
     async scanCancel(id: string): Promise<CxCommandOutput> {
diff --git a/src/main/wrapper/ExecutionService.ts b/src/main/wrapper/ExecutionService.ts
@@ -22,7 +22,7 @@ import CxKicsRemediation from "../remediation/CxKicsRemediation";
 import CxScaRealTime from "../scaRealtime/CxScaRealTime";
 import CxChat from "../chat/CxChat";
 import CxMask from "../mask/CxMask";
-import CxVorpal from "../vorpal/CxVorpal";
+import CxAsca from "../asca/CxAsca";
 
 let skipValue = false;
 const fileSourceFlag = "--file-source"
@@ -200,9 +200,9 @@ export class ExecutionService {
                   const scans = CxScan.parseProject(resultObject);
                   cxCommandOutput.payload = scans;
                   break;
-                case CxConstants.SCAN_VORPAL:
-                    const vorpal = CxVorpal.parseScan(resultObject);
-                    cxCommandOutput.payload = [vorpal];
+                case CxConstants.SCAN_ASCA:
+                    const asca = CxAsca.parseScan(resultObject);
+                    cxCommandOutput.payload = [asca];
                     break;
                 case CxConstants.PROJECT_TYPE:
                   const projects = CxProject.parseProject(resultObject);
diff --git a/src/main/wrapper/resources/cx-linux b/src/main/wrapper/resources/cx-linux
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6278ef630e389a6f879ae7e62faeabd881a30b2f9aa99aa4ab03ef930d56f509
-size 66142360
+oid sha256:84c22ba2aac3a10fdbcdc4a497b90b1f19cfac05903734726505f3f07d651c42
+size 66171032
diff --git a/src/main/wrapper/resources/cx-mac b/src/main/wrapper/resources/cx-mac
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2eab522ea2a7dbd61620b882b0957e5ebac3fc4af00993b7963385a230ad79a
-size 133984944
+oid sha256:17d7887c19d7cae0b63c62eaa7f17ef85a1726ae4e9ab62405d73346de450875
+size 134051856
diff --git a/src/main/wrapper/resources/cx.exe b/src/main/wrapper/resources/cx.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e0b92a2b5bfcf1368d470e016e857c7724e5cfe8bbe4c183a05f27dc36128cc
-size 67910536
+oid sha256:71cad5fe4002448c9b9af6c8f9e61edb85c182186ac834a4300ba846b26612f7
+size 67934600
diff --git a/src/tests/ScanTest.test.ts b/src/tests/ScanTest.test.ts
@@ -125,40 +125,40 @@ describe("ScanCreate cases", () => {
         expect(aiEnabled).toBeDefined();
     })
 
-    it('ScanVorpal fail case Without extensions', async () => {
+    it('ScanAsca fail case Without extensions', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const cxCommandOutput: CxCommandOutput = await auth.scanVorpal("tsc/tests/data/python-file");
+        const cxCommandOutput: CxCommandOutput = await auth.scanAsca("tsc/tests/data/python-file");
         console.log(" Json object from failure case: " + JSON.stringify(cxCommandOutput));
 
         expect(cxCommandOutput.payload[0].error.description).toEqual("The file name must have an extension.");
         expect(cxCommandOutput.exitCode).toBe(0);
         expect(cxCommandOutput.payload[0].status).toBeUndefined();
     });
 
-    it('ScanVorpal Successful case', async () => {
+    it('ScanAsca Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const cxCommandOutput: CxCommandOutput = await auth.scanVorpal("tsc/tests/data/python-vul-file.py");
-        console.log("Json object from scanVorpal successful case: " + JSON.stringify(cxCommandOutput));
+        const cxCommandOutput: CxCommandOutput = await auth.scanAsca("tsc/tests/data/python-vul-file.py");
+        console.log("Json object from scanAsca successful case: " + JSON.stringify(cxCommandOutput));
         const scanObject = cxCommandOutput.payload.pop();
         expect(cxCommandOutput.payload).toBeDefined();
         expect(cxCommandOutput.exitCode).toBe(0);
         expect(scanObject.status).toEqual(true);
     });
 
-    it('ScanVorpal with complex name Successful case', async () => {
+    it('ScanAsca with complex name Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const cxCommandOutput: CxCommandOutput = await auth.scanVorpal("tsc/tests/data/var express = require('express';.js");
-        console.log("Json object from scanVorpal successful case: " + JSON.stringify(cxCommandOutput));
+        const cxCommandOutput: CxCommandOutput = await auth.scanAsca("tsc/tests/data/var express = require('express';.js");
+        console.log("Json object from scanAsca successful case: " + JSON.stringify(cxCommandOutput));
         const scanObject = cxCommandOutput.payload.pop();
         expect(cxCommandOutput.payload).toBeDefined();
         expect(cxCommandOutput.exitCode).toBe(0);
         expect(scanObject.status).toEqual(true);
     });
 
-    it('ScanVorpal Successful case with update version', async () => {
+    it('ScanAsca Successful case with update version', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const cxCommandOutput: CxCommandOutput = await auth.scanVorpal("tsc/tests/data/python-vul-file.py", true);
-        console.log("Json object from scanVorpal successful case with update version: " + JSON.stringify(cxCommandOutput));
+        const cxCommandOutput: CxCommandOutput = await auth.scanAsca("tsc/tests/data/python-vul-file.py", true);
+        console.log("Json object from scanAsca successful case with update version: " + JSON.stringify(cxCommandOutput));
         const scanObject = cxCommandOutput.payload.pop();
         expect(cxCommandOutput.payload).toBeDefined();
         expect(cxCommandOutput.exitCode).toBe(0);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export default class VorpalScanDetail {`
	`1`	`+export default class AscaScanDetail {`
`2`	`2`	`ruleId: number;`
`3`	`3`	`language: string;`
`4`	`4`	`ruleName: string;`
Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,11 @@ export class CxWrapper {`
`125`	`125`	`return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_TYPE);`
`126`	`126`	`}`
`127`	`127`
`128`		`- async scanVorpal(sourceFile: string, updateVersion = false, agent?: string \| null): Promise<CxCommandOutput> {`
`129`		`- const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.CMD_VORPAL, CxConstants.SOURCE_FILE, sourceFile];`
	`128`	`+ async scanAsca(sourceFile: string, updateVersion = false, agent?: string \| null): Promise<CxCommandOutput> {`
	`129`	`+ const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.CMD_ASCA, CxConstants.SOURCE_FILE, sourceFile];`
`130`	`130`
`131`	`131`	`if (updateVersion) {`
`132`		`- commands.push(CxConstants.VORPAL_UPDATE_VERSION);`
	`132`	`+ commands.push(CxConstants.ASCA_UPDATE_VERSION);`
`133`	`133`	`}`
`134`	`134`	`if (agent) {`
`135`	`135`	`commands.push(CxConstants.AGENT);`
`@@ -144,7 +144,7 @@ export class CxWrapper {`
`144`	`144`
`145`	`145`	`commands.push(...this.initializeCommands(false));`
`146`	`146`	`const exec = new ExecutionService();`
`147`		`- return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_VORPAL);`
	`147`	`+ return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_ASCA);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`async scanCancel(id: string): Promise<CxCommandOutput> {`