@contrast/contrast 1.0.6 → 1.0.7

package/.prettierignore

@@ -1,7 +1 @@
-test/commands/**
 dist/**
-test/errorHandling.spec.ts
-**/models
-**/audit/autodetection/autoDetectLanguage.ts
-**/commands/audit/auditConfig.ts
-**/audit/languageAnalysisEngine/report

package/dist/audit/javaAnalysisEngine/parseMavenProjectFileContents.js

@@ -142,10 +142,12 @@ const parseMvn = mvnDependancyTreeOutput => {
     });
     return parsedDepObj;
 };
-exports.shaveConsoleOutputUntilItFindsFirsDigraphMention = shaveConsoleOutputUntilItFindsFirsDigraphMention;
+exports.shaveConsoleOutputUntilItFindsFirsDigraphMention =
+    shaveConsoleOutputUntilItFindsFirsDigraphMention;
 exports.getDigraphObjInfo = getDigraphObjInfo;
 exports.createDigraphObjKey = createDigraphObjKey;
-exports.turnDigraphDependanciesIntoArrOfInnerDep = turnDigraphDependanciesIntoArrOfInnerDep;
+exports.turnDigraphDependanciesIntoArrOfInnerDep =
+    turnDigraphDependanciesIntoArrOfInnerDep;
 exports.hasVersion = hasVersion;
 exports.formatKeyName = formatKeyName;
 exports.createOuterDependanciesAndType = createOuterDependanciesAndType;

package/dist/audit/languageAnalysisEngine/checkForMultipleIdentifiedLanguages.js

@@ -21,4 +21,5 @@ const checkForMultipleIdentifiedLanguages = identifiedLanguages => {
         throw new Error(errMsg);
     }
 };
-exports.checkForMultipleIdentifiedLanguages = checkForMultipleIdentifiedLanguages;
+exports.checkForMultipleIdentifiedLanguages =
+    checkForMultipleIdentifiedLanguages;

package/dist/audit/languageAnalysisEngine/checkForMultipleIdentifiedProjectFiles.js

@@ -21,4 +21,5 @@ const checkForMultipleIdentifiedProjectFiles = identifiedLanguages => {
         }
     }
 };
-exports.checkForMultipleIdentifiedProjectFiles = checkForMultipleIdentifiedProjectFiles;
+exports.checkForMultipleIdentifiedProjectFiles =
+    checkForMultipleIdentifiedProjectFiles;

package/dist/audit/languageAnalysisEngine/checkIdentifiedLanguageHasProjectFile.js

@@ -20,4 +20,5 @@ const checkIdentifiedLanguageHasProjectFile = identifiedLanguages => {
         }
     }
 };
-exports.checkIdentifiedLanguageHasProjectFile = checkIdentifiedLanguageHasProjectFile;
+exports.checkIdentifiedLanguageHasProjectFile =
+    checkIdentifiedLanguageHasProjectFile;

package/dist/audit/languageAnalysisEngine/languageAnalysisFactory.js

@@ -15,6 +15,7 @@ const chalk = require('chalk');
 const saveFile = require('../../commands/audit/saveFile').default;
 const generateSbom = require('../../sbom/generateSbom').default;
 const { failSpinner, returnOra, startSpinner, succeedSpinner } = require('../../utils/oraWrapper');
+const { pollForSnapshotCompletition } = require('./sendSnapshot');
 module.exports = exports = (err, analysis) => {
     const { identifiedLanguageInfo } = analysis.languageAnalysis;
     const catalogueAppId = analysis.languageAnalysis.appId;
@@ -39,6 +40,7 @@ module.exports = exports = (err, analysis) => {
         const reportSpinner = returnOra(i18n.__('auditSCAAnalysisBegins'));
         startSpinner(reportSpinner);
         const snapshotResponse = await newSendSnapShot(analysis, catalogueAppId);
+        const pollResult = await pollForSnapshotCompletition(analysis.config, snapshotResponse.id, reportSpinner);
         succeedSpinner(reportSpinner, 'Contrast SCA analysis complete');
         await vulnerabilityReport(analysis, catalogueAppId, snapshotResponse.id);
         await auditSave(config);

package/dist/audit/languageAnalysisEngine/reduceIdentifiedLanguages.js

@@ -38,6 +38,14 @@ const deduceLanguageScaAnalysis = filenames => {
             deducedLanguages.push(filename);
             language = NODE;
         }
+        if (isRubyProjectFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = RUBY;
+        }
+        if (isPythonProjectFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = PYTHON;
+        }
         if (isNodeLockFilename(filename)) {
             deducedLanguages.push(filename);
             language = NODE;
@@ -118,7 +126,8 @@ module.exports = exports = (analysis, next) => {
     }
     let language = config.language;
     if (language === undefined) {
-        languageAnalysis.identifiedLanguages = reduceIdentifiedLanguages(identifiedLanguages);
+        languageAnalysis.identifiedLanguages =
+            reduceIdentifiedLanguages(identifiedLanguages);
     }
     else {
         let refinedIdentifiedLanguages = [];

package/dist/audit/languageAnalysisEngine/report/utils/reportUtils.js

@@ -28,7 +28,8 @@ function findCVESeverity(cve) {
     else if (cve.cvss3SeverityCode === 'HIGH' || cve.severityCode === 'HIGH') {
         return new reportSeverityModel_1.ReportSeverityModel('HIGH', constants_2.HIGH_PRIORITY, constants_2.HIGH_COLOUR, cveName);
     }
-    else if (cve.cvss3SeverityCode === 'MEDIUM' || cve.severityCode === 'MEDIUM') {
+    else if (cve.cvss3SeverityCode === 'MEDIUM' ||
+        cve.severityCode === 'MEDIUM') {
         return new reportSeverityModel_1.ReportSeverityModel('MEDIUM', constants_2.MEDIUM_PRIORITY, constants_2.MEDIUM_COLOUR, cveName);
     }
     else if (cve.cvss3SeverityCode === 'LOW' || cve.severityCode === 'LOW') {
@@ -58,24 +59,20 @@ function severityCountAllCVEs(cveArray, severityCount) {
 }
 exports.severityCountAllCVEs = severityCountAllCVEs;
 function severityCountSingleCVE(cve, severityCount) {
-    if (cve.cvss3SeverityCode === 'CRITICAL' ||
-        cve.severityCode === 'CRITICAL') {
+    if (cve.cvss3SeverityCode === 'CRITICAL' || cve.severityCode === 'CRITICAL') {
         severityCount.critical += 1;
     }
-    else if (cve.cvss3SeverityCode === 'HIGH' ||
-        cve.severityCode === 'HIGH') {
+    else if (cve.cvss3SeverityCode === 'HIGH' || cve.severityCode === 'HIGH') {
         severityCount.high += 1;
     }
     else if (cve.cvss3SeverityCode === 'MEDIUM' ||
         cve.severityCode === 'MEDIUM') {
         severityCount.medium += 1;
     }
-    else if (cve.cvss3SeverityCode === 'LOW' ||
-        cve.severityCode === 'LOW') {
+    else if (cve.cvss3SeverityCode === 'LOW' || cve.severityCode === 'LOW') {
         severityCount.low += 1;
     }
-    else if (cve.cvss3SeverityCode === 'NOTE' ||
-        cve.severityCode === 'NOTE') {
+    else if (cve.cvss3SeverityCode === 'NOTE' || cve.severityCode === 'NOTE') {
         severityCount.note += 1;
     }
     return severityCount;

package/dist/audit/languageAnalysisEngine/sendSnapshot.js

@@ -1,7 +1,13 @@
 "use strict";
-const { getHttpClient } = require('../../utils/commonApi');
 const { handleResponseErrors } = require('../../common/errorHandling');
 const { APP_VERSION } = require('../../constants/constants');
+const commonApi = require('../../utils/commonApi');
+const _ = require('lodash');
+const oraFunctions = require('../../utils/oraWrapper');
+const i18n = require('i18n');
+const oraWrapper = require('../../utils/oraWrapper');
+const requestUtils = require('../../utils/requestUtils');
+const { performance } = require('perf_hooks');
 const newSendSnapShot = async (analysis) => {
     const analysisLanguage = analysis.config.language.toLowerCase();
     const requestBody = {
@@ -9,7 +15,7 @@ const newSendSnapShot = async (analysis) => {
         cliVersion: APP_VERSION,
         snapshot: { [analysisLanguage]: analysis[analysisLanguage] }
     };
-    const client = getHttpClient(analysis.config);
+    const client = commonApi.getHttpClient(analysis.config);
     return client
         .sendSnapshot(requestBody, analysis.config)
         .then(res => {
@@ -24,6 +30,62 @@ const newSendSnapShot = async (analysis) => {
         console.log(err);
     });
 };
+const pollSnapshotResults = async (config, snapshotId, client) => {
+    await requestUtils.sleep(5000);
+    return client
+        .getReportStatusById(config, snapshotId)
+        .then(res => {
+        return res;
+    })
+        .catch(err => {
+        console.log(err);
+    });
+};
+const getTimeout = config => {
+    if (config.timeout) {
+        return config.timeout;
+    }
+    else {
+        if (config.verbose) {
+            console.log('Timeout set to 2 minutes');
+        }
+        return 120;
+    }
+};
+const pollForSnapshotCompletition = async (config, snapshotId, reportSpinner) => {
+    const client = commonApi.getHttpClient(config);
+    const startTime = performance.now();
+    const timeout = getTimeout(config);
+    let complete = false;
+    if (!_.isNil(snapshotId)) {
+        while (!complete) {
+            let result = await pollSnapshotResults(config, snapshotId, client);
+            if (result.statusCode === 200) {
+                if (result.body.status === 'PROCESSED') {
+                    complete = true;
+                    return result.body;
+                }
+                if (result.body.status === 'FAILED') {
+                    complete = true;
+                    if (config.debug) {
+                        oraFunctions.failSpinner(reportSpinner, i18n.__('auditNotCompleted'));
+                    }
+                    console.log(result.body.errorMessage);
+                    oraWrapper.stopSpinner(reportSpinner);
+                    console.log('Contrast audit finished');
+                    process.exit(1);
+                }
+            }
+            const endTime = performance.now() - startTime;
+            if (requestUtils.millisToSeconds(endTime) > timeout) {
+                oraFunctions.failSpinner(reportSpinner, 'Contrast audit timed out at the specified ' + timeout + ' seconds.');
+                console.log('Please try again, allowing more time.');
+                process.exit(1);
+            }
+        }
+    }
+};
 module.exports = {
-    newSendSnapShot: newSendSnapShot
+    newSendSnapShot: newSendSnapShot,
+    pollForSnapshotCompletition: pollForSnapshotCompletition
 };

package/dist/commands/audit/processAudit.js

@@ -7,7 +7,7 @@ const help_1 = require("./help");
 const processAudit = async (argv) => {
     if (argv.indexOf('--help') != -1) {
         printHelpMessage();
-        process.exit(1);
+        process.exit(0);
     }
     const config = (0, auditConfig_1.getAuditConfig)(argv);
     const auditResults = await (0, auditController_1.startAudit)(config);

package/dist/commands/scan/sca/scaAnalysis.js

@@ -4,15 +4,18 @@ const javaAnalysis = require('../../../scaAnalysis/java');
 const treeUpload = require('../../../scaAnalysis/common/treeUpload');
 const { manualDetectAuditFilesAndLanguages } = require('../../../scan/autoDetection');
 const auditController = require('../../audit/auditController');
-const { supportedLanguages: { JAVA, GO } } = require('../../../audit/languageAnalysisEngine/constants');
+const { supportedLanguages: { JAVA, GO, RUBY, PYTHON } } = require('../../../audit/languageAnalysisEngine/constants');
 const goAnalysis = require('../../../scaAnalysis/go/goAnalysis');
+const { rubyAnalysis } = require('../../../scaAnalysis/ruby');
+const { pythonAnalysis } = require('../../../scaAnalysis/python');
 const processSca = async (config) => {
     let filesFound;
     if (config.projectPath) {
-        filesFound = await manualDetectAuditFilesAndLanguages(config.projectPath);
+        filesFound = manualDetectAuditFilesAndLanguages(config.projectPath);
     }
     else {
         filesFound = await autoDetection.autoDetectAuditFilesAndLanguages(config);
+        config.projectPath = process.cwd();
     }
     let messageToSend = undefined;
     if (filesFound.length === 1) {
@@ -21,6 +24,14 @@ const processSca = async (config) => {
                 messageToSend = javaAnalysis.javaAnalysis(config, filesFound[0]);
                 config.language = JAVA;
                 break;
+            case RUBY:
+                messageToSend = rubyAnalysis(config, filesFound[0]);
+                config.language = RUBY;
+                break;
+            case PYTHON:
+                messageToSend = pythonAnalysis(config, filesFound[0]);
+                config.language = PYTHON;
+                break;
             case GO:
                 messageToSend = goAnalysis.goAnalysis(config, filesFound[0]);
                 config.language = GO;

package/dist/common/HTTPClient.js

@@ -20,7 +20,8 @@ function HTTPClient(config) {
             Authorization: authToken,
             'API-Key': apiKey,
             SuperAuthorization: superAuthToken,
-            'Super-API-Key': superApiKey
+            'Super-API-Key': superApiKey,
+            'User-Agent': 'contrast-cli-v2'
         }
     };
     if (config.proxy) {
@@ -66,10 +67,24 @@ HTTPClient.prototype.getSpecificScanResult = function getSpecificScanResult(conf
     options.url = url;
     return requestUtils.sendRequest({ method: 'get', options });
 };
-HTTPClient.prototype.getSpecificScanResultSarif = function getSpecificScanResultSarif(config, scanId) {
+HTTPClient.prototype.getSpecificScanResultSarif =
+    function getSpecificScanResultSarif(config, scanId) {
+        const options = _.cloneDeep(this.requestOptions);
+        options.url = createRawOutputURL(config, scanId);
+        return requestUtils.sendRequest({ method: 'get', options });
+    };
+HTTPClient.prototype.createNewEvent = function createNewEvent(config, scanId, newProject) {
     const options = _.cloneDeep(this.requestOptions);
-    options.url = createRawOutputURL(config, scanId);
-    return requestUtils.sendRequest({ method: 'get', options });
+    options.url = createEventCollectorURL(config, scanId);
+    options.body = {
+        eventSource: process.env.CODESEC_INVOCATION_ENVIRONMENT,
+        trackingProperties: {
+            projectNameSource: config.projectNameSource,
+            waitedForResults: !config.ff,
+            newProject
+        }
+    };
+    return requestUtils.sendRequest({ method: 'post', options });
 };
 HTTPClient.prototype.getScanId = function getScanId(config, codeArtifactId) {
     const options = _.cloneDeep(this.requestOptions);
@@ -145,8 +160,6 @@ HTTPClient.prototype.catalogueCommand = function catalogueCommand(config) {
     return requestUtils.sendRequest({ method: 'post', options });
 };
 HTTPClient.prototype.sendSnapshot = function sendSnapshot(requestBody, config) {
-    if (config.language.toUpperCase() === 'RUBY') {
-    }
     const options = _.cloneDeep(this.requestOptions);
     let url = createSnapshotURL(config);
     options.url = url;
@@ -163,12 +176,18 @@ HTTPClient.prototype.getReportById = function getReportById(config, reportId) {
     }
     return requestUtils.sendRequest({ method: 'get', options });
 };
-HTTPClient.prototype.getLibraryVulnerabilities = function getLibraryVulnerabilities(config, requestBody) {
+HTTPClient.prototype.getReportStatusById = function getReportStatusById(config, snapshotId) {
     const options = _.cloneDeep(this.requestOptions);
-    options.url = createLibraryVulnerabilitiesUrl(config);
-    options.body = requestBody;
-    return requestUtils.sendRequest({ method: 'put', options });
+    options.url = createSpecificReportStatusURL(config, snapshotId);
+    return requestUtils.sendRequest({ method: 'get', options });
 };
+HTTPClient.prototype.getLibraryVulnerabilities =
+    function getLibraryVulnerabilities(config, requestBody) {
+        const options = _.cloneDeep(this.requestOptions);
+        options.url = createLibraryVulnerabilitiesUrl(config);
+        options.body = requestBody;
+        return requestUtils.sendRequest({ method: 'put', options });
+    };
 HTTPClient.prototype.getAppId = function getAppId(config) {
     const options = _.cloneDeep(this.requestOptions);
     let url = createAppNameUrl(config);
@@ -210,11 +229,12 @@ HTTPClient.prototype.getScanResources = async function getScanResources(config,
     const options = { ...this.requestOptions, url };
     return requestUtils.sendRequest({ method: 'get', options });
 };
-HTTPClient.prototype.getFunctionScanResults = async function getFunctionScanResults(config, params, scanId, functionArn) {
-    const url = createScanResultsGetUrl(config, params, scanId, functionArn);
-    const options = { ...this.requestOptions, url };
-    return requestUtils.sendRequest({ method: 'get', options });
-};
+HTTPClient.prototype.getFunctionScanResults =
+    async function getFunctionScanResults(config, params, scanId, functionArn) {
+        const url = createScanResultsGetUrl(config, params, scanId, functionArn);
+        const options = { ...this.requestOptions, url };
+        return requestUtils.sendRequest({ method: 'get', options });
+    };
 HTTPClient.prototype.checkLibrary = function checkLibrary(data) {
     const options = _.cloneDeep(this.requestOptions);
     let url = createDataUrl();
@@ -227,6 +247,15 @@ HTTPClient.prototype.getSbom = function getSbom(config) {
     options.url = createSbomCycloneDXUrl(config);
     return requestUtils.sendRequest({ method: 'get', options });
 };
+HTTPClient.prototype.postAnalyticsFunction = function (config, provider, body) {
+    const url = createAnalyticsFunctionPostUrl(config, provider);
+    const options = { ...this.requestOptions, body, url };
+    return requestUtils.sendRequest({ method: 'post', options });
+};
+const createAnalyticsFunctionPostUrl = (config, provider) => {
+    const url = getServerlessHost(config);
+    return `${url}/organizations/${config.organizationId}/providers/${provider}/analytics`;
+};
 const createGetScanIdURL = config => {
     return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}/scans/`;
 };
@@ -248,6 +277,9 @@ function createHarmonyProjectsUrl(config) {
 function createScanProjectUrl(config) {
     return `${config.host}/Contrast/api/sast/v1/organizations/${config.organizationId}/projects/${config.projectId}`;
 }
+const createEventCollectorURL = (config, scanId) => {
+    return `${config.host}/Contrast/api/sast/organizations/${config.organizationId}/projects/${config.projectId}/scans/${scanId}/events`;
+};
 const createGlobalPropertiesUrl = protocol => {
     return `${protocol}/Contrast/api/ng/global/properties`;
 };
@@ -272,6 +304,9 @@ function createSpecificReportUrl(config, reportId) {
 function createSpecificReportWithProdUrl(config, reportId) {
     return createSpecificReportUrl(config, reportId).concat(`?nodesToInclude=PROD`);
 }
+function createSpecificReportStatusURL(config, reportId) {
+    return `${config.host}/Contrast/api/ng/sca/organizations/${config.organizationId}/applications/${config.applicationId}/snapshots/${reportId}/status`;
+}
 function createDataUrl() {
     return `https://ardy.contrastsecurity.com/production`;
 }

package/dist/common/errorHandling.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reportFailureError = exports.vulnerabilitiesFailureError = exports.snapshotFailureError = exports.findCommandOnError = exports.libraryAnalysisError = exports.handleResponseErrors = exports.getErrorMessage = exports.generalError = exports.failOptionError = exports.proxyError = exports.forbiddenError = exports.badRequestError = exports.unauthenticatedError = exports.genericError = void 0;
+exports.maxAppError = exports.reportFailureError = exports.vulnerabilitiesFailureError = exports.snapshotFailureError = exports.findCommandOnError = exports.libraryAnalysisError = exports.handleResponseErrors = exports.getErrorMessage = exports.generalError = exports.failOptionError = exports.proxyError = exports.forbiddenError = exports.badRequestError = exports.unauthenticatedError = exports.genericError = void 0;
 const i18n_1 = __importDefault(require("i18n"));
 const handleResponseErrors = (res, api) => {
     if (res.statusCode === 400) {
@@ -72,6 +72,11 @@ const proxyError = () => {
     generalError('proxyErrorHeader', 'proxyErrorMessage');
 };
 exports.proxyError = proxyError;
+const maxAppError = () => {
+    generalError('No applications remaining', 'You have reached the maximum number of application you can create.');
+    process.exit(1);
+};
+exports.maxAppError = maxAppError;
 const failOptionError = () => {
     console.log('\n ******************************** ' +
         i18n_1.default.__('snapshotFailureHeader') +

package/dist/common/versionChecker.js

@@ -27,6 +27,6 @@ async function findLatestCLIVersion(updateMessageHidden) {
 }
 exports.findLatestCLIVersion = findLatestCLIVersion;
 async function isCorrectNodeVersion(currentVersion) {
-    return semver_1.default.satisfies(currentVersion, '>=16.13.2 <17');
+    return semver_1.default.satisfies(currentVersion, '>=16');
 }
 exports.isCorrectNodeVersion = isCorrectNodeVersion;

package/dist/constants/constants.js

@@ -12,7 +12,7 @@ const MEDIUM = 'MEDIUM';
 const HIGH = 'HIGH';
 const CRITICAL = 'CRITICAL';
 const APP_NAME = 'contrast';
-const APP_VERSION = '1.0.6';
+const APP_VERSION = '1.0.7';
 const TIMEOUT = 120000;
 const HIGH_COLOUR = '#ff9900';
 const CRITICAL_COLOUR = '#e35858';

package/dist/constants/locales.js

@@ -96,7 +96,7 @@ const en_locales = () => {
         constantsCount: "The number of CVE's that must be exceeded to fail a build",
         constantsHeader: 'CodeSec by Contrast Security',
         constantsPrerequisitesContentScanLanguages: 'Java & JavaScript supported',
-        constantsContrastContent: 'Use the Contrast CLI to run a scan (Java, JavaScript and .NET ) or lambda command (Java and Python) to find your vulnerabilities and start securing your code.',
+        constantsContrastContent: "Use the 'contrast' command for fast and accurate security analysis of your applications and APIs (Java, JavaScript and .NET ) as well as serverless functions (AWS lambda, Java and Python).",
         constantsUsageGuideContentRecommendation: 'Our recommendation is that this is invoked as part of a CI pipeline so that running the cli is automated as part of your build process.',
         constantsPrerequisitesHeader: 'Pre-requisites',
         constantsAuthUsageHeader: 'Usage',
@@ -247,6 +247,7 @@ const en_locales = () => {
         redirectAuth: '\nOpening the authentication page in your web browser.\nSign in and complete the steps.\nReturn here to start using Contrast.\n\nIf your browser has trouble loading, try this:\n%s \n',
         scanZipError: 'A .zip archive can be used for Javascript Scan. Archive found %s does not contain .JS files for Scan.',
         fileNotExist: 'File specified does not exist, please check and try again.',
+        scanFileIsEmpty: 'File specified is empty. Please choose another.',
         fileHasWhiteSpacesError: 'File cannot have spaces, please rename or choose another file to Scan.',
         zipFileException: 'Error reading zip file',
         connectionError: 'An error has occurred when trying to get the Project Id please check your internet connection or provide the Project Id manually',
@@ -278,6 +279,7 @@ const en_locales = () => {
         auditOptionsSave: '-s, --save',
         auditOptionsSaveDescription: 'saves the output in specified format Txt text, sbom',
         scanNotCompleted: 'Scan not completed. Check for framework and language support here: %s',
+        auditNotCompleted: 'audit not completed.  Please try again',
         scanNoVulnerabilitiesFound: '👏 No vulnerabilities found',
         scanNoVulnerabilitiesFoundSecureCode: '👍 Your code looks secure.',
         scanNoVulnerabilitiesFoundGoodWork: '👏 Keep up the good work.',

package/dist/lambda/analytics.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postAnalytics = void 0;
+const commonApi_1 = require("../utils/commonApi");
+const paramHandler_1 = require("../utils/paramsUtil/paramHandler");
+const postAnalytics = (data, provider = 'aws') => {
+    const config = (0, paramHandler_1.getAuth)();
+    const client = (0, commonApi_1.getHttpClient)(config);
+    return client.postAnalyticsFunction(config, provider, data);
+};
+exports.postAnalytics = postAnalytics;

package/dist/lambda/lambda.js

@@ -20,6 +20,8 @@ const utils_1 = require("./utils");
 const lambdaUtils_1 = require("./lambdaUtils");
 const requestUtils_1 = require("../utils/requestUtils");
 const oraWrapper_1 = __importDefault(require("../utils/oraWrapper"));
+const analytics_1 = require("./analytics");
+const types_1 = require("./types");
 const failedStates = [
     'UNSUPPORTED',
     'EXCLUDED',
@@ -57,9 +59,19 @@ const getLambdaOptions = (argv) => {
     }
 };
 const processLambda = async (argv) => {
+    let errorMsg;
+    let scanInfo;
+    const commandSessionId = Date.now().toString(36);
     try {
         const lambdaOptions = getLambdaOptions(argv);
         const { help } = lambdaOptions;
+        const startCommandAnalytics = {
+            arguments: lambdaOptions,
+            sessionId: commandSessionId,
+            eventType: types_1.EventType.START
+        };
+        (0, analytics_1.postAnalytics)(startCommandAnalytics).catch((error) => {
+        });
         if (help) {
             return handleLambdaHelp();
         }
@@ -68,17 +80,35 @@ const processLambda = async (argv) => {
             await getAvailableFunctions(lambdaOptions);
         }
         else {
-            await actualProcessLambda(lambdaOptions);
+            scanInfo = await actualProcessLambda(lambdaOptions);
         }
     }
     catch (error) {
         if (error instanceof cliError_1.CliError) {
-            console.error(error.getErrorMessage());
+            errorMsg = error.getErrorMessage();
         }
         else if (error instanceof Error) {
-            console.error(error.message);
+            errorMsg = error.message;
+        }
+    }
+    finally {
+        const endCommandAnalytics = {
+            sessionId: commandSessionId,
+            eventType: types_1.EventType.END,
+            status: errorMsg ? types_1.StatusType.FAILED : types_1.StatusType.SUCCESS
+        };
+        if (errorMsg) {
+            endCommandAnalytics.errorMsg = errorMsg;
+            console.error(errorMsg);
+        }
+        if (scanInfo) {
+            endCommandAnalytics.scanFunctionData = scanInfo;
+        }
+        await (0, analytics_1.postAnalytics)(endCommandAnalytics).catch((error) => {
+        });
+        if (errorMsg) {
+            process.exit(1);
         }
-        process.exit(1);
     }
 };
 exports.processLambda = processLambda;
@@ -127,6 +157,7 @@ const actualProcessLambda = async (lambdaOptions) => {
     if (results?.length) {
         (0, utils_1.printResults)(results);
     }
+    return { functionArn, scanId };
 };
 const validateRequiredLambdaParams = (options) => {
     if (options._unknown?.length) {

package/dist/lambda/types.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventType = exports.StatusType = void 0;
+var StatusType;
+(function (StatusType) {
+    StatusType["FAILED"] = "failed";
+    StatusType["SUCCESS"] = "success";
+})(StatusType = exports.StatusType || (exports.StatusType = {}));
+var EventType;
+(function (EventType) {
+    EventType["START"] = "start_command_session";
+    EventType["END"] = "end_command_session";
+})(EventType = exports.EventType || (exports.EventType = {}));

package/dist/scaAnalysis/common/formatMessage.js

@@ -13,7 +13,23 @@ const createGoTSMessage = goTree => {
         }
     };
 };
+const createRubyTSMessage = rubyTree => {
+    return {
+        ruby: {
+            rubyDependencyTrees: rubyTree
+        }
+    };
+};
+const createPythonTSMessage = pythonTree => {
+    return {
+        python: {
+            pythonDependencyTrees: pythonTree
+        }
+    };
+};
 module.exports = {
     createJavaTSMessage,
-    createGoTSMessage
+    createGoTSMessage,
+    createRubyTSMessage,
+    createPythonTSMessage
 };

package/dist/scaAnalysis/java/analysis.js

@@ -9,16 +9,13 @@ const determineProjectTypeAndCwd = (files, projectPath) => {
     const projectData = {};
     if (files[0].includes('pom.xml')) {
         projectData.projectType = MAVEN;
-        projectData.cwd = projectPath
-            ? projectPath
-            : files[0].replace('pom.xml', '');
     }
     else if (files[0].includes('build.gradle')) {
         projectData.projectType = GRADLE;
-        projectData.cwd = projectPath
-            ? projectPath
-            : files[0].replace('pom.xml', '');
     }
+    projectData.cwd = projectPath
+        ? projectPath.replace('pom.xml', '').replace('build.gradle', '')
+        : projectPath;
     return projectData;
 };
 const buildMaven = (config, projectData, timeout) => {

package/dist/scaAnalysis/java/index.js

@@ -3,10 +3,10 @@ const analysis = require('./analysis');
 const { parseBuildDeps } = require('./javaBuildDepsParser');
 const { createJavaTSMessage } = require('../common/formatMessage');
 const javaAnalysis = (config, languageFiles) => {
-    languageFiles.java.forEach(file => {
+    languageFiles.JAVA.forEach(file => {
         file.replace('build.gradle.kts', 'build.gradle');
     });
-    const javaDeps = buildJavaTree(config, languageFiles.java);
+    const javaDeps = buildJavaTree(config, languageFiles.JAVA);
     return createJavaTSMessage(javaDeps);
 };
 const buildJavaTree = (config, files) => {