diff --git a/cxAstScan/dist/tsconfig.tsbuildinfo b/cxAstScan/dist/tsconfig.tsbuildinfo new file mode 100644 index 00000000..8bb41a43 --- /dev/null +++ b/cxAstScan/dist/tsconfig.tsbuildinfo @@ -0,0 +1 @@ +{"root":["../cleanup.ts","../index.ts","../services/cleanuprunner.ts","../services/taskrunner.ts","../services/utils.ts","../test/_suite.ts","../test/failure_additional_params.ts","../test/failure_custom_source_file_not_exist_file.ts","../test/failure_wrong_preset.ts","../test/success_api_key.ts","../test/success_cancel.ts","../test/success_custom_source_file.ts","../test/success_no_cancel.ts","../test/success_nowait.ts","../test/success_waitmode.ts"],"version":"5.6.3"} \ No newline at end of file diff --git a/cxAstScan/package-lock.json b/cxAstScan/package-lock.json index edac6f01..a336e904 100644 --- a/cxAstScan/package-lock.json +++ b/cxAstScan/package-lock.json @@ -5,15 +5,14 @@ "packages": { "": { "dependencies": { - "@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli": "1.0.19", + "@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli": "file:../../ast-cli-javascript-wrapper-runtime-cli/CheckmarxDev-ast-cli-javascript-wrapper-runtime-cli-1.0.19.tgz", "azure-pipelines-task-lib": "4.17.3" } }, - "node_modules/@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli": { - "name": "@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli", + "node_modules/@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli": { "version": "1.0.19", - "resolved": "https://npm.pkg.github.com/download/@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli/1.0.19/30e6565e194c8bceabd38c57196683262ccedad4", - "integrity": "sha512-HhVcpbOoLUmW9u9DEUwBuHTBnu7pNKnUo6Nts1e5NeKD9rBtsZPCEl4T3/33WNhp/DT5gabmffDQZNwp8mdpBA==", + "resolved": "file:../../ast-cli-javascript-wrapper-runtime-cli/CheckmarxDev-ast-cli-javascript-wrapper-runtime-cli-1.0.19.tgz", + "integrity": "sha512-gw598tUu9yXjfg+48qTM+W9WRIAb+D5u/cpMSJNyx6Xaogmm+2GLth9Y9jDfdnhnl8nmYdcwTB+UKCMXvr98jw==", "license": "ISC", "dependencies": { "async-mutex": "^0.5.0", @@ -25,7 +24,7 @@ "unzipper": "^0.12.3" } }, - "node_modules/@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli/node_modules/agent-base": { + "node_modules/@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli/node_modules/agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", @@ -34,7 +33,7 @@ "node": ">= 14" } }, - "node_modules/@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli/node_modules/https-proxy-agent": { + "node_modules/@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli/node_modules/https-proxy-agent": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", @@ -1591,10 +1590,9 @@ } }, "dependencies": { - "@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli": { - "version": "npm:@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli@1.0.19", - "resolved": "https://npm.pkg.github.com/download/@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli/1.0.19/30e6565e194c8bceabd38c57196683262ccedad4", - "integrity": "sha512-HhVcpbOoLUmW9u9DEUwBuHTBnu7pNKnUo6Nts1e5NeKD9rBtsZPCEl4T3/33WNhp/DT5gabmffDQZNwp8mdpBA==", + "@CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli": { + "version": "file:../../ast-cli-javascript-wrapper-runtime-cli/CheckmarxDev-ast-cli-javascript-wrapper-runtime-cli-1.0.19.tgz", + "integrity": "sha512-gw598tUu9yXjfg+48qTM+W9WRIAb+D5u/cpMSJNyx6Xaogmm+2GLth9Y9jDfdnhnl8nmYdcwTB+UKCMXvr98jw==", "requires": { "async-mutex": "^0.5.0", "azure-pipelines-tool-lib": "^2.0.8", diff --git a/cxAstScan/package.json b/cxAstScan/package.json index c2e182bb..f9901129 100644 --- a/cxAstScan/package.json +++ b/cxAstScan/package.json @@ -1,9 +1,10 @@ { "dependencies": { - "azure-pipelines-task-lib": "4.17.3", - "@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli": "1.0.19" + + "@checkmarxdev/ast-cli-javascript-wrapper-runtime-cli": "1.0.20-rc-resolver3.0", + "azure-pipelines-task-lib": "4.17.3" }, "overrides": { "semver": "^7.5.2" } -} \ No newline at end of file +} diff --git a/cxAstScan/task.json b/cxAstScan/task.json index 6aa725cc..841ba565 100644 --- a/cxAstScan/task.json +++ b/cxAstScan/task.json @@ -1,5 +1,5 @@ { - "id": "dd862edc-5d88-4d2c-b83b-fff2a695e5c0", + "id": "36163054-f6de-4009-a427-db24681e56b6", "name": "Checkmarx AST", "friendlyName": "Checkmarx AST", "description": "Add Secure Source Code Analysis inside your build process", diff --git a/cxAstScan/test/data/WebGoat name with spaces.zip b/cxAstScan/test/data/WebGoat name with spaces.zip deleted file mode 100644 index 55f80964..00000000 Binary files a/cxAstScan/test/data/WebGoat name with spaces.zip and /dev/null differ diff --git a/cxAstScan/test/success_custom_source_file_with_whitespaces.ts b/cxAstScan/test/success_custom_source_file_with_whitespaces.ts deleted file mode 100644 index 769edb38..00000000 --- a/cxAstScan/test/success_custom_source_file_with_whitespaces.ts +++ /dev/null @@ -1,20 +0,0 @@ -import tmrm = require('azure-pipelines-task-lib/mock-run'); -import path = require('path'); -import * as process from "process"; - -const taskPath = path.join(__dirname, '..', 'index.js'); -const tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath); -tmr.setInput("tenantName", process.env.CX_TENANT!); -tmr.setInput("CheckmarxService", "cxauth"); -tmr.registerMockExport('getEndpointUrl', () => { return process.env.CX_BASE_URI!; }); -tmr.registerMockExport('getEndpointAuthorizationParameter', (endpoint, key) => { - if (key === 'username') return process.env.CX_CLIENT_ID! - if (key === 'password') return process.env.CX_CLIENT_SECRET! - - return ""; -}); - -tmr.setInput("projectName", 'TestADO_CustomSourceFile'); -tmr.setInput("branchName", 'main'); -tmr.setInput("additionalParams", '-s "cxAstScan/test/data/WebGoat name with spaces.zip" --scan-types iac-security'); -tmr.run(); \ No newline at end of file diff --git a/vss-extension.json b/vss-extension.json index 6b73cb05..af933e4a 100644 --- a/vss-extension.json +++ b/vss-extension.json @@ -1,8 +1,8 @@ { "manifestVersion": 1, "id": "checkmarx-ast-azure-plugin", - "publisher": "Checkmarx", - "version": "dev", + "publisher": "checkmarx-elchanan", + "version": "1.3.4", "name": "Checkmarx AST", "targets": [ { @@ -99,7 +99,7 @@ "height": "175%", "width": "100%", "supportsTasks": [ - "dd862edc-5d88-4d2c-b83b-fff2a695e5c0" + "36163054-f6de-4009-a427-db24681e56b6" ] } }, @@ -111,7 +111,7 @@ "ms.vss-endpoint.endpoint-types" ], "properties": { - "name": "CheckmarxASTService", + "name": "checkmarx-elchanan", "displayName": "Checkmarx One Service Connection", "authenticationSchemes": [ {