Merge pull request #719 from snyk/feat/fixed-in-info

feat: fixed in info on vulns
snyk · Aug 8, 2019 · 64e248e · 64e248e
2 parents 9a95a78 + b28d01a
commit 64e248e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/cli/commands/test/formatters/legacy-format-issue.ts b/src/cli/commands/test/formatters/legacy-format-issue.ts
@@ -126,9 +126,13 @@ function createTruncatedVulnsPathsText(vulnList) {
 }
 
 function createFixedInText(vuln: any): string {
-  return vuln.nearestFixedInVersion ?
-    chalk.bold('\n  Fixed in: ' + vuln.nearestFixedInVersion )
-    : '';
+  if (vuln.nearestFixedInVersion) {
+    return chalk.bold('\n  Fixed in: ' + vuln.nearestFixedInVersion);
+  } else if (vuln.fixedIn && vuln.fixedIn.length > 0) {
+    return chalk.bold('\n  Fixed in: ' + vuln.fixedIn.join(', '));
+  }
+
+  return '';
 }
 
 function createRemediationText(vuln, packageManager) {
@@ -168,5 +172,9 @@ function createRemediationText(vuln, packageManager) {
     return chalk.bold(`\n  Remediation: \n    ${upgradePathsArray.join('\n    ')}`);
   }
 
+  if (vuln.fixedIn && vuln.fixedIn.length > 0) {
+    return createFixedInText(vuln);
+  }
+
   return '';
 }
diff --git a/src/cli/commands/test/formatters/remediation-based-format-issues.ts b/src/cli/commands/test/formatters/remediation-based-format-issues.ts
@@ -111,11 +111,14 @@ function constructUnfixableText(unresolved: IssueData[]) {
   if (!(unresolved.length > 0)) {
     return [];
   }
-  const unfixableIssuesTextArray = [chalk.bold.white('\nIssues that cannot be fixed:')];
+  const unfixableIssuesTextArray = [chalk.bold.white('\nIssues with no direct upgrade or patch:')];
   for (const issue of unresolved) {
-    const packageNameAtVersion = chalk.bold.whiteBright(`\n  ${issue.packageName}@${issue.version} \n`);
+    const extraInfo = issue.fixedIn
+      ? `\n  This issue was fixed in versions: ${issue.fixedIn.join(', ')}`
+      : '\n  No upgrade or patch available';
+    const packageNameAtVersion = chalk.bold.whiteBright(`\n  ${issue.packageName}@${issue.version}\n`);
     unfixableIssuesTextArray
-      .push(packageNameAtVersion + formatIssue(issue.id, issue.title, issue.severity, issue.isNew));
+      .push(packageNameAtVersion + formatIssue(issue.id, issue.title, issue.severity, issue.isNew) + `${extraInfo}`);
   }
 
   return unfixableIssuesTextArray;
@@ -140,9 +143,10 @@ function formatIssue(id: string, title: string, severity: SEVERITY, isNew: boole
     },
   };
   const newBadge = isNew ? ' (new)' : '';
+
   return severitiesColourMapping[severity].colorFunc(
     `  ✗ ${chalk.bold(title)}${newBadge} [${titleCaseText(severity)} Severity]`,
-    ) + `[${id}] `;
+    ) + `[${id}]`;
 }
 
 function titleCaseText(text) {

diff --git a/src/lib/snyk-test/legacy.ts b/src/lib/snyk-test/legacy.ts
@@ -68,6 +68,7 @@ export interface IssueData {
   description: string;
   title: string;
   severity: SEVERITY;
+  fixedIn: string[];
 }
 
 interface AnnotatedIssue extends IssueData {