snyk 1.1106.0 → 1.1108.0

package/dist/cli/784.index.js

@@ -4436,7 +4436,7 @@ exports.tryGetSpec = tryGetSpec;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCodeAnalysisAndParseResults = void 0;
+exports.getCodeTestResults = void 0;
 const code_client_1 = __webpack_require__(95951);
 const legacy_1 = __webpack_require__(34013);
 const api_token_1 = __webpack_require__(95181);
@@ -4450,16 +4450,22 @@ const chalk_1 = __webpack_require__(32589);
 const debugLib = __webpack_require__(15158);
 const code_config_1 = __webpack_require__(55203);
 const debug = debugLib('snyk-code');
-async function getCodeAnalysisAndParseResults(root, options, sastSettings, requestId) {
+async function getCodeTestResults(root, options, sastSettings, requestId) {
     await spinner_1.spinner.clearAll();
     utils_1.analysisProgressUpdate();
     const codeAnalysis = await getCodeAnalysis(root, options, sastSettings, requestId);
     spinner_1.spinner.clearAll();
-    return parseSecurityResults(codeAnalysis);
+    if (!codeAnalysis) {
+        return null;
+    }
+    return {
+        reportResults: codeAnalysis.reportResults,
+        analysisResults: codeAnalysis.analysisResults,
+    };
 }
-exports.getCodeAnalysisAndParseResults = getCodeAnalysisAndParseResults;
+exports.getCodeTestResults = getCodeTestResults;
 async function getCodeAnalysis(root, options, sastSettings, requestId) {
-    var _a;
+    var _a, _b;
     const isLocalCodeEngineEnabled = isLocalCodeEngine(sastSettings);
     if (isLocalCodeEngineEnabled) {
         validateLocalCodeEngineUrl(sastSettings.localCodeEngine.url);
@@ -4468,6 +4474,7 @@ async function getCodeAnalysis(root, options, sastSettings, requestId) {
     const baseURL = isLocalCodeEngineEnabled
         ? sastSettings.localCodeEngine.url
         : code_config_1.getCodeClientProxyUrl();
+    const org = sastSettings.org;
     // TODO(james) This mirrors the implementation in request.ts and we need to use this for deeproxy calls
     // This ensures we support lowercase http(s)_proxy values as well
     // The weird IF around it ensures we don't create an envvar with
@@ -4490,9 +4497,22 @@ async function getCodeAnalysis(root, options, sastSettings, requestId) {
         ? severityToAnalysisSeverity(options.severityThreshold)
         : code_client_1.AnalysisSeverity.info;
     const result = await code_client_1.analyzeFolders({
-        connection: { baseURL, sessionToken, source, requestId },
+        connection: {
+            baseURL,
+            sessionToken,
+            source,
+            requestId,
+            org,
+        },
         analysisOptions: { severity },
         fileOptions: { paths: [root] },
+        ...(options.report && {
+            reportOptions: {
+                enabled: (_a = options.report) !== null && _a !== void 0 ? _a : false,
+                projectName: options['project-name'],
+                targetRef: options['target-reference'],
+            },
+        }),
         analysisContext: {
             initiator: 'CLI',
             flow: source,
@@ -4506,15 +4526,25 @@ async function getCodeAnalysis(root, options, sastSettings, requestId) {
         },
         languages: sastSettings.supportedLanguages,
     });
-    if ((_a = result === null || result === void 0 ? void 0 : result.fileBundle.skippedOversizedFiles) === null || _a === void 0 ? void 0 : _a.length) {
+    if ((_b = result === null || result === void 0 ? void 0 : result.fileBundle.skippedOversizedFiles) === null || _b === void 0 ? void 0 : _b.length) {
         debug('\n', chalk_1.default.yellow(`Warning!\nFiles were skipped in the analysis due to their size being greater than ${code_client_1.MAX_FILE_SIZE}B. Skipped files: ${[
             ...result.fileBundle.skippedOversizedFiles,
         ].join(', ')}`));
     }
-    if ((result === null || result === void 0 ? void 0 : result.analysisResults.type) === 'sarif') {
-        return result.analysisResults.sarif;
+    if (!result || result.analysisResults.type !== 'sarif') {
+        return null;
+    }
+    result.analysisResults.sarif = parseSecurityResults(result.analysisResults.sarif);
+    // Filter ignored issues when using report
+    if (options.report) {
+        result.analysisResults.sarif = filterIgnoredIssues(result.analysisResults.sarif);
     }
-    return null;
+    return result;
+}
+function filterIgnoredIssues(codeAnalysis) {
+    const results = codeAnalysis.runs[0].results;
+    codeAnalysis.runs[0].results = results === null || results === void 0 ? void 0 : results.filter((rule) => { var _a, _b; return ((_b = (_a = rule.suppressions) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0; });
+    return codeAnalysis;
 }
 function severityToAnalysisSeverity(severity) {
     if (severity === legacy_1.SEVERITY.CRITICAL) {
@@ -4529,9 +4559,6 @@ function severityToAnalysisSeverity(severity) {
 }
 function parseSecurityResults(codeAnalysis) {
     let securityRulesMap;
-    if (!codeAnalysis) {
-        return codeAnalysis;
-    }
     const rules = codeAnalysis.runs[0].tool.driver.rules;
     const results = codeAnalysis.runs[0].results;
     if (rules) {
@@ -4684,24 +4711,26 @@ exports.FeatureNotSupportedBySnykCodeError = FeatureNotSupportedBySnykCodeError;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPrefix = exports.getMeta = exports.getCodeDisplayedOutput = void 0;
+exports.getCodeReportDisplayedOutput = exports.getPrefix = exports.getMeta = exports.getCodeDisplayedOutput = void 0;
+const os_1 = __webpack_require__(12087);
 const Debug = __webpack_require__(15158);
 const chalk_1 = __webpack_require__(32589);
 const theme_1 = __webpack_require__(86988);
 const common_1 = __webpack_require__(53110);
 const right_pad_1 = __webpack_require__(80627);
 const debug = Debug('code-output');
-function getCodeDisplayedOutput(codeTest, meta, prefix) {
+function getCodeDisplayedOutput(testResults, meta, prefix) {
     let issues = {};
-    if (codeTest.runs[0].results) {
-        const results = codeTest.runs[0].results;
-        const rulesMap = getRulesMap(codeTest.runs[0].tool.driver.rules || []);
+    const sarif = testResults.analysisResults.sarif;
+    if (sarif.runs[0].results) {
+        const results = sarif.runs[0].results;
+        const rulesMap = getRulesMap(sarif.runs[0].tool.driver.rules || []);
         issues = getIssues(results, rulesMap);
     }
     const issuesText = issues.low.join('') + issues.medium.join('') + issues.high.join('');
     const summaryOKText = theme_1.color.status.success(`${theme_1.icon.VALID} Test completed`);
     const codeIssueSummary = getCodeIssuesSummary(issues);
-    return (prefix +
+    let summary = prefix +
         issuesText +
         '\n' +
         summaryOKText +
@@ -4711,7 +4740,13 @@ function getCodeDisplayedOutput(codeTest, meta, prefix) {
         chalk_1.default.bold('Summary:') +
         '\n\n' +
         codeIssueSummary +
-        '\n\n');
+        '\n\n';
+    if (testResults.reportResults) {
+        summary +=
+            getCodeReportDisplayedOutput(testResults.reportResults.reportUrl) +
+                '\n\n';
+    }
+    return summary;
 }
 exports.getCodeDisplayedOutput = getCodeDisplayedOutput;
 function getCodeIssuesSummary(issues) {
@@ -4739,7 +4774,7 @@ function getIssues(results, rulesMap) {
         high: [],
     };
     const issues = results.reduce((acc, res) => {
-        var _a, _b;
+        var _a, _b, _c;
         if ((_a = res.locations) === null || _a === void 0 ? void 0 : _a.length) {
             const location = res.locations[0].physicalLocation;
             if (res.level && (location === null || location === void 0 ? void 0 : location.artifactLocation) && (location === null || location === void 0 ? void 0 : location.region)) {
@@ -4755,7 +4790,10 @@ function getIssues(results, rulesMap) {
                 const artifactLocationUri = location.artifactLocation.uri;
                 const startLine = location.region.startLine;
                 const text = res.message.text;
-                const title = ruleIdSeverityText;
+                let title = ruleIdSeverityText;
+                if ((_c = res.fingerprints) === null || _c === void 0 ? void 0 : _c['identity']) {
+                    title += `\n   ID: ${res.fingerprints['identity']}`;
+                }
                 const path = `  Path: ${artifactLocationUri}, line ${startLine}`;
                 const info = `  Info: ${text}`;
                 acc[severity.toLowerCase()].push(`${title} \n ${path} \n ${info}\n\n`);
@@ -4797,6 +4835,15 @@ function getPrefix(path) {
     return chalk_1.default.bold.white('\nTesting ' + path + ' ...\n\n');
 }
 exports.getPrefix = getPrefix;
+function getCodeReportDisplayedOutput(reportUrl) {
+    return (chalk_1.default.bold('Code Report Complete') +
+        os_1.EOL +
+        os_1.EOL +
+        'Your test results are available at:' +
+        os_1.EOL +
+        chalk_1.default.bold(reportUrl));
+}
+exports.getCodeReportDisplayedOutput = getCodeReportDisplayedOutput;
 
 
 /***/ }),
@@ -4828,7 +4875,7 @@ exports.codePlugin = {
         return '';
     },
     async test(paths, options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const requestId = uuid_1.v4();
         debug(`Request ID: ${requestId}`);
         try {
@@ -4836,11 +4883,12 @@ exports.codePlugin = {
             const sastSettings = await settings_1.getSastSettings(options);
             // Currently code supports only one path
             const path = paths[0];
-            const sarifTypedResult = await analysis_1.getCodeAnalysisAndParseResults(path, options, sastSettings, requestId);
-            if (!sarifTypedResult) {
+            const testResults = await analysis_1.getCodeTestResults(path, options, sastSettings, requestId);
+            if (!testResults) {
                 throw new errors_1.NoSupportedSastFiles();
             }
-            const numOfIssues = ((_b = (_a = sarifTypedResult.runs) === null || _a === void 0 ? void 0 : _a[0].results) === null || _b === void 0 ? void 0 : _b.length) || 0;
+            const sarifTypedResult = (_a = testResults === null || testResults === void 0 ? void 0 : testResults.analysisResults) === null || _a === void 0 ? void 0 : _a.sarif;
+            const numOfIssues = ((_c = (_b = sarifTypedResult.runs) === null || _b === void 0 ? void 0 : _b[0].results) === null || _c === void 0 ? void 0 : _c.length) || 0;
             analytics.add('sast-issues-found', numOfIssues);
             let newOrg = options.org;
             if (!newOrg && sastSettings.org) {
@@ -4848,9 +4896,9 @@ exports.codePlugin = {
             }
             const meta = output_format_1.getMeta({ ...options, org: newOrg }, path);
             const prefix = output_format_1.getPrefix(path);
-            let readableResult = output_format_1.getCodeDisplayedOutput(sarifTypedResult, meta, prefix);
+            let readableResult = output_format_1.getCodeDisplayedOutput(testResults, meta, prefix);
             if (numOfIssues > 0 && options['no-markdown']) {
-                (_d = (_c = sarifTypedResult.runs) === null || _c === void 0 ? void 0 : _c[0].results) === null || _d === void 0 ? void 0 : _d.forEach(({ message }) => {
+                (_e = (_d = sarifTypedResult.runs) === null || _d === void 0 ? void 0 : _d[0].results) === null || _e === void 0 ? void 0 : _e.forEach(({ message }) => {
                     delete message.markdown;
                 });
             }