snyk-cpp-plugin 2.22.2 → 2.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -95,11 +95,14 @@ function displayIssues(depGraph, issues, issuesData) {
95
95
  const issuesCount = issues.length == 1 ? '1 issue' : `${issues.length} issues`;
96
96
  const hasIssues = issues.length > 0;
97
97
  if (hasIssues) {
98
- const vulnerabilityIssues = issues.filter((issue) => issue.type === 'vulnerability');
99
- if (vulnerabilityIssues.length > 0) {
100
- prepareResults(result, vulnerabilityIssues, issuesData, 'Issues:');
98
+ const nonLicenseIssues = issues.filter((issue) => {
99
+ var _a;
100
+ return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) !== 'license';
101
+ });
102
+ if (nonLicenseIssues.length > 0) {
103
+ prepareResults(result, nonLicenseIssues, issuesData, 'Issues:');
101
104
  }
102
- const licenseIssues = issues.filter((issue) => issue.type === 'license');
105
+ const licenseIssues = issues.filter((issue) => { var _a; return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) === 'license'; });
103
106
  if (licenseIssues.length > 0) {
104
107
  prepareResults(result, licenseIssues, issuesData, 'License issues:');
105
108
  }
@@ -117,7 +120,7 @@ exports.displayIssues = displayIssues;
117
120
  function prepareResults(result, issues, issuesData, typeTitle) {
118
121
  result.push(chalk.bold(typeTitle));
119
122
  for (const { pkgName: name, pkgVersion: version, issueId: vulnId, } of issues) {
120
- const { title, severity } = issuesData[vulnId];
123
+ const { title, severity, legalInstructionsArray } = issuesData[vulnId];
121
124
  const color = common_1.getColorBySeverity(severity);
122
125
  const severityAndTitle = color.bold(`\n ✗ [${common_1.capitalize(severity)}] ${title}`);
123
126
  const dependencyName = computeDependencyName(name, version);
@@ -127,6 +130,12 @@ function prepareResults(result, issues, issuesData, typeTitle) {
127
130
  result.push(severityAndTitle);
128
131
  result.push(introducedThrough);
129
132
  result.push(urlText);
133
+ if (legalInstructionsArray) {
134
+ result.push(common_1.leftPad(chalk.bold(`Legal instructions:`), 3));
135
+ const { licenseName, legalContent } = legalInstructionsArray[0];
136
+ const legalInstructionsText = common_1.leftPad(`○ for ${licenseName}: ${legalContent}`, 3);
137
+ result.push(legalInstructionsText);
138
+ }
130
139
  }
131
140
  result.push('');
132
141
  }
@@ -1 +1 @@
1
- {"version":3,"file":"display.js","sourceRoot":"","sources":["../../lib/display/display.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"display.js","sourceRoot":"","sources":["../../lib/display/display.ts"],"names":[],"mappings":"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"}
@@ -21,9 +21,6 @@ async function display(scanResults, testResults, errors, options) {
21
21
  result = result.concat(display_1.displaySignatures(scanResults));
22
22
  }
23
23
  for (const testResult of testResults) {
24
- testResult.issues.forEach((issue) => (issue.type = issue.issueId.startsWith('snyk:lic:unmanaged:')
25
- ? 'license'
26
- : 'vulnerability'));
27
24
  const depGraph = dep_graph_1.createFromJSON(testResult.depGraphData);
28
25
  const [dependencies, issues] = display_1.selectDisplayStrategy(options, depGraph, testResult);
29
26
  if (testResult.issues.length > 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/display/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,oCAAiC;AACjC,+CAAiD;AAEjD,uCAImB;AACnB,0CAAoD;AAE7C,KAAK,UAAU,OAAO,CAC3B,WAAyB,EACzB,WAAyB,EACzB,MAAgB,EAChB,OAAiB;IAEjB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,uBAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAC5D;IAED,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,IAAI;QACF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE;YACjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC;YAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE;YAClB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,2BAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;SACxD;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,UAAU,CAAC,MAAM,CAAC,OAAO,CACvB,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC;gBAC3D,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,eAAe,CAAC,CACvB,CAAC;YACF,MAAM,QAAQ,GAAG,0BAAc,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,+BAAqB,CAClD,OAAO,EACP,QAAQ,EACR,UAAU,CACX,CAAC;YAEF,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChC,kBAAkB,GAAG,IAAI,CAAC;aAC3B;YAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SAC9C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,aAAK,CAAC,KAAK,CAAC,OAAO,IAAI,iCAAiC,KAAK,EAAE,CAAC,CAAC;QACjE,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;KACvD;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,kBAAkB,EAAE;QACtB,gBAAQ,CAAC,gBAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;KAC9D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAxDD,0BAwDC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/display/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,oCAAiC;AACjC,+CAAiD;AAEjD,uCAImB;AACnB,0CAAoD;AAE7C,KAAK,UAAU,OAAO,CAC3B,WAAyB,EACzB,WAAyB,EACzB,MAAgB,EAChB,OAAiB;IAEjB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,uBAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAC5D;IAED,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,IAAI;QACF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE;YACjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC;YAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE;YAClB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,2BAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;SACxD;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,QAAQ,GAAG,0BAAc,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,+BAAqB,CAClD,OAAO,EACP,QAAQ,EACR,UAAU,CACX,CAAC;YAEF,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChC,kBAAkB,GAAG,IAAI,CAAC;aAC3B;YAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SAC9C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,aAAK,CAAC,KAAK,CAAC,OAAO,IAAI,iCAAiC,KAAK,EAAE,CAAC,CAAC;QACjE,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;KACvD;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,kBAAkB,EAAE;QACtB,gBAAQ,CAAC,gBAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;KAC9D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAlDD,0BAkDC"}
package/dist/types.d.ts CHANGED
@@ -56,15 +56,20 @@ export interface Issue {
56
56
  fixInfo: {
57
57
  nearestFixedInVersion?: string;
58
58
  };
59
- type?: string;
60
59
  }
61
60
  export interface IssuesData {
62
61
  [issueId: string]: {
63
62
  id: string;
64
63
  severity: string;
65
64
  title: string;
65
+ type?: string | undefined;
66
+ legalInstructionsArray?: LegalInstruction[];
66
67
  };
67
68
  }
69
+ export interface LegalInstruction {
70
+ licenseName: string;
71
+ legalContent: string;
72
+ }
68
73
  export interface TestResult {
69
74
  issues: Issue[];
70
75
  issuesData: IssuesData;
package/package.json CHANGED
@@ -59,5 +59,5 @@
59
59
  "tsc-watch": "^4.2.9",
60
60
  "typescript": "^3.9.7"
61
61
  },
62
- "version": "2.22.2"
62
+ "version": "2.23.0"
63
63
  }