snyk-nuget-plugin 1.25.4 → 1.26.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.
- package/dist/index.js +16 -2
- package/dist/index.js.map +1 -1
- package/dist/nuget-parser/dependency.js.map +1 -1
- package/dist/nuget-parser/dotnet-core-parser.js +3 -3
- package/dist/nuget-parser/dotnet-core-parser.js.map +1 -1
- package/dist/nuget-parser/dotnet-core-v2-parser.js +78 -0
- package/dist/nuget-parser/dotnet-core-v2-parser.js.map +1 -0
- package/dist/nuget-parser/dotnet-framework-parser.js +5 -5
- package/dist/nuget-parser/dotnet-framework-parser.js.map +1 -1
- package/dist/nuget-parser/index.js +44 -9
- package/dist/nuget-parser/index.js.map +1 -1
- package/dist/nuget-parser/nuspec-parser.js +14 -12
- package/dist/nuget-parser/nuspec-parser.js.map +1 -1
- package/package.json +20 -21
package/dist/index.js
CHANGED
|
@@ -33,8 +33,7 @@ async function inspect(root, targetFile, options) {
|
|
|
33
33
|
catch (error) {
|
|
34
34
|
return Promise.reject(error);
|
|
35
35
|
}
|
|
36
|
-
const createPackageTree = depTree => {
|
|
37
|
-
// TODO implement for paket and more than one framework
|
|
36
|
+
const createPackageTree = (depTree) => {
|
|
38
37
|
const targetFramework = depTree.meta
|
|
39
38
|
? depTree.meta.targetFramework
|
|
40
39
|
: undefined;
|
|
@@ -54,6 +53,21 @@ async function inspect(root, targetFile, options) {
|
|
|
54
53
|
options.strict)
|
|
55
54
|
.then(createPackageTree);
|
|
56
55
|
}
|
|
56
|
+
if (options['dotnet-runtime-resolution']) {
|
|
57
|
+
if (manifestType !== 'dotnet-core') {
|
|
58
|
+
return Promise.reject(new Error('runtime resolution beta flag is currently only applicable for .net core projects'));
|
|
59
|
+
}
|
|
60
|
+
const result = await nugetParser.buildDepGraphFromFiles(root, targetFile, manifestType, options['assets-project-name'], options['project-name-prefix']);
|
|
61
|
+
return {
|
|
62
|
+
dependencyGraph: result.dependencyGraph,
|
|
63
|
+
package: 'n/a',
|
|
64
|
+
plugin: {
|
|
65
|
+
name: 'snyk-nuget-plugin',
|
|
66
|
+
targetFile,
|
|
67
|
+
targetRuntime: result.targetFramework,
|
|
68
|
+
},
|
|
69
|
+
};
|
|
70
|
+
}
|
|
57
71
|
return nugetParser
|
|
58
72
|
.buildDepTreeFromFiles(root, targetFile, options.packagesFolder, manifestType, options['assets-project-name'], options['project-name-prefix'])
|
|
59
73
|
.then(createPackageTree);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,8CAA8C;AAC9C,iDAAiD;AACjD,qCAA6C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,8CAA8C;AAC9C,iDAAiD;AACjD,qCAA6C;AAG7C,SAAS,qBAAqB,CAAC,QAAQ;IACrC,QAAQ,IAAI,EAAE;QACZ,KAAK,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnC,OAAO,cAAc,CAAC;SACvB;QACD,KAAK,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1C,OAAO,aAAa,CAAC;SACtB;QACD,KAAK,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtC,OAAO,iBAAiB,CAAC;SAC1B;QACD,KAAK,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,CAAC,CAAC;YACP,MAAM,IAAI,0BAAiB,CACzB,wCAAwC,GAAG,QAAQ,CACpD,CAAC;SACH;KACF;AACH,CAAC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAAI,EACJ,UAAU,EACV,OAAQ;IAER,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IACxB,IAAI,YAAY,CAAC;IACjB,IAAI;QACF,YAAY,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC9B;IAED,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,EAAE;QACpC,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI;YAClC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe;YAC9B,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE;gBACN,IAAI,EAAE,mBAAmB;gBACzB,UAAU;gBACV,aAAa,EAAE,eAAe;aAC/B;SACF,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,YAAY,KAAK,OAAO,EAAE;QAC5B,OAAO,WAAW;aACf,qBAAqB,CACpB,IAAI,EACJ,UAAU,EACV,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,EACjD,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,gDAAgD;QACvF,OAAO,CAAC,MAAM,CACf;aACA,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,CAAC,2BAA2B,CAAC,EAAE;QACxC,IAAI,YAAY,KAAK,aAAa,EAAE;YAClC,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,kFAAkF,CACnF,CACF,CAAC;SACH;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,sBAAsB,CACrD,IAAI,EACJ,UAAU,EACV,YAAY,EACZ,OAAO,CAAC,qBAAqB,CAAC,EAC9B,OAAO,CAAC,qBAAqB,CAAC,CAC/B,CAAC;QACF,OAAO;YACL,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,OAAO,EAAE,KAAK;YACd,MAAM,EAAE;gBACN,IAAI,EAAE,mBAAmB;gBACzB,UAAU;gBACV,aAAa,EAAE,MAAM,CAAC,eAAe;aACtC;SACF,CAAC;KACH;IAED,OAAO,WAAW;SACf,qBAAqB,CACpB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,cAAc,EACtB,YAAY,EACZ,OAAO,CAAC,qBAAqB,CAAC,EAC9B,OAAO,CAAC,qBAAqB,CAAC,CAC/B;SACA,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAC7B,CAAC;AA7ED,0BA6EC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency.js","sourceRoot":"","sources":["../../lib/nuget-parser/dependency.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,uFAAiF;AACjF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAQlC,SAAgB,YAAY,CAAC,GAAe;IAC1C,kCAAkC;IAClC,OAAO;QACL,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;AACJ,CAAC;AAPD,oCAOC;AAED,SAAS,6BAA6B,CAAC,UAAU;IAC/C,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"dependency.js","sourceRoot":"","sources":["../../lib/nuget-parser/dependency.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,uFAAiF;AACjF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAQlC,SAAgB,YAAY,CAAC,GAAe;IAC1C,kCAAkC;IAClC,OAAO;QACL,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;AACJ,CAAC;AAPD,oCAOC;AAED,SAAS,6BAA6B,CAAC,UAAU;IAC/C,MAAM,gBAAgB,GACpB,gEAAgE,CAAC,IAAI,CACnE,UAAU,CACX,CAAC;IAEJ,IAAI,gBAAgB,IAAI,IAAI,EAAE;QAC5B,KAAK,CACH,8CAA8C,UAAU,uIAAuI,CAChM,CAAC;QACF,MAAM,IAAI,sDAAwB,CAChC,6EAA6E,UAAU,EAAE,CAC1F,CAAC;KACH;IAED,MAAM,UAAU,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,CAAC,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAC,UAAU;IACvC,KAAK,CAAC,4BAA4B,GAAG,UAAU,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO;QACL,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,SAAgB,uBAAuB,CAAC,QAAQ;IAC9C,KAAK,CACH,sCAAsC;QACpC,UAAU;QACV,QAAQ,CAAC,CAAC,CAAC,EAAE;QACb,aAAa;QACb,QAAQ,CAAC,CAAC,CAAC,OAAO,CACrB,CAAC;IACF,OAAO;QACL,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE;QACnB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO;KAC5B,CAAC;AACJ,CAAC;AAbD,0DAaC"}
|
|
@@ -19,7 +19,7 @@ function initFreqDepsDict() {
|
|
|
19
19
|
}
|
|
20
20
|
function pick(obj, keys) {
|
|
21
21
|
const pickedObj = {};
|
|
22
|
-
Object.keys(obj).forEach(k => {
|
|
22
|
+
Object.keys(obj).forEach((k) => {
|
|
23
23
|
if (keys.includes(k)) {
|
|
24
24
|
pickedObj[k] = obj[k];
|
|
25
25
|
}
|
|
@@ -33,7 +33,7 @@ function convertFromPathSyntax(path) {
|
|
|
33
33
|
}
|
|
34
34
|
function collectFlatList(targetObj) {
|
|
35
35
|
const names = Object.keys(targetObj);
|
|
36
|
-
return names.map(name => {
|
|
36
|
+
return names.map((name) => {
|
|
37
37
|
name = convertFromPathSyntax(name);
|
|
38
38
|
return name;
|
|
39
39
|
});
|
|
@@ -56,7 +56,7 @@ function buildBfsTree(targetDeps, roots) {
|
|
|
56
56
|
return constructTree(roots, nodes, links);
|
|
57
57
|
}
|
|
58
58
|
function isScanned(nodes, pkg) {
|
|
59
|
-
const node = nodes.find(elem => elem.name === pkg.name && elem.version === pkg.version);
|
|
59
|
+
const node = nodes.find((elem) => elem.name === pkg.name && elem.version === pkg.version);
|
|
60
60
|
return !!node;
|
|
61
61
|
}
|
|
62
62
|
function isFreqDep(packageName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnet-core-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-core-parser.ts"],"names":[],"mappings":";;;AAAA,sCAAiD;AACjD,qCAAqC;AAErC,4BAA4B;AAC5B,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAElC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAiB9B,MAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAS,gBAAgB;IACvB,QAAQ,CAAC,6BAA6B,CAAC,GAAG,KAAK,CAAC;IAChD,QAAQ,CAAC,2BAA2B,CAAC,GAAG,KAAK,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC;IACnC,QAAQ,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;IAC9B,QAAQ,CAAC,sBAAsB,CAAC,GAAG,KAAK,CAAC;IACzC,QAAQ,CAAC,wBAAwB,CAAC,GAAG,KAAK,CAAC;IAC3C,QAAQ,CAAC,mBAAmB,CAAC,GAAG,KAAK,CAAC;IACtC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,KAAK,CAAC;AAC3C,CAAC;AAED,SAAS,IAAI,CAAC,GAA4B,EAAE,IAAc;IACxD,MAAM,SAAS,GAA4B,EAAE,CAAC;IAE9C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"dotnet-core-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-core-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parse = void 0;
|
|
4
|
+
const debugModule = require("debug");
|
|
5
|
+
const dep_graph_1 = require("@snyk/dep-graph");
|
|
6
|
+
const debug = debugModule('snyk');
|
|
7
|
+
// Dependencies that starts with these are discarded
|
|
8
|
+
const FILTERED_DEPENDENCY_PREFIX = ['runtime'];
|
|
9
|
+
function recursivelyPopulateNodes(depGraphBuilder, targetDeps, node, runtimeAssembly, visited) {
|
|
10
|
+
const parentId = node.type === 'root' ? 'root-node' : `${node.name}@${node.version}`;
|
|
11
|
+
for (const depNode of Object.entries(node.dependencies || {})) {
|
|
12
|
+
const localVisited = visited || new Set();
|
|
13
|
+
const name = depNode[0];
|
|
14
|
+
let version = depNode[1];
|
|
15
|
+
if (runtimeAssembly && name in runtimeAssembly) {
|
|
16
|
+
version = runtimeAssembly[name];
|
|
17
|
+
}
|
|
18
|
+
const childNode = Object.assign(Object.assign({}, targetDeps[`${name}/${version}`]), { name,
|
|
19
|
+
version });
|
|
20
|
+
const childId = `${childNode.name}@${childNode.version}`;
|
|
21
|
+
if (localVisited.has(childId)) {
|
|
22
|
+
const prunedId = `${childId}:pruned`;
|
|
23
|
+
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
24
|
+
labels: { pruned: 'true' },
|
|
25
|
+
});
|
|
26
|
+
depGraphBuilder.connectDep(parentId, prunedId);
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childId);
|
|
30
|
+
depGraphBuilder.connectDep(parentId, childId);
|
|
31
|
+
localVisited.add(childId);
|
|
32
|
+
recursivelyPopulateNodes(depGraphBuilder, targetDeps, childNode, runtimeAssembly, localVisited);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
function buildGraph(projectName, projectAssets, runtimeAssembly) {
|
|
36
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'nuget' }, {
|
|
37
|
+
name: projectName,
|
|
38
|
+
version: projectAssets.project.version,
|
|
39
|
+
});
|
|
40
|
+
// FIXME: Multiple frameworks
|
|
41
|
+
const key = Object.keys(projectAssets.project.frameworks)[0];
|
|
42
|
+
const topLevelDeps = Object.keys(projectAssets.project.frameworks[key].dependencies);
|
|
43
|
+
// The project.assets.json file is already structured quite decently, so we just use that file directly
|
|
44
|
+
const targetDeps = Object.entries(projectAssets.targets[key]).reduce((acc, entry) => {
|
|
45
|
+
const [nameWithVersion, pkg] = entry;
|
|
46
|
+
if (FILTERED_DEPENDENCY_PREFIX.some((prefix) => nameWithVersion.startsWith(prefix))) {
|
|
47
|
+
return acc;
|
|
48
|
+
}
|
|
49
|
+
return Object.assign(Object.assign({}, acc), { [nameWithVersion]: pkg });
|
|
50
|
+
}, {});
|
|
51
|
+
const topLevelDepPackages = topLevelDeps.reduce((acc, topLevelDepName) => {
|
|
52
|
+
const nameWithVersion = Object.keys(targetDeps).find((targetDep) => targetDep.startsWith(topLevelDepName));
|
|
53
|
+
if (!nameWithVersion) {
|
|
54
|
+
throw new Error("cant find a name and a version in assets file, something's very malformed");
|
|
55
|
+
}
|
|
56
|
+
const [name, version] = nameWithVersion.split('/');
|
|
57
|
+
return Object.assign(Object.assign({}, acc), { [name]: version });
|
|
58
|
+
}, {});
|
|
59
|
+
const rootNode = {
|
|
60
|
+
type: 'root',
|
|
61
|
+
dependencies: topLevelDepPackages,
|
|
62
|
+
};
|
|
63
|
+
recursivelyPopulateNodes(depGraphBuilder, targetDeps, rootNode, runtimeAssembly);
|
|
64
|
+
return depGraphBuilder.build();
|
|
65
|
+
}
|
|
66
|
+
function parse(projectName, projectAssets, runtimeAssembly) {
|
|
67
|
+
debug('Trying to parse .net core manifest with v2 depGraph builder');
|
|
68
|
+
let result;
|
|
69
|
+
if (!runtimeAssembly) {
|
|
70
|
+
result = buildGraph(projectName, projectAssets);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
result = buildGraph(projectName, projectAssets, runtimeAssembly);
|
|
74
|
+
}
|
|
75
|
+
return result;
|
|
76
|
+
}
|
|
77
|
+
exports.parse = parse;
|
|
78
|
+
//# sourceMappingURL=dotnet-core-v2-parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dotnet-core-v2-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-core-v2-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ function injectPath(dep, packagesFolder) {
|
|
|
18
18
|
function scanInstalled(installedPackages, packagesFolder) {
|
|
19
19
|
const flattenedPackageList = {};
|
|
20
20
|
debug('Located ' + installedPackages.length + ' packages in manifest');
|
|
21
|
-
installedPackages.forEach(entry => {
|
|
21
|
+
installedPackages.forEach((entry) => {
|
|
22
22
|
injectPath(entry, packagesFolder);
|
|
23
23
|
flattenedPackageList[entry.name] =
|
|
24
24
|
flattenedPackageList[entry.name] || entry;
|
|
@@ -28,7 +28,7 @@ function scanInstalled(installedPackages, packagesFolder) {
|
|
|
28
28
|
debug('Scanning local installed folders');
|
|
29
29
|
debug('Trying to read from installed packages folder: ' + packagesFolder);
|
|
30
30
|
fs.readdirSync(packagesFolder)
|
|
31
|
-
.map(folderName => {
|
|
31
|
+
.map((folderName) => {
|
|
32
32
|
try {
|
|
33
33
|
return (0, dependency_1.fromFolderName)(folderName);
|
|
34
34
|
}
|
|
@@ -37,7 +37,7 @@ function scanInstalled(installedPackages, packagesFolder) {
|
|
|
37
37
|
debug(err);
|
|
38
38
|
}
|
|
39
39
|
})
|
|
40
|
-
.forEach(dep => {
|
|
40
|
+
.forEach((dep) => {
|
|
41
41
|
if (dep) {
|
|
42
42
|
injectPath(dep, packagesFolder);
|
|
43
43
|
// only add a package from packages folder if version is different
|
|
@@ -86,7 +86,7 @@ async function fetchNugetInformationFromPackages(flattenedPackageList, targetFra
|
|
|
86
86
|
}
|
|
87
87
|
function processNugetInformation(nuspecResolutionChain) {
|
|
88
88
|
const nuspecResolutions = {};
|
|
89
|
-
nuspecResolutionChain.forEach(resolution => {
|
|
89
|
+
nuspecResolutionChain.forEach((resolution) => {
|
|
90
90
|
if (!resolution) {
|
|
91
91
|
return;
|
|
92
92
|
} // jscs:ignore
|
|
@@ -128,7 +128,7 @@ async function parse(tree, manifest, targetFramework, packagesFolder) {
|
|
|
128
128
|
// now the flat list should be rebuilt as a tree
|
|
129
129
|
debug('Building dependency tree');
|
|
130
130
|
const nugetKeys = Object.keys(nuspecResolutions);
|
|
131
|
-
Object.keys(flattenedPackageList).forEach(packageName => {
|
|
131
|
+
Object.keys(flattenedPackageList).forEach((packageName) => {
|
|
132
132
|
tree.dependencies[packageName] = (0, dependency_1.cloneShallow)(flattenedPackageList[packageName]);
|
|
133
133
|
});
|
|
134
134
|
if (nugetKeys.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnet-framework-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-framework-parser.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,6CAAwE;AACxE,mDAA8C;AAC9C,qCAAqC;AAErC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAElC,SAAS,UAAU,CAAC,GAAG,EAAE,cAAc;IACrC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS;QACtB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/D,IAAI,GAAG,CAAC,SAAS,EAAE;QACjB,OAAO,GAAG,CAAC,SAAS,CAAC;KACtB;AACH,CAAC;AAED,SAAS,aAAa,CAAC,iBAAiB,EAAE,cAAc;IACtD,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,KAAK,CAAC,UAAU,GAAG,iBAAiB,CAAC,MAAM,GAAG,uBAAuB,CAAC,CAAC;IACvE,iBAAiB,CAAC,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"dotnet-framework-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-framework-parser.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,6CAAwE;AACxE,mDAA8C;AAC9C,qCAAqC;AAErC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAElC,SAAS,UAAU,CAAC,GAAG,EAAE,cAAc;IACrC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS;QACtB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/D,IAAI,GAAG,CAAC,SAAS,EAAE;QACjB,OAAO,GAAG,CAAC,SAAS,CAAC;KACtB;AACH,CAAC;AAED,SAAS,aAAa,CAAC,iBAAiB,EAAE,cAAc;IACtD,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,KAAK,CAAC,UAAU,GAAG,iBAAiB,CAAC,MAAM,GAAG,uBAAuB,CAAC,CAAC;IACvE,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAClC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAClC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC;YAC9B,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;QAC5C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,IAAI;QACF,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC1C,KAAK,CAAC,iDAAiD,GAAG,cAAc,CAAC,CAAC;QAC1E,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC;aAC3B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAClB,IAAI;gBACF,OAAO,IAAA,2BAAc,EAAC,UAAU,CAAC,CAAC;aACnC;YAAC,OAAO,GAAG,EAAE;gBACZ,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAChD,KAAK,CAAC,GAAG,CAAC,CAAC;aACZ;QACH,CAAC,CAAC;aACD,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,IAAI,GAAG,EAAE;gBACP,UAAU,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;gBAChC,kEAAkE;gBAClE,IACE,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC;oBAC9B,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,EACtD;oBACA,wDAAwD;oBACxD,KAAK,CACH,cAAc;wBACZ,GAAG,CAAC,IAAI;wBACR,eAAe;wBACf,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO;wBACtC,oCAAoC;wBACpC,uCAAuC;wBACvC,GAAG,CAAC,OAAO;wBACX,2BAA2B,CAC9B,CAAC;oBACF,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;iBACtC;aACF;QACH,CAAC,CAAC,CAAC;KACN;IAAC,OAAO,GAAG,EAAE;QACZ,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACrD,KAAK,CAAC,GAAG,CAAC,CAAC;KACZ;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,iCAAiC,CAC9C,oBAAoB,EACpB,eAAe;IAEf,MAAM,uBAAuB,GAAU,EAAE,CAAC;IAC1C,uEAAuE;IACvE,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;QACpD,IAAI;YACF,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;YACpB,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAW,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACzD,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACxC;QAAC,OAAO,CAAC,EAAE;YACV,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACpC,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,wCAAwC;YACxC,4DAA4D;YAC5D,MAAM,CAAC,CAAC;SACT;KACF;IACD,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED,SAAS,uBAAuB,CAAC,qBAAqB;IACpD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,qBAAqB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC3C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR,CAAC,cAAc;QAChB,KAAK,CAAC,uBAAuB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACjD,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAChB,IAAI,EACJ,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB;IAEjB,KAAK,MAAM,aAAa,IAAI,gBAAgB,EAAE;QAC5C,IAAI,oBAAgC,CAAC;QACrC,IAAI,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC5C,kBAAkB;YAClB,oBAAoB,GAAG,IAAA,yBAAY,EACjC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CACzC,CAAC;SACH;aAAM;YACL,8BAA8B;YAC9B,oBAAoB,GAAG;gBACrB,YAAY,EAAE,EAAE;gBAChB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,OAAO,EAAE,aAAa,CAAC,OAAO;aAC/B,CAAC;SACH;QACD,MAAM,kBAAkB,GACtB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAC3C,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;YACxD,EAAE,CAAC;QACL,SAAS,CACP,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,CAClB,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC;KACrE;AACH,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc;IACzE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC3D;IAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACrE,MAAM,uBAAuB,GAAG,MAAM,iCAAiC,CACrE,oBAAoB,EACpB,eAAe,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,uBAAuB,CAAC,CAAC;IAC3E,uEAAuE;IACvE,gDAAgD;IAChD,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAElC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACxD,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,IAAA,yBAAY,EAC3C,oBAAoB,CAAC,WAAW,CAAC,CAClC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,iDAAiD;QACjD,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;YAC3B,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC1C,MAAM,IAAI,GAAG,IAAA,yBAAY,EAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACjE,SAAS,CACP,IAAI,EACJ,UAAU,CAAC,QAAQ,EACnB,oBAAoB,EACpB,iBAAiB,CAClB,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;SACrC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AApCD,sBAoCC"}
|
|
@@ -1,23 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getMinimumTargetFrameworkFromPackagesConfig = exports.buildDepTreeFromFiles = void 0;
|
|
3
|
+
exports.getMinimumTargetFrameworkFromPackagesConfig = exports.buildDepTreeFromFiles = exports.buildDepGraphFromFiles = void 0;
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const csproj_parser_1 = require("./csproj-parser");
|
|
7
7
|
const debugModule = require("debug");
|
|
8
|
-
const debug = debugModule('snyk');
|
|
9
8
|
const dotnetCoreParser = require("./dotnet-core-parser");
|
|
9
|
+
const dotnetCoreV2Parser = require("./dotnet-core-v2-parser");
|
|
10
10
|
const dotnetFrameworkParser = require("./dotnet-framework-parser");
|
|
11
11
|
const projectJsonParser = require("./project-json-parser");
|
|
12
12
|
const packagesConfigParser = require("./packages-config-parser");
|
|
13
13
|
const errors_1 = require("../errors");
|
|
14
14
|
const depsParser = require("dotnet-deps-parser");
|
|
15
15
|
const framework_1 = require("./framework");
|
|
16
|
+
const debug = debugModule('snyk');
|
|
16
17
|
const PARSERS = {
|
|
17
18
|
'dotnet-core': {
|
|
18
19
|
depParser: dotnetCoreParser,
|
|
19
20
|
fileContentParser: JSON,
|
|
20
21
|
},
|
|
22
|
+
'dotnet-core-v2': {
|
|
23
|
+
depParser: dotnetCoreV2Parser,
|
|
24
|
+
fileContentParser: JSON,
|
|
25
|
+
},
|
|
21
26
|
'packages.config': {
|
|
22
27
|
depParser: dotnetFrameworkParser,
|
|
23
28
|
fileContentParser: packagesConfigParser,
|
|
@@ -40,19 +45,49 @@ function getRootName(root, projectRootFolder, projectNamePrefix) {
|
|
|
40
45
|
}
|
|
41
46
|
return defaultRootName;
|
|
42
47
|
}
|
|
43
|
-
|
|
44
|
-
var _a, _b;
|
|
45
|
-
const safeRoot = root || '.';
|
|
46
|
-
const safeTargetFile = targetFile || '.';
|
|
47
|
-
const fileContentPath = path.resolve(safeRoot, safeTargetFile);
|
|
48
|
-
let fileContent;
|
|
48
|
+
function getFileContents(fileContentPath) {
|
|
49
49
|
try {
|
|
50
50
|
debug(`Parsing content of ${fileContentPath}`);
|
|
51
|
-
|
|
51
|
+
return fs.readFileSync(fileContentPath, 'utf-8');
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
54
54
|
throw new errors_1.FileNotProcessableError(error);
|
|
55
55
|
}
|
|
56
|
+
}
|
|
57
|
+
async function buildDepGraphFromFiles(root, targetFile, manifestType, useProjectNameFromAssetsFile, projectNamePrefix) {
|
|
58
|
+
var _a, _b;
|
|
59
|
+
const safeRoot = root || '.';
|
|
60
|
+
const safeTargetFile = targetFile || '.';
|
|
61
|
+
const fileContentPath = path.resolve(safeRoot, safeTargetFile);
|
|
62
|
+
const fileContent = getFileContents(fileContentPath);
|
|
63
|
+
const projectRootFolder = path.resolve(fileContentPath, '../../');
|
|
64
|
+
const targetFramework = await (0, csproj_parser_1.getTargetFrameworksFromProjFile)(projectRootFolder);
|
|
65
|
+
const parser = PARSERS['dotnet-core-v2'];
|
|
66
|
+
const manifest = await parser.fileContentParser.parse(fileContent);
|
|
67
|
+
let resolvedProjectName = getRootName(root, projectRootFolder, projectNamePrefix);
|
|
68
|
+
if (manifestType === 'dotnet-core' && useProjectNameFromAssetsFile) {
|
|
69
|
+
const projectName = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest.project) === null || _a === void 0 ? void 0 : _a.restore) === null || _b === void 0 ? void 0 : _b.projectName;
|
|
70
|
+
if (projectName) {
|
|
71
|
+
resolvedProjectName = projectName;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
debug("project.assets.json file doesn't contain a value for 'projectName'. Using default value: " +
|
|
75
|
+
resolvedProjectName);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
const depGraph = parser.depParser.parse(resolvedProjectName, manifest);
|
|
79
|
+
return {
|
|
80
|
+
dependencyGraph: depGraph,
|
|
81
|
+
targetFramework: targetFramework === null || targetFramework === void 0 ? void 0 : targetFramework.original,
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
exports.buildDepGraphFromFiles = buildDepGraphFromFiles;
|
|
85
|
+
async function buildDepTreeFromFiles(root, targetFile, packagesFolderPath, manifestType, useProjectNameFromAssetsFile, projectNamePrefix) {
|
|
86
|
+
var _a, _b;
|
|
87
|
+
const safeRoot = root || '.';
|
|
88
|
+
const safeTargetFile = targetFile || '.';
|
|
89
|
+
const fileContentPath = path.resolve(safeRoot, safeTargetFile);
|
|
90
|
+
const fileContent = getFileContents(fileContentPath);
|
|
56
91
|
const projectRootFolder = path.resolve(fileContentPath, '../../');
|
|
57
92
|
const packagesFolder = getPackagesFolder(packagesFolderPath, projectRootFolder);
|
|
58
93
|
const tree = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/nuget-parser/index.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,mDAAkE;AAClE,qCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/nuget-parser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ async function loadNuspecFromAsync(dep) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
const nuspecZipData = await JSZip.loadAsync(nupkgData);
|
|
44
|
-
const nuspecFile = Object.keys(nuspecZipData.files).find(file => {
|
|
44
|
+
const nuspecFile = Object.keys(nuspecZipData.files).find((file) => {
|
|
45
45
|
return path.extname(file) === '.nuspec';
|
|
46
46
|
});
|
|
47
47
|
if (!nuspecFile) {
|
|
@@ -52,11 +52,13 @@ async function loadNuspecFromAsync(dep) {
|
|
|
52
52
|
}
|
|
53
53
|
const rawNuspecContent = await nuspecZipData.files[nuspecFile].async('text');
|
|
54
54
|
const encoding = detectNuspecContentEncoding(rawNuspecContent);
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
|
|
55
|
+
const encoder = new TextEncoder();
|
|
56
|
+
const encoded = encoder.encode(rawNuspecContent);
|
|
57
|
+
const decoder = new TextDecoder(encoding);
|
|
58
|
+
const encodedNuspecContent = decoder.decode(encoded);
|
|
59
|
+
return removePotentialUtf16Characters(encodedNuspecContent);
|
|
58
60
|
}
|
|
59
|
-
//this is exported for testing, but should not
|
|
61
|
+
//this is exported for testing, but should not execute directly. Hence the '_' in the name.
|
|
60
62
|
async function _parsedNuspec(nuspecContent, targetFramework, depName) {
|
|
61
63
|
var _a;
|
|
62
64
|
const parsedNuspec = await parseXML.parseStringPromise(nuspecContent);
|
|
@@ -64,7 +66,7 @@ async function _parsedNuspec(nuspecContent, targetFramework, depName) {
|
|
|
64
66
|
//note: this will throw if assertion fails
|
|
65
67
|
assertNuspecSchema(nuspecContent, parsedNuspec);
|
|
66
68
|
for (const metadata of parsedNuspec.package.metadata) {
|
|
67
|
-
(_a = metadata.dependencies) === null || _a === void 0 ? void 0 : _a.forEach(rawDependency => {
|
|
69
|
+
(_a = metadata.dependencies) === null || _a === void 0 ? void 0 : _a.forEach((rawDependency) => {
|
|
68
70
|
// Find and add target framework version specific dependencies
|
|
69
71
|
const depsForTargetFramework = extractDepsForTargetFramework(rawDependency, targetFramework);
|
|
70
72
|
if (depsForTargetFramework && depsForTargetFramework.group) {
|
|
@@ -74,7 +76,7 @@ async function _parsedNuspec(nuspecContent, targetFramework, depName) {
|
|
|
74
76
|
// add their deps
|
|
75
77
|
const depsFromPlainGroups = extractDepsForPlainGroups(rawDependency);
|
|
76
78
|
if (depsFromPlainGroups) {
|
|
77
|
-
depsFromPlainGroups.forEach(depGroup => {
|
|
79
|
+
depsFromPlainGroups.forEach((depGroup) => {
|
|
78
80
|
ownDeps = ownDeps.concat(extractDepsFromRaw(depGroup.dependency));
|
|
79
81
|
});
|
|
80
82
|
}
|
|
@@ -120,7 +122,7 @@ function extractDepsForPlainGroups(rawDependency) {
|
|
|
120
122
|
if (!rawDependency.group) {
|
|
121
123
|
return [];
|
|
122
124
|
}
|
|
123
|
-
return rawDependency.group.filter(group => {
|
|
125
|
+
return rawDependency.group.filter((group) => {
|
|
124
126
|
// valid group with no attributes or no `targetFramework` attribute
|
|
125
127
|
return group && !(group.$ && group.$.targetFramework);
|
|
126
128
|
});
|
|
@@ -130,12 +132,12 @@ function extractDepsForTargetFramework(rawDependency, targetFramework) {
|
|
|
130
132
|
return;
|
|
131
133
|
}
|
|
132
134
|
return rawDependency.group
|
|
133
|
-
.filter(group => {
|
|
135
|
+
.filter((group) => {
|
|
134
136
|
var _a;
|
|
135
137
|
return (((_a = group === null || group === void 0 ? void 0 : group.$) === null || _a === void 0 ? void 0 : _a.targetFramework) &&
|
|
136
138
|
targetFrameworkRegex.test(group.$.targetFramework));
|
|
137
139
|
})
|
|
138
|
-
.map(group => {
|
|
140
|
+
.map((group) => {
|
|
139
141
|
const parts = group.$.targetFramework.split(targetFrameworkRegex);
|
|
140
142
|
return {
|
|
141
143
|
framework: parts[1],
|
|
@@ -149,7 +151,7 @@ function extractDepsForTargetFramework(rawDependency, targetFramework) {
|
|
|
149
151
|
}
|
|
150
152
|
return a.framework > b.framework ? -1 : 1;
|
|
151
153
|
})
|
|
152
|
-
.find(group => {
|
|
154
|
+
.find((group) => {
|
|
153
155
|
return (targetFramework.framework === group.framework &&
|
|
154
156
|
targetFramework.version >= group.version);
|
|
155
157
|
});
|
|
@@ -159,7 +161,7 @@ function extractDepsFromRaw(rawDependencies) {
|
|
|
159
161
|
return [];
|
|
160
162
|
}
|
|
161
163
|
const deps = [];
|
|
162
|
-
rawDependencies.forEach(dep => {
|
|
164
|
+
rawDependencies.forEach((dep) => {
|
|
163
165
|
if (dep && dep.$) {
|
|
164
166
|
deps.push({
|
|
165
167
|
dependencies: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nuspec-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/nuspec-parser.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;
|
|
1
|
+
{"version":3,"file":"nuspec-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/nuspec-parser.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AAGnC,qCAAqC;AAGrC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAElC,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAE9C,KAAK,UAAU,WAAW,CAC/B,GAAmB,EACnB,eAAgC;IAEhC,YAAY;IACZ,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;KACH;IAED,oBAAoB;IACpB,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAC;KACH;IAED,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,aAAa,KAAK,IAAI,EAAE;QAC1B,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,aAAa,CAAC,aAAa,EAAE,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC;AAzBD,kCAyBC;AAED,KAAK,UAAU,mBAAmB,CAChC,GAAmB;IAEnB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAC5B,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,QAAQ,CACxC,CAAC;IAEF,IAAI,SAAiB,CAAC;IACtB,IAAI;QACF,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;KACxC;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,CAAC,IAAI,IAAI,QAAQ,EAAE;YACxB,KAAK,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,CAAC,gDAAgD;SAC9D;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;IACD,MAAM,aAAa,GAAQ,MAAM,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CACb,iDAAiD,SAAS,EAAE,CAC7D,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAEjD,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErD,OAAO,8BAA8B,CAAC,oBAAoB,CAAC,CAAC;AAC9D,CAAC;AAED,2FAA2F;AACpF,KAAK,UAAU,aAAa,CACjC,aAAqB,EACrB,eAAgC,EAChC,OAAe;;IAEf,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACtE,IAAI,OAAO,GAAiB,EAAE,CAAC;IAE/B,0CAA0C;IAC1C,kBAAkB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAEhD,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE;QACpD,MAAA,QAAQ,CAAC,YAAY,0CAAE,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC/C,8DAA8D;YAC9D,MAAM,sBAAsB,GAAG,6BAA6B,CAC1D,aAAa,EACb,eAAe,CAChB,CAAC;YACF,IAAI,sBAAsB,IAAI,sBAAsB,CAAC,KAAK,EAAE;gBAC1D,OAAO,GAAG,OAAO,CAAC,MAAM,CACtB,kBAAkB,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,CAC5D,CAAC;aACH;YAED,oDAAoD;YACpD,iBAAiB;YACjB,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;YAErE,IAAI,mBAAmB,EAAE;gBACvB,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACvC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;gBACpE,CAAC,CAAC,CAAC;aACJ;YAED,+BAA+B;YAC/B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;KACJ;IAED,OAAO;QACL,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC;AA3CD,sCA2CC;AAED,SAAS,kBAAkB,CAAC,aAAqB,EAAE,YAAiB;;IAClE,IAAI,CAAC,CAAA,MAAA,YAAY,CAAC,OAAO,0CAAE,QAAQ,CAAA,EAAE;QACnC,MAAM,IAAI,KAAK,CACb,+LAA+L;YAC7L,aAAa,CAChB,CAAC;KACH;IAED,wCAAwC;IACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjD,MAAM,IAAI,KAAK,CACb,oIAAoI;YAClI,aAAa,CAChB,CAAC;KACH;IAED,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE;QACpD,0FAA0F;QAC1F,IAAI,QAAQ,IAAI,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,qEAAqE;gBACnE,OAAO,QAAQ;gBACf,uGAAuG;gBACvG,aAAa,CAChB,CAAC;SACH;QAED,IAAI,QAAQ,CAAC,YAAY,EAAE;YACzB,qDAAqD;YACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBACzC,MAAM,IAAI,KAAK,CACb,uKAAuK;oBACrK,aAAa,CAChB,CAAC;aACH;SACF;KACF;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,aAAa;IAC9C,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1C,mEAAmE;QACnE,OAAO,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,6BAA6B,CAAC,aAAa,EAAE,eAAe;IACnE,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;QAC1C,OAAO;KACR;IAED,OAAO,aAAa,CAAC,KAAK;SACvB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;;QAChB,OAAO,CACL,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,CAAC,0CAAE,eAAe;YACzB,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CACnD,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAClE,OAAO;YACL,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YACnB,KAAK;YACL,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;SAClB,CAAC;IACJ,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,EAAE;YAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SAC9C;QAED,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACd,OAAO,CACL,eAAe,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS;YAC7C,eAAe,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CACzC,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,kBAAkB,CAAC,eAAe;IACzC,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC9B,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC;gBACR,YAAY,EAAE,EAAE;gBAChB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE;gBACd,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO;aACvB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,IAAK,kBAGJ;AAHD,WAAK,kBAAkB;IACrB,oCAAc,CAAA;IACd,0CAAoB,CAAA;AACtB,CAAC,EAHI,kBAAkB,KAAlB,kBAAkB,QAGtB;AAED,SAAS,2BAA2B,CAClC,aAAqB;IAErB,qEAAqE;IACrE,4EAA4E;IAC5E,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;QACzC,OAAO,kBAAkB,CAAC,OAAO,CAAC;KACnC;IAED,OAAO,kBAAkB,CAAC,IAAI,CAAC;AACjC,CAAC;AAED,SAAS,8BAA8B,CAAC,KAAa;IACnD,OAAO,KAAK;SACT,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
"description": "Snyk CLI NuGet plugin",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
|
-
"test": "npm run lint && npm run unit
|
|
7
|
-
"unit
|
|
6
|
+
"test": "npm run lint && npm run test:unit",
|
|
7
|
+
"test:unit": "jest --coverage --silent=false --detectOpenHandles",
|
|
8
8
|
"lint": "prettier --check \"./lib/**/*.ts\" && eslint -c .eslintrc.js \"./lib/**/*\"",
|
|
9
9
|
"lint:fix": "prettier --write \"./lib/**/*.ts\" && eslint -c .eslintrc.js --fix \"./lib/**/*\"",
|
|
10
10
|
"build": "tsc",
|
|
11
|
-
"build
|
|
11
|
+
"build:watch": "tsc -w",
|
|
12
12
|
"prepare": "npm run build"
|
|
13
13
|
},
|
|
14
14
|
"types": "./dist/index.d.ts",
|
|
@@ -34,26 +34,25 @@
|
|
|
34
34
|
},
|
|
35
35
|
"homepage": "https://github.com/snyk/snyk-nuget-plugin#readme",
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"
|
|
38
|
-
"
|
|
39
|
-
"
|
|
37
|
+
"@snyk/dep-graph": "^2.7.0",
|
|
38
|
+
"debug": "^4.3.4",
|
|
39
|
+
"dotnet-deps-parser": "5.3.0",
|
|
40
|
+
"jszip": "3.10.1",
|
|
41
|
+
"lodash": "^4.17.21",
|
|
40
42
|
"snyk-paket-parser": "1.6.0",
|
|
41
|
-
"tslib": "^
|
|
42
|
-
"xml2js": "^0.
|
|
43
|
-
"lodash": "^4.17.5"
|
|
43
|
+
"tslib": "^2.6.0",
|
|
44
|
+
"xml2js": "^0.6.0"
|
|
44
45
|
},
|
|
45
46
|
"devDependencies": {
|
|
46
|
-
"@types/jest": "^
|
|
47
|
-
"@types/node": "^
|
|
48
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
49
|
-
"@typescript-eslint/parser": "^
|
|
50
|
-
"eslint": "^
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"
|
|
55
|
-
"ts-jest": "^26.4.0",
|
|
56
|
-
"typescript": "~4.7.3"
|
|
47
|
+
"@types/jest": "^28.1.8",
|
|
48
|
+
"@types/node": "^20",
|
|
49
|
+
"@typescript-eslint/eslint-plugin": "^5.62.0",
|
|
50
|
+
"@typescript-eslint/parser": "^5.62.0",
|
|
51
|
+
"eslint": "^8.45.0",
|
|
52
|
+
"jest": "^28.1.3",
|
|
53
|
+
"prettier": "^2.8.8",
|
|
54
|
+
"ts-jest": "^28.0.8",
|
|
55
|
+
"typescript": "^4.9.5"
|
|
57
56
|
},
|
|
58
|
-
"version": "1.
|
|
57
|
+
"version": "1.26.0"
|
|
59
58
|
}
|