@contrast/contrast 2.0.2-beta.1 → 2.0.2-beta.11

package/dist/scan/help.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/scan/help.js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC7C;QACE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC;KACnC;IACD;QACE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC;KAC9B;IACD;QACE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,8BAA8B,CAAC;QAC/C,OAAO,EAAE;YACP,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,4CAA4C,CAAC,GAAG,GAAG;YACtE,IAAI,CAAC,EAAE,CAAC,+BAA+B,CAAC;YACxC,EAAE;YACF,IAAI,CAAC,EAAE,CAAC,2BAA2B,CAAC;YACpC,IAAI,CAAC,EAAE,CAAC,kCAAkC,CAAC;SAC5C;KACF;IACD;QACE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC;QACvC,UAAU,EAAE,sBAAsB,CAAC,qBAAqB;QACxD,IAAI,EAAE;YACJ,YAAY;YACZ,iBAAiB;YACjB,SAAS;YACT,eAAe;YACf,MAAM;YACN,OAAO;YACP,MAAM;YACN,IAAI;YACJ,kBAAkB;YAClB,KAAK;YACL,QAAQ;YACR,MAAM;YACN,SAAS;YACT,OAAO;YACP,cAAc;SACf;KACF;IACD;QACE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC;QAC3C,UAAU,EAAE,sBAAsB,CAAC,oCAAoC;KACxE;IACD,eAAe,EAAE,CAAC,CAAC,CAAC;IACpB,eAAe,EAAE,CAAC,CAAC,CAAC;IACpB,eAAe,EAAE,CAAC,CAAC,CAAC;CACrB,CAAC,CAAA"}

package/dist/scan/models/groupedResultsModel.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupedResultsModel = void 0;
-class GroupedResultsModel {
+export class GroupedResultsModel {
     constructor(ruleId) {
         this.ruleId = ruleId;
         this.colour = '#999999';
         this.codePathSet = new Set();
     }
 }
-exports.GroupedResultsModel = GroupedResultsModel;
+//# sourceMappingURL=groupedResultsModel.js.map

package/dist/scan/models/groupedResultsModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"groupedResultsModel.js","sourceRoot":"","sources":["../../../src/scan/models/groupedResultsModel.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,mBAAmB;IAc9B,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACtC,CAAC;CACF"}

package/dist/scan/models/resultContentModel.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
+//# sourceMappingURL=resultContentModel.js.map

package/dist/scan/models/resultContentModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resultContentModel.js","sourceRoot":"","sources":["../../../src/scan/models/resultContentModel.ts"],"names":[],"mappings":""}

package/dist/scan/models/scanResultsModel.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScanResultsModel = void 0;
-class ScanResultsModel {
+export class ScanResultsModel {
     constructor(scan) {
         this.projectOverview = scan.projectOverview;
         this.scanDetail = scan.scanDetail;
@@ -10,4 +7,4 @@ class ScanResultsModel {
         this.newProject = scan.newProject;
     }
 }
-exports.ScanResultsModel = ScanResultsModel;
+//# sourceMappingURL=scanResultsModel.js.map

package/dist/scan/models/scanResultsModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanResultsModel.js","sourceRoot":"","sources":["../../../src/scan/models/scanResultsModel.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAM3B,YAAY,IAAS;QACnB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAkC,CAAA;QAC9D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAwB,CAAA;QAC/C,IAAI,CAAC,oBAAoB;YACvB,IAAI,CAAC,oBAA4C,CAAA;QACnD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;IACnC,CAAC;CACF"}

package/dist/scan/populateProjectIdAndProjectName.js

@@ -1,66 +1,28 @@
-"use strict";
-const commonApi = require('../utils/commonApi.js');
-const i18n = require('i18n');
-const populateProjectId = async (config) => {
-    const client = commonApi.getHttpClient(config);
-    let proj = await createProjectId(config, client);
-    if (proj === undefined) {
-        proj = await getExistingProjectIdByName(config, client).then(res => {
-            return res;
-        });
-        return { projectId: proj, isNewProject: false };
-    }
-    return { projectId: proj, isNewProject: true };
-};
-const createProjectId = async (config, client) => {
-    return client
-        .createProjectId(config)
-        .then(res => {
-        if (res.statusCode === 409) {
-            console.log(i18n.__('foundExistingProjectScan'));
-            return;
-        }
-        if (res.statusCode === 403) {
-            console.log(i18n.__('permissionsError'));
-            process.exit(1);
-            return;
-        }
-        if (res.statusCode === 429) {
-            console.log(i18n.__('exceededFreeTier'));
-            process.exit(1);
-            return;
-        }
-        if (res.statusCode === 201) {
-            console.log(i18n.__('projectCreatedScan'));
-            if (config.verbose) {
-                console.log(i18n.__('populateProjectIdMessage', res.body.id));
-            }
-            return res.body.id;
+import i18n from 'i18n';
+import { createProjectId, getProjectIdByName } from './scanRequests.js';
+export const populateProjectId = async (config) => {
+    try {
+        const projRes = (await createProjectId(config));
+        console.log(i18n.__('projectCreatedScan'));
+        if (config.debug) {
+            // @ts-ignore
+            console.log(i18n.__('populateProjectIdMessage', projRes.body.id));
         }
-    })
-        .catch(err => {
-        if (config.verbose) {
-            console.log(err);
-        }
-        console.log(i18n.__('connectionError'));
-        process.exit(0);
-    });
-};
-const getExistingProjectIdByName = async (config, client) => {
-    return client
-        .getProjectIdByName(config)
-        .then(res => {
-        if (res.statusCode === 200) {
-            if (config.verbose) {
-                console.log(i18n.__('populateProjectIdMessage', res.body.content[0].id));
+        // @ts-ignore
+        const projResId = projRes.body.id;
+        return { projectId: projResId, isNewProject: true };
+    }
+    catch (err) {
+        if (err.response.statusCode === 409) {
+            const proj = (await getProjectIdByName(config));
+            // @ts-ignore
+            const existingProjectId = proj.body.content[0].id;
+            if (config.debug) {
+                console.log(i18n.__('populateProjectIdMessage', existingProjectId));
             }
-            return res.body.content[0].id;
+            console.log(i18n.__('foundExistingProjectScan'));
+            return { projectId: existingProjectId, isNewProject: false };
         }
-    })
-        .catch(err => {
-        console.log(err);
-    });
-};
-module.exports = {
-    populateProjectId: populateProjectId
+    }
 };
+//# sourceMappingURL=populateProjectIdAndProjectName.js.map

package/dist/scan/populateProjectIdAndProjectName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"populateProjectIdAndProjectName.js","sourceRoot":"","sources":["../../src/scan/populateProjectIdAndProjectName.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAGvE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAAW,EAAE,EAAE;IACrD,IAAI;QACF,MAAM,OAAO,GAAG,CAAC,MAAM,eAAe,CAAC,MAAM,CAAC,CAAkB,CAAA;QAEhE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC1C,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,aAAa;YACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0BAA0B,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;SAClE;QAED,aAAa;QACb,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;QACjC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;KACpD;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;YACnC,MAAM,IAAI,GAAG,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAkB,CAAA;YAEhE,aAAa;YACb,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAEjD,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0BAA0B,EAAE,iBAAiB,CAAC,CAAC,CAAA;aACpE;YAED,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAA;YAEhD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAAE,KAAK,EAAE,CAAA;SAC7D;KACF;AACH,CAAC,CAAA"}

package/dist/scan/processScan.js

@@ -0,0 +1,28 @@
+import scanConfig from './scanConfig.js';
+import { startScan } from './scanController.js';
+import { saveScanFile } from '../utils/saveFile.js';
+import { ScanResultsModel } from './models/scanResultsModel.js';
+import { formatScanOutput } from './formatScanOutput.js';
+import { sendTelemetryConfigAsObject } from '../telemetry/telemetry.js';
+import { processFail } from '../common/fail.js';
+import { postRunMessage } from '../common/commonHelp.js';
+export const processScan = async (contrastConf, argv) => {
+    let config = await scanConfig.getScanConfig(contrastConf, 'scan', argv);
+    let output = undefined;
+    const scanResults = new ScanResultsModel(await startScan(config));
+    await sendTelemetryConfigAsObject(config, 'scan', argv, 'SUCCESS', scanResults.scanDetail.language);
+    if (scanResults.scanResultsInstances !== undefined) {
+        output = formatScanOutput(scanResults);
+    }
+    if (config.save !== undefined) {
+        await saveScanFile(config, scanResults);
+    }
+    else {
+        console.log('\nUse contrast scan --save to save results as a SARIF');
+    }
+    if (config.fail) {
+        processFail(config, output);
+    }
+    postRunMessage('scan');
+};
+//# sourceMappingURL=processScan.js.map

package/dist/scan/processScan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processScan.js","sourceRoot":"","sources":["../../src/scan/processScan.js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;IACtD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACvE,IAAI,MAAM,GAAG,SAAS,CAAA;IAEtB,MAAM,WAAW,GAAG,IAAI,gBAAgB,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACjE,MAAM,2BAA2B,CAC/B,MAAM,EACN,MAAM,EACN,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,UAAU,CAAC,QAAQ,CAChC,CAAA;IAED,IAAI,WAAW,CAAC,oBAAoB,KAAK,SAAS,EAAE;QAClD,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;KACvC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;KACxC;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAA;KACrE;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAC5B;IAED,cAAc,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/scan/saveResults.js

@@ -1,6 +1,5 @@
-"use strict";
-const fs = require('fs');
-const writeResultsToFile = async (responseBody, name = 'results.sarif') => {
+import fs from 'fs';
+export const writeResultsToFile = async (responseBody, name = 'results.sarif') => {
     try {
         fs.writeFileSync(name, JSON.stringify(responseBody, null, 2));
         return name;
@@ -9,6 +8,4 @@ const writeResultsToFile = async (responseBody, name = 'results.sarif') => {
         console.log('Error writing Scan Results to file');
     }
 };
-module.exports = {
-    writeResultsToFile: writeResultsToFile
-};
+//# sourceMappingURL=saveResults.js.map

package/dist/scan/saveResults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"saveResults.js","sourceRoot":"","sources":["../../src/scan/saveResults.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,YAAY,EACZ,IAAI,GAAG,eAAe,EACtB,EAAE;IACF,IAAI;QACF,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAC7D,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;KAClD;AACH,CAAC,CAAA"}

package/dist/scan/scan.js

@@ -1,67 +1,47 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendScan = exports.isFileAllowed = exports.allowedFileTypes = void 0;
-const commonApi_js_1 = __importDefault(require("../utils/commonApi.js"));
-const fileUtils_1 = __importDefault(require("../scan/fileUtils"));
-const i18n_1 = __importDefault(require("i18n"));
-const oraWrapper_1 = __importDefault(require("../utils/oraWrapper"));
-exports.allowedFileTypes = ['.jar', '.war', '.js', '.zip', '.exe'];
-const isFileAllowed = (scanOption) => {
+import { checkFilePermissions } from './fileUtils.js';
+import { failSpinner, returnOra, startSpinner, stopSpinner, succeedSpinner } from '../utils/oraWrapper.js';
+import i18n from 'i18n';
+import { sendArtifact } from './scanRequests.js';
+export const allowedFileTypes = ['.jar', '.war', '.js', '.zip', '.exe'];
+export const isFileAllowed = (scanOption) => {
     let valid = false;
-    exports.allowedFileTypes.forEach(fileType => {
+    allowedFileTypes.forEach(fileType => {
         if (scanOption.endsWith(fileType)) {
             valid = true;
         }
     });
     return valid;
 };
-exports.isFileAllowed = isFileAllowed;
-const sendScan = async (config) => {
-    if (!(0, exports.isFileAllowed)(config.file)) {
-        console.log(i18n_1.default.__('scanErrorFileMessage'));
+export const sendScan = async (config) => {
+    if (!isFileAllowed(config.file)) {
+        console.log(i18n.__('scanErrorFileMessage'));
         process.exit(9);
     }
     else {
-        fileUtils_1.default.checkFilePermissions(config.file);
-        const client = commonApi_js_1.default.getHttpClient(config);
-        const startUploadSpinner = oraWrapper_1.default.returnOra(i18n_1.default.__('uploadingScan'));
-        oraWrapper_1.default.startSpinner(startUploadSpinner);
-        return await client
-            .sendArtifact(config)
-            .then(res => {
-            if (res.statusCode === 201) {
-                oraWrapper_1.default.succeedSpinner(startUploadSpinner, i18n_1.default.__('uploadingScanSuccessful'));
-                if (config.verbose) {
-                    console.log(i18n_1.default.__('responseMessage', res.body));
-                }
-                return res.body.id;
+        checkFilePermissions(config.file);
+        const startUploadSpinner = returnOra(i18n.__('uploadingScan'));
+        startSpinner(startUploadSpinner);
+        try {
+            const sendArtifactRes = (await sendArtifact(config));
+            const { body } = sendArtifactRes;
+            succeedSpinner(startUploadSpinner, i18n.__('uploadingScanSuccessful'));
+            if (config.debug) {
+                // @ts-ignore
+                console.log(i18n.__('responseMessage', body));
             }
-            else {
-                if (config.debug) {
-                    console.log(config);
-                    oraWrapper_1.default.failSpinner(startUploadSpinner, i18n_1.default.__('uploadingScanFail'));
-                    console.log(i18n_1.default.__('genericServiceError', res.statusCode));
-                }
-                if (res.statusCode === 429) {
-                    console.log(i18n_1.default.__('exceededFreeTier'));
-                    process.exit(1);
-                }
-                if (res.statusCode === 403) {
-                    console.log(i18n_1.default.__('permissionsError'));
-                    process.exit(1);
-                }
-                oraWrapper_1.default.stopSpinner(startUploadSpinner);
-                console.log('Contrast Scan Finished');
-                process.exit(1);
+            // @ts-ignore
+            return body.id;
+        }
+        catch (err) {
+            if (config.debug) {
+                console.log(config);
+                failSpinner(startUploadSpinner, i18n.__('uploadingScanFail'));
+                console.log(i18n.__('genericServiceError', err.response.statusCode));
             }
-        })
-            .catch(err => {
-            oraWrapper_1.default.stopSpinner(startUploadSpinner);
-            console.log(err);
-        });
+            stopSpinner(startUploadSpinner);
+            console.log('Contrast Scan Finished');
+            process.exit(1);
+        }
     }
 };
-exports.sendScan = sendScan;
+//# sourceMappingURL=scan.js.map

package/dist/scan/scan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/scan/scan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EACL,WAAW,EACX,SAAS,EACT,YAAY,EACZ,WAAW,EACX,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAEvE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,EAAE;IAClD,IAAI,KAAK,GAAG,KAAK,CAAA;IACjB,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACjC,KAAK,GAAG,IAAI,CAAA;SACb;IACH,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAW,EAAE,EAAE;IAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAA;QAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;SAAM;QACL,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;QAC9D,YAAY,CAAC,kBAAkB,CAAC,CAAA;QAChC,IAAI;YACF,MAAM,eAAe,GAAG,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAkB,CAAA;YAErE,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAA;YAEhC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;YACtE,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,aAAa;gBACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAA;aAC9C;YACD,aAAa;YACb,OAAO,IAAI,CAAC,EAAE,CAAA;SACf;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBACnB,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;gBAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;aACrE;YAED,WAAW,CAAC,kBAAkB,CAAC,CAAA;YAC/B,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;YACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAChB;KACF;AACH,CAAC,CAAA"}

package/dist/scan/scanConfig.js

@@ -1,18 +1,17 @@
-"use strict";
-const paramHandler = require('../utils/paramsUtil/paramHandler');
-const constants = require('../cliConstants.js');
-const path = require('path');
-const { supportedLanguagesScan } = require('../constants/constants');
-const i18n = require('i18n');
-const { scanUsageGuide } = require('./help');
-const parsedCLIOptions = require('../utils/parsedCLIOptions');
+import { getAuth } from '../utils/paramsUtil/paramHandler.js';
+import { commandLineDefinitions } from '../cliConstants.js';
+import { sep } from 'path';
+import i18n from 'i18n';
+import { scanUsageGuide } from './help.js';
+import { getCommandLineArgsCustom } from '../utils/parsedCLIOptions.js';
+import { supportedLanguagesScan } from '../constants/constants.js';
 const getScanConfig = async (contrastConf, command, argv) => {
-    let scanParams = await parsedCLIOptions.getCommandLineArgsCustom(contrastConf, command, argv, constants.commandLineDefinitions.scanOptionDefinitions);
+    let scanParams = await getCommandLineArgsCustom(contrastConf, command, argv, commandLineDefinitions.scanOptionDefinitions);
     if (scanParams.help) {
         printHelpMessage();
         process.exit(0);
     }
-    const paramsAuth = paramHandler.getAuth(scanParams);
+    const paramsAuth = getAuth(scanParams);
     if (scanParams.language) {
         scanParams.language = scanParams.language.toUpperCase();
         if (!Object.values(supportedLanguagesScan).includes(scanParams.language)) {
@@ -21,6 +20,7 @@ const getScanConfig = async (contrastConf, command, argv) => {
             process.exit(1);
         }
     }
+    // if no name, take the full file path and use it as the project name
     let projectNameSource;
     if (!scanParams.name && scanParams.file) {
         scanParams.name = getFileName(scanParams.file);
@@ -32,13 +32,15 @@ const getScanConfig = async (contrastConf, command, argv) => {
     return { ...paramsAuth, ...scanParams, projectNameSource };
 };
 const getFileName = file => {
-    return file.split(path.sep).pop();
+    // from '/Users/x/y/spring-async.war' to 'spring-async.war'
+    return file.split(sep).pop();
 };
 const printHelpMessage = () => {
     console.log(scanUsageGuide);
 };
-module.exports = {
+export default {
     getScanConfig,
     getFileName,
     printHelpMessage
 };
+//# sourceMappingURL=scanConfig.js.map

package/dist/scan/scanConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanConfig.js","sourceRoot":"","sources":["../../src/scan/scanConfig.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,MAAM,aAAa,GAAG,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC1D,IAAI,UAAU,GAAG,MAAM,wBAAwB,CAC7C,YAAY,EACZ,OAAO,EACP,IAAI,EACJ,sBAAsB,CAAC,qBAAqB,CAC7C,CAAA;IAED,IAAI,UAAU,CAAC,IAAI,EAAE;QACnB,gBAAgB,EAAE,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAEtC,IAAI,UAAU,CAAC,QAAQ,EAAE;QACvB,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAA;QACvD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YACxE,OAAO,CAAC,GAAG,CAAC,gCAAgC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;YAClE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAA;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAChB;KACF;IAED,qEAAqE;IACrE,IAAI,iBAAiB,CAAA;IACrB,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE;QACvC,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC9C,iBAAiB,GAAG,MAAM,CAAA;KAC3B;SAAM;QACL,iBAAiB,GAAG,MAAM,CAAA;KAC3B;IAED,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,UAAU,EAAE,iBAAiB,EAAE,CAAA;AAC5D,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE;IACzB,2DAA2D;IAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;AAC9B,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,eAAe;IACb,aAAa;IACb,WAAW;IACX,gBAAgB;CACjB,CAAA"}

package/dist/scan/scanController.js

@@ -1,30 +1,30 @@
-"use strict";
-const i18n = require('i18n');
-const { returnOra, startSpinner, succeedSpinner, stopSpinner } = require('../utils/oraWrapper');
-const populateProjectIdAndProjectName = require('./populateProjectIdAndProjectName');
-const scan = require('./scan');
-const scanResults = require('./scanResults');
-const autoDetection = require('./autoDetection');
-const fileFunctions = require('./fileUtils');
-const { performance } = require('perf_hooks');
+import i18n from 'i18n';
+import { populateProjectId } from './populateProjectIdAndProjectName.js';
+import { sendScan } from './scan.js';
+import { performance } from 'perf_hooks';
+import { fileExists, fileIsEmpty } from './fileUtils.js';
+import { returnOra, startSpinner, stopSpinner, succeedSpinner } from '../utils/oraWrapper.js';
+import { returnScanResults } from './scanResults.js';
+import { autoDetectFileAndLanguage } from '../common/autoDetection.js';
+import { getScanResultsInstances } from './scanRequests.js';
 const getTimeout = config => {
     if (config.timeout) {
         return config.timeout;
     }
     else {
-        if (config.verbose) {
+        if (config.debug) {
             console.log('Timeout set to 5 minutes');
         }
         return 300;
     }
 };
-const fileAndLanguageLogic = async (configToUse) => {
+export const fileAndLanguageLogic = async (configToUse) => {
     if (configToUse.file) {
-        if (!fileFunctions.fileExists(configToUse.file)) {
+        if (!fileExists(configToUse.file)) {
             console.log(i18n.__('fileNotExist'));
             process.exit(1);
         }
-        if (fileFunctions.fileIsEmpty(configToUse.file)) {
+        if (fileIsEmpty(configToUse.file)) {
             console.log(i18n.__('scanFileIsEmpty'));
             process.exit(1);
         }
@@ -32,28 +32,28 @@ const fileAndLanguageLogic = async (configToUse) => {
     }
     else {
         if (configToUse.file === undefined || configToUse.file === null) {
-            await autoDetection.autoDetectFileAndLanguage(configToUse);
+            await autoDetectFileAndLanguage(configToUse);
         }
     }
 };
-const startScan = async (configToUse) => {
+export const startScan = async (configToUse) => {
     const startTime = performance.now();
     await fileAndLanguageLogic(configToUse);
     let newProject;
     if (!configToUse.projectId) {
-        const { projectId, isNewProject } = await populateProjectIdAndProjectName.populateProjectId(configToUse);
+        const { projectId, isNewProject } = await populateProjectId(configToUse);
         configToUse.projectId = projectId;
         newProject = isNewProject;
     }
     else {
         newProject = false;
     }
-    const codeArtifactId = await scan.sendScan(configToUse);
+    const codeArtifactId = await sendScan(configToUse);
     if (!configToUse.ff) {
         const startScanSpinner = returnOra('🚀 Contrast Scan started');
         startSpinner(startScanSpinner);
-        const scanDetail = await scanResults.returnScanResults(configToUse, codeArtifactId, newProject, getTimeout(configToUse), startScanSpinner);
-        const scanResultsInstances = await scanResults.returnScanResultsInstances(configToUse, scanDetail.id);
+        const scanDetail = await returnScanResults(configToUse, codeArtifactId, newProject, getTimeout(configToUse), startScanSpinner);
+        const scanResultsInstances = await getScanResultsInstances(configToUse, scanDetail.id);
         const endTime = performance.now();
         const scanDurationMs = endTime - startTime;
         if (scanResultsInstances.statusCode !== 200) {
@@ -71,6 +71,4 @@ const startScan = async (configToUse) => {
         }
     }
 };
-module.exports = {
-    startScan: startScan
-};
+//# sourceMappingURL=scanController.js.map

package/dist/scan/scanController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanController.js","sourceRoot":"","sources":["../../src/scan/scanController.js"],"names":[],"mappings":"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"}

package/dist/scan/scanRequests.js

@@ -0,0 +1,86 @@
+import { buildBaseRequestOptions, ErrorType } from '../common/baseRequest.js';
+import { got } from 'got';
+import fs from 'fs';
+import FormData from 'form-data';
+export function createProjectId(config) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.json = {
+        name: config.name,
+        archived: 'false'
+    };
+    if (config.language) {
+        // @ts-ignore
+        options.json.language = config.language;
+    }
+    options.url = createHarmonyProjectsUrl(config);
+    return got.post(options);
+}
+function createHarmonyProjectsUrl(config) {
+    return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects`;
+}
+export function getProjectIdByName(config) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.url = createHarmonyProjectsUrl(config) + '?name=' + config.name;
+    return got.get(options);
+}
+export async function sendArtifact(config) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    const formData = new FormData();
+    formData.append('filename', fs.createReadStream(config.file));
+    options.body = formData;
+    // @ts-ignore
+    options.headers['Content-Type'] = `multipart/form-data; boundary=${formData.getBoundary()}`;
+    options.url = createHarmonyUrl(config);
+    return got.post(options);
+}
+function createHarmonyUrl(config) {
+    return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}/code-artifacts`;
+}
+export function getScanId(config, codeArtifactId) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.url = createGetScanIdURL(config);
+    options.json = {
+        codeArtifactId: codeArtifactId,
+        label: config.label
+            ? config.label
+            : `Started by CLI tool at ${new Date().toString()}`
+    };
+    return got.post(options);
+}
+const createGetScanIdURL = (config) => {
+    return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}/scans/`;
+};
+export function getSpecificScanResult(config, scanId) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.url = createSpecificScanResultURL(config, scanId);
+    options.throwHttpErrors = false;
+    return got.get(options);
+}
+const createSpecificScanResultURL = (config, scanId) => {
+    return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}/scans/${scanId}`;
+};
+export function createNewEvent(config, scanId, newProject) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.url = createEventCollectorURL(config, scanId);
+    options.json = {
+        eventSource: process.env.CODESEC_INVOCATION_ENVIRONMENT,
+        trackingProperties: {
+            projectNameSource: config.projectNameSource,
+            waitedForResults: !config.ff,
+            newProject
+        }
+    };
+    return got.post(options);
+}
+const createEventCollectorURL = (config, scanId) => {
+    return `${config.host}/Contrast/api/sast/organizations/${config.organizationId}/projects/${config.projectId}/scans/${scanId}/events`;
+};
+export function getScanResultsInstances(config, scanId) {
+    const options = buildBaseRequestOptions(config, ErrorType.SCAN);
+    options.url = createScanResultsInstancesURL(config, scanId);
+    return got.get(options);
+}
+const createScanResultsInstancesURL = (config, scanId) => {
+    return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}/scans/${scanId}/result-instances/info?size=50&page=0&last=false&sort=severity,asc`;
+};
+//# sourceMappingURL=scanRequests.js.map

package/dist/scan/scanRequests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanRequests.js","sourceRoot":"","sources":["../../src/scan/scanRequests.ts"],"names":[],"mappings":"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"}