snyk 1.1288.0 → 1.1289.0

package/dist/cli/470.index.js

@@ -2376,7 +2376,7 @@ exports.formatLegalInstructions = formatLegalInstructions;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.formatIssue = exports.printPath = exports.formatIssuesWithRemediation = void 0;
+exports.printPath = exports.formatIssuesWithRemediation = void 0;
 const chalk_1 = __webpack_require__(32589);
 const theme_1 = __webpack_require__(86988);
 const common_1 = __webpack_require__(53110);
@@ -2400,6 +2400,7 @@ function formatIssuesWithRemediation(vulns, remediationInfo, options) {
             note: vuln.note,
             legalInstructions: vuln.legalInstructionsArray,
             paths: vuln.list.map((v) => v.from),
+            appliedPolicyRules: vuln.appliedPolicyRules,
         };
         if (vulnData.type === 'license') {
             basicLicenseInfo[vuln.metadata.id] = vulnData;
@@ -2456,13 +2457,25 @@ function constructLicenseText(basicLicenseInfo, testOptions) {
     }
     const licenseTextArray = [chalk_1.default.bold.green('\nLicense issues:')];
     for (const id of Object.keys(basicLicenseInfo)) {
-        const licenseText = formatIssue(id, basicLicenseInfo[id].title, basicLicenseInfo[id].severity, basicLicenseInfo[id].isNew, `${basicLicenseInfo[id].name}@${basicLicenseInfo[id].version}`, basicLicenseInfo[id].paths, testOptions, basicLicenseInfo[id].note, undefined, // We can never override license rules, so no originalSeverity here
-        basicLicenseInfo[id].legalInstructions);
+        const licenseText = formatIssue({
+            id,
+            title: basicLicenseInfo[id].title,
+            severity: basicLicenseInfo[id].severity,
+            isNew: basicLicenseInfo[id].isNew,
+            vulnerableModule: `${basicLicenseInfo[id].name}@${basicLicenseInfo[id].version}`,
+            paths: basicLicenseInfo[id].paths,
+            testOptions,
+            note: basicLicenseInfo[id].note,
+            originalSeverity: undefined,
+            legalInstructions: basicLicenseInfo[id].legalInstructions,
+            appliedPolicyRules: basicLicenseInfo[id].appliedPolicyRules,
+        });
         licenseTextArray.push('\n' + licenseText);
     }
     return licenseTextArray;
 }
 function constructPatchesText(patches, basicVulnInfo, testOptions) {
+    var _a;
     if (!(Object.keys(patches).length > 0)) {
         return [];
     }
@@ -2477,7 +2490,19 @@ function constructPatchesText(patches, basicVulnInfo, testOptions) {
         // todo: add vulnToPatch package name
         const packageAtVersion = `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`;
         const patchedText = `\n  Patch available for ${chalk_1.default.bold.whiteBright(packageAtVersion)}\n`;
-        const thisPatchFixes = formatIssue(id, basicVulnInfo[id].title, basicVulnInfo[id].severity, basicVulnInfo[id].isNew, `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`, basicVulnInfo[id].paths, testOptions, basicVulnInfo[id].note, basicVulnInfo[id].originalSeverity);
+        const thisPatchFixes = formatIssue({
+            id,
+            title: basicVulnInfo[id].title,
+            severity: basicVulnInfo[id].severity,
+            isNew: basicVulnInfo[id].isNew,
+            vulnerableModule: `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`,
+            paths: basicVulnInfo[id].paths,
+            testOptions,
+            note: basicVulnInfo[id].note,
+            originalSeverity: basicVulnInfo[id].originalSeverity,
+            legalInstructions: [],
+            appliedPolicyRules: (_a = basicVulnInfo[id]) === null || _a === void 0 ? void 0 : _a.appliedPolicyRules,
+        });
         patchedTextArray.push(patchedText + thisPatchFixes);
     }
     return patchedTextArray;
@@ -2488,7 +2513,22 @@ function thisUpgradeFixes(vulnIds, basicVulnInfo, testOptions) {
         .sort((a, b) => (0, get_severity_value_1.getSeverityValue)(basicVulnInfo[a].severity) -
         (0, get_severity_value_1.getSeverityValue)(basicVulnInfo[b].severity))
         .filter((id) => basicVulnInfo[id].type !== 'license')
-        .map((id) => formatIssue(id, basicVulnInfo[id].title, basicVulnInfo[id].severity, basicVulnInfo[id].isNew, `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`, basicVulnInfo[id].paths, testOptions, basicVulnInfo[id].note, basicVulnInfo[id].originalSeverity, []))
+        .map((id) => {
+        var _a;
+        return formatIssue({
+            id,
+            title: basicVulnInfo[id].title,
+            severity: basicVulnInfo[id].severity,
+            isNew: basicVulnInfo[id].isNew,
+            vulnerableModule: `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`,
+            paths: basicVulnInfo[id].paths,
+            testOptions,
+            note: basicVulnInfo[id].note,
+            originalSeverity: basicVulnInfo[id].originalSeverity,
+            legalInstructions: [],
+            appliedPolicyRules: (_a = basicVulnInfo[id]) === null || _a === void 0 ? void 0 : _a.appliedPolicyRules,
+        });
+    })
         .join('\n');
 }
 function processUpgrades(sink, upgradesByDep, deps, basicVulnInfo, testOptions) {
@@ -2562,7 +2602,19 @@ function constructUnfixableText(unresolved, basicVulnInfo, testOptions) {
         const extraInfo = issue.fixedIn && issue.fixedIn.length
             ? `\n  This issue was fixed in versions: ${chalk_1.default.bold(issue.fixedIn.join(', '))}`
             : '\n  No upgrade or patch available';
-        unfixableIssuesTextArray.push(formatIssue(issue.id, issue.title, issue.severity, issue.isNew, `${issue.packageName}@${issue.version}`, issueInfo.paths, testOptions, issueInfo.note, issueInfo.originalSeverity, []) + `${extraInfo}`);
+        unfixableIssuesTextArray.push(formatIssue({
+            id: issue.id,
+            title: issue.title,
+            severity: issue.severity,
+            isNew: issue.isNew,
+            vulnerableModule: `${issue.packageName}@${issue.version}`,
+            paths: issueInfo.paths,
+            testOptions,
+            note: issueInfo.note,
+            originalSeverity: issueInfo.originalSeverity,
+            legalInstructions: [],
+            appliedPolicyRules: issueInfo === null || issueInfo === void 0 ? void 0 : issueInfo.appliedPolicyRules,
+        }) + `${extraInfo}`);
     }
     if (unfixableIssuesTextArray.length === 1) {
         // seems we still only have
@@ -2575,7 +2627,8 @@ function printPath(path, slice = 1) {
     return path.slice(slice).join(constants_1.PATH_SEPARATOR);
 }
 exports.printPath = printPath;
-function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOptions, note, originalSeverity, legalInstructions) {
+function formatIssue(issue) {
+    const { id, title, severity, isNew, vulnerableModule, paths, testOptions, note, originalSeverity, legalInstructions, appliedPolicyRules, } = issue;
     const newBadge = isNew ? ' (new)' : '';
     const name = vulnerableModule ? ` in ${chalk_1.default.bold(vulnerableModule)}` : '';
     let legalLicenseInstructionsText;
@@ -2608,6 +2661,8 @@ function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOp
     if (originalSeverity && originalSeverity !== severity) {
         originalSeverityStr = ` (originally ${titleCaseText(originalSeverity)})`;
     }
+    const { value: userNote, reason: userNoteReason } = (appliedPolicyRules === null || appliedPolicyRules === void 0 ? void 0 : appliedPolicyRules.annotation) || {};
+    const { reason: severityReason } = (appliedPolicyRules === null || appliedPolicyRules === void 0 ? void 0 : appliedPolicyRules.severityChange) || {};
     return ((0, common_1.colorTextBySeverity)(severity, `  ${theme_1.icon.ISSUE} ${chalk_1.default.bold(title)}${newBadge} [${titleCaseText(severity)} Severity${originalSeverityStr}]`) +
         `[${(0, get_vuln_url_1.getVulnerabilityUrl)(id)}]` +
         name +
@@ -2615,9 +2670,11 @@ function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOp
         (legalLicenseInstructionsText
             ? `${chalk_1.default.bold('\n    Legal instructions')}:\n    ${legalLicenseInstructionsText}`
             : '') +
-        (note ? `${chalk_1.default.bold('\n    Note')}:\n    ${note}` : ''));
+        (note ? `${chalk_1.default.bold('\n    Note')}:\n    ${note}` : '') +
+        (severityReason ? '\n    Severity reason: ' + severityReason : '') +
+        (userNote ? '\n    User note: ' + userNote : '') +
+        (userNoteReason ? '\n    Note reason: ' + userNoteReason : ''));
 }
-exports.formatIssue = formatIssue;
 function titleCaseText(text) {
     return text[0].toUpperCase() + text.slice(1);
 }