snyk-nuget-plugin 1.19.2 → 1.21.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 +1 -1
- package/dist/index.js.map +1 -1
- package/dist/nuget-parser/csproj-parser.js +4 -6
- package/dist/nuget-parser/csproj-parser.js.map +1 -1
- package/dist/nuget-parser/dotnet-core-parser.js +20 -8
- package/dist/nuget-parser/dotnet-core-parser.js.map +1 -1
- package/dist/nuget-parser/index.js +11 -4
- package/dist/nuget-parser/index.js.map +1 -1
- package/dist/nuget-parser/nuspec-parser.js +27 -13
- package/dist/nuget-parser/nuspec-parser.js.map +1 -1
- package/package.json +2 -3
package/dist/index.js
CHANGED
|
@@ -50,7 +50,7 @@ async function inspect(root, targetFile, options) {
|
|
|
50
50
|
return paketParser.buildDepTreeFromFiles(root, targetFile, path.join(path.dirname(targetFile), 'paket.lock'), options['include-dev'] || options.dev, // TODO: remove include-dev when no longer used.
|
|
51
51
|
options.strict).then(createPackageTree);
|
|
52
52
|
}
|
|
53
|
-
return nugetParser.buildDepTreeFromFiles(root, targetFile, options.packagesFolder, manifestType, options['assets-project-name']).then(createPackageTree);
|
|
53
|
+
return nugetParser.buildDepTreeFromFiles(root, targetFile, options.packagesFolder, manifestType, options['assets-project-name'], options['project-name-prefix']).then(createPackageTree);
|
|
54
54
|
}
|
|
55
55
|
exports.inspect = inspect;
|
|
56
56
|
//# sourceMappingURL=index.js.map
|
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,qCAA2C;AAE3C,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,CAAC,wCAAwC,GAAG,QAAQ,CAAC,CAAC;SAClF;KACF;AACH,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,OAAQ;IACpD,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,uDAAuD;QACvD,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,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,CAAC,qBAAqB,CACtC,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,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3B;IAED,OAAO,WAAW,CAAC,qBAAqB,CACtC,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,cAAc,EACtB,YAAY,EACZ,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAC9D,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,8CAA8C;AAC9C,iDAAiD;AACjD,qCAA2C;AAE3C,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,CAAC,wCAAwC,GAAG,QAAQ,CAAC,CAAC;SAClF;KACF;AACH,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,OAAQ;IACpD,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,uDAAuD;QACvD,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,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,CAAC,qBAAqB,CACtC,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,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3B;IAED,OAAO,WAAW,CAAC,qBAAqB,CACtC,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,cAAc,EACtB,YAAY,EACZ,OAAO,CAAC,qBAAqB,CAAC,EAC9B,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAxCD,0BAwCC"}
|
|
@@ -5,7 +5,6 @@ const errors_1 = require("../errors");
|
|
|
5
5
|
const fs = require("fs");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const parseXML = require("xml2js");
|
|
8
|
-
const _ = require("lodash");
|
|
9
8
|
const debugModule = require("debug");
|
|
10
9
|
const framework_1 = require("./framework");
|
|
11
10
|
const debug = debugModule('snyk');
|
|
@@ -18,19 +17,18 @@ async function getTargetFrameworksFromProjFile(rootDir) {
|
|
|
18
17
|
const csprojContents = fs.readFileSync(csprojPath);
|
|
19
18
|
let frameworks = [];
|
|
20
19
|
parseXML.parseString(csprojContents, (err, parsedCsprojContents) => {
|
|
20
|
+
var _a, _b, _c, _d, _e;
|
|
21
21
|
if (err) {
|
|
22
22
|
reject(new errors_1.FileNotProcessableError(err));
|
|
23
23
|
}
|
|
24
|
-
const versionLoc =
|
|
25
|
-
const versions =
|
|
26
|
-
_.get(versionLoc, 'TargetFramework[0]') ||
|
|
27
|
-
_.get(versionLoc, 'TargetFrameworks[0]', '').split(';')));
|
|
24
|
+
const versionLoc = (_b = (_a = parsedCsprojContents === null || parsedCsprojContents === void 0 ? void 0 : parsedCsprojContents.Project) === null || _a === void 0 ? void 0 : _a.PropertyGroup) === null || _b === void 0 ? void 0 : _b[0];
|
|
25
|
+
const versions = [].concat((((_c = versionLoc === null || versionLoc === void 0 ? void 0 : versionLoc.TargetFrameworkVersion) === null || _c === void 0 ? void 0 : _c[0]) || ((_d = versionLoc === null || versionLoc === void 0 ? void 0 : versionLoc.TargetFramework) === null || _d === void 0 ? void 0 : _d[0]) || ((_e = versionLoc === null || versionLoc === void 0 ? void 0 : versionLoc.TargetFrameworks) === null || _e === void 0 ? void 0 : _e[0]) || '').split(';')).filter(Boolean);
|
|
28
26
|
if (versions.length < 1) {
|
|
29
27
|
debug('Could not find TargetFrameworkVersion/TargetFramework' +
|
|
30
28
|
'/TargetFrameworks defined in the Project.PropertyGroup field of ' +
|
|
31
29
|
'your .csproj file');
|
|
32
30
|
}
|
|
33
|
-
frameworks =
|
|
31
|
+
frameworks = versions.map(framework_1.toReadableFramework).filter(Boolean);
|
|
34
32
|
if (versions.length > 1 && frameworks.length < 1) {
|
|
35
33
|
debug('Could not find valid/supported .NET version in csproj file located at' + csprojPath);
|
|
36
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/csproj-parser.ts"],"names":[],"mappings":";;;AAAA,sCAAqE;AAErE,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/csproj-parser.ts"],"names":[],"mappings":";;;AAAA,sCAAqE;AAErE,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AACnC,qCAAqC;AAErC,2CAAkD;AAClD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAE3B,KAAK,UAAU,+BAA+B,CAAC,OAAe;IACnE,OAAO,IAAI,OAAO,CAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAClE,KAAK,CAAC,mCAAmC,GAAG,OAAO,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACpD,IAAI,UAAU,EAAE;YACd,KAAK,CAAC,kDAAkD,GAAG,UAAU,CAAC,CAAC;YAEvE,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAEnD,IAAI,UAAU,GAAoC,EAAE,CAAC;YACrD,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE;;gBACjE,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC1C;gBACD,MAAM,UAAU,eAAG,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,OAAO,0CAAE,aAAa,0CAAG,CAAC,CAAC,CAAC;gBACrE,MAAM,QAAQ,GAAG,EAAE,CAAC,MAAM,CACxB,CAAC,OAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,sBAAsB,0CAAG,CAAC,aACvC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,eAAe,0CAAG,CAAC,EAAC,WAChC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,gBAAgB,0CAAG,CAAC,EAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAEvE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvB,KAAK,CAAC,uDAAuD;wBAC3D,kEAAkE;wBAClE,mBAAmB,CAAC,CAAC;iBACxB;gBACD,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAChD,KAAK,CAAC,uEAAuE,GAAG,UAAU,CAAC,CAAC;iBAC7F;gBACD,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;SACJ;QACD,KAAK,CAAC,4BAA4B,GAAG,OAAO,GAAG,GAAG,CAAC,CAAC;QACpD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,0EAmCC;AAED,SAAS,QAAQ,CAAC,OAAO,EAAE,MAAM;IAC/B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,IAAI,0BAAiB,CAAC,gBAAgB,GAAG,OAAO,CAAC,CAAC;KACzD;IACD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE7C,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzB,OAAO,QAAQ,CAAC;SACjB;KACF;AACH,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parse = void 0;
|
|
4
4
|
const errors_1 = require("../errors");
|
|
5
|
-
const _ = require("lodash");
|
|
6
5
|
const debugModule = require("debug");
|
|
7
6
|
const debug = debugModule('snyk');
|
|
8
7
|
const PACKAGE_DELIMITER = '@';
|
|
@@ -17,6 +16,15 @@ function initFreqDepsDict() {
|
|
|
17
16
|
freqDeps['System.Reflection'] = false;
|
|
18
17
|
freqDeps['System.Globalization'] = false;
|
|
19
18
|
}
|
|
19
|
+
function pick(obj, keys) {
|
|
20
|
+
const pickedObj = {};
|
|
21
|
+
Object.keys(obj).forEach((k) => {
|
|
22
|
+
if (keys.includes(k)) {
|
|
23
|
+
pickedObj[k] = obj[k];
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
return pickedObj;
|
|
27
|
+
}
|
|
20
28
|
function convertFromPathSyntax(path) {
|
|
21
29
|
let name = path.split('/').join('@'); // posix
|
|
22
30
|
name = name.split('\\').join('@'); // windows
|
|
@@ -95,9 +103,9 @@ function constructTree(roots, nodes, links) {
|
|
|
95
103
|
parentNode.dependencies[childName] = Object.assign({}, childNode);
|
|
96
104
|
}
|
|
97
105
|
}
|
|
98
|
-
const tree =
|
|
99
|
-
const freqSysDeps =
|
|
100
|
-
if (
|
|
106
|
+
const tree = pick(treeMap, roots);
|
|
107
|
+
const freqSysDeps = pick(treeMap, Object.keys(freqDeps));
|
|
108
|
+
if (Object.keys(freqSysDeps).length > 0) {
|
|
101
109
|
tree['freqSystemDependencies'] = {
|
|
102
110
|
name: 'freqSystemDependencies',
|
|
103
111
|
version: '0.0.0',
|
|
@@ -107,7 +115,8 @@ function constructTree(roots, nodes, links) {
|
|
|
107
115
|
return tree;
|
|
108
116
|
}
|
|
109
117
|
function getFrameworkToRun(manifest) {
|
|
110
|
-
|
|
118
|
+
var _a;
|
|
119
|
+
const frameworks = (_a = manifest === null || manifest === void 0 ? void 0 : manifest.project) === null || _a === void 0 ? void 0 : _a.frameworks;
|
|
111
120
|
debug(`Available frameworks: '${Object.keys(frameworks)}'`);
|
|
112
121
|
// not yet supporting multiple frameworks in the same assets file ->
|
|
113
122
|
// taking only the first 1
|
|
@@ -130,13 +139,13 @@ function validateManifest(manifest) {
|
|
|
130
139
|
if (!manifest.project.frameworks) {
|
|
131
140
|
throw new errors_1.InvalidManifestError('No frameworks were found in project.assets.json');
|
|
132
141
|
}
|
|
133
|
-
if (
|
|
142
|
+
if (!manifest.project.frameworks || Object.keys(manifest.project.frameworks).length === 0) {
|
|
134
143
|
throw new errors_1.InvalidManifestError('0 frameworks were found in project.assets.json');
|
|
135
144
|
}
|
|
136
145
|
if (!manifest.targets) {
|
|
137
146
|
throw new errors_1.InvalidManifestError('No targets were found in project.assets.json');
|
|
138
147
|
}
|
|
139
|
-
if (
|
|
148
|
+
if (!manifest.targets || Object.keys(manifest.targets).length === 0) {
|
|
140
149
|
throw new errors_1.InvalidManifestError('0 targets were found in project.assets.json');
|
|
141
150
|
}
|
|
142
151
|
}
|
|
@@ -147,7 +156,10 @@ async function parse(tree, manifest) {
|
|
|
147
156
|
tree.version = manifest.project.version;
|
|
148
157
|
}
|
|
149
158
|
// If a targetFramework was not found in the proj file, we will extract it from the lock file
|
|
150
|
-
|
|
159
|
+
// OR
|
|
160
|
+
// If the targetFramework is undefined, extract it from the lock file
|
|
161
|
+
// Fix for https://github.com/snyk/snyk-nuget-plugin/issues/75
|
|
162
|
+
if (!tree.meta.targetFramework || manifest.project.frameworks[tree.meta.targetFramework] === undefined) {
|
|
151
163
|
tree.meta.targetFramework = getFrameworkToRun(manifest);
|
|
152
164
|
}
|
|
153
165
|
const selectedFrameworkObj = manifest.project.frameworks[tree.meta.targetFramework];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnet-core-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-core-parser.ts"],"names":[],"mappings":";;;AAAA,sCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"dotnet-core-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/dotnet-core-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ exports.getMinimumTargetFrameworkFromPackagesConfig = exports.buildDepTreeFromFi
|
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const csproj_parser_1 = require("./csproj-parser");
|
|
7
|
-
const _ = require("lodash");
|
|
8
7
|
const debugModule = require("debug");
|
|
9
8
|
const debug = debugModule('snyk');
|
|
10
9
|
const dotnetCoreParser = require("./dotnet-core-parser");
|
|
@@ -34,7 +33,15 @@ function getPackagesFolder(packagesFolder, projectRootFolder) {
|
|
|
34
33
|
}
|
|
35
34
|
return path.resolve(projectRootFolder, 'packages');
|
|
36
35
|
}
|
|
37
|
-
|
|
36
|
+
function getRootName(root, projectRootFolder, projectNamePrefix) {
|
|
37
|
+
const defaultRootName = path.basename(root || projectRootFolder || "");
|
|
38
|
+
if (projectNamePrefix) {
|
|
39
|
+
return projectNamePrefix + defaultRootName;
|
|
40
|
+
}
|
|
41
|
+
return defaultRootName;
|
|
42
|
+
}
|
|
43
|
+
async function buildDepTreeFromFiles(root, targetFile, packagesFolderPath, manifestType, useProjectNameFromAssetsFile, projectNamePrefix) {
|
|
44
|
+
var _a, _b;
|
|
38
45
|
const safeRoot = root || '.';
|
|
39
46
|
const safeTargetFile = targetFile || '.';
|
|
40
47
|
const fileContentPath = path.resolve(safeRoot, safeTargetFile);
|
|
@@ -51,7 +58,7 @@ async function buildDepTreeFromFiles(root, targetFile, packagesFolderPath, manif
|
|
|
51
58
|
const tree = {
|
|
52
59
|
dependencies: {},
|
|
53
60
|
meta: {},
|
|
54
|
-
name:
|
|
61
|
+
name: getRootName(root, projectRootFolder, projectNamePrefix),
|
|
55
62
|
packageFormatVersion: 'nuget:0.0.0',
|
|
56
63
|
version: '0.0.0',
|
|
57
64
|
};
|
|
@@ -82,7 +89,7 @@ async function buildDepTreeFromFiles(root, targetFile, packagesFolderPath, manif
|
|
|
82
89
|
const parser = PARSERS[manifestType];
|
|
83
90
|
const manifest = await parser.fileContentParser.parse(fileContent, tree);
|
|
84
91
|
if (manifestType === 'dotnet-core' && useProjectNameFromAssetsFile) {
|
|
85
|
-
const projectName =
|
|
92
|
+
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;
|
|
86
93
|
if (projectName) {
|
|
87
94
|
tree.name = projectName;
|
|
88
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/nuget-parser/index.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,mDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/nuget-parser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ const JSZip = require("jszip");
|
|
|
5
5
|
const fs = require("fs");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const parseXML = require("xml2js");
|
|
8
|
-
const _ = require("lodash");
|
|
9
8
|
const debugModule = require("debug");
|
|
10
9
|
const debug = debugModule('snyk');
|
|
11
10
|
const targetFrameworkRegex = /([.a-zA-Z]+)([.0-9]+)/;
|
|
@@ -32,23 +31,23 @@ async function parseNuspec(dep, targetFramework) {
|
|
|
32
31
|
// We are only going to check the first targetFramework we encounter
|
|
33
32
|
// in the future we may want to support multiple, but only once
|
|
34
33
|
// we have dependency version conflict resolution implemented
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
result.package.metadata.forEach((metadata) => {
|
|
35
|
+
metadata.dependencies.forEach((rawDependency) => {
|
|
37
36
|
// Find and add target framework version specific dependencies
|
|
38
37
|
const depsForTargetFramework = extractDepsForTargetFramework(rawDependency, targetFramework);
|
|
39
38
|
if (depsForTargetFramework && depsForTargetFramework.group) {
|
|
40
|
-
ownDeps =
|
|
39
|
+
ownDeps = ownDeps.concat(extractDepsFromRaw(depsForTargetFramework.group.dependency));
|
|
41
40
|
}
|
|
42
41
|
// Find all groups with no targetFramework attribute
|
|
43
42
|
// add their deps
|
|
44
43
|
const depsFromPlainGroups = extractDepsForPlainGroups(rawDependency);
|
|
45
44
|
if (depsFromPlainGroups) {
|
|
46
45
|
depsFromPlainGroups.forEach((depGroup) => {
|
|
47
|
-
ownDeps =
|
|
46
|
+
ownDeps = ownDeps.concat(extractDepsFromRaw(depGroup.dependency));
|
|
48
47
|
});
|
|
49
48
|
}
|
|
50
49
|
// Add the default dependencies
|
|
51
|
-
ownDeps =
|
|
50
|
+
ownDeps = ownDeps.concat(extractDepsFromRaw(rawDependency.dependency));
|
|
52
51
|
});
|
|
53
52
|
});
|
|
54
53
|
return resolve({
|
|
@@ -66,35 +65,50 @@ async function parseNuspec(dep, targetFramework) {
|
|
|
66
65
|
}
|
|
67
66
|
exports.parseNuspec = parseNuspec;
|
|
68
67
|
function extractDepsForPlainGroups(rawDependency) {
|
|
69
|
-
|
|
68
|
+
if (!rawDependency.group) {
|
|
69
|
+
return [];
|
|
70
|
+
}
|
|
71
|
+
return rawDependency.group
|
|
70
72
|
.filter((group) => {
|
|
71
73
|
// valid group with no attributes or no `targetFramework` attribute
|
|
72
74
|
return group && !(group.$ && group.$.targetFramework);
|
|
73
75
|
});
|
|
74
76
|
}
|
|
75
77
|
function extractDepsForTargetFramework(rawDependency, targetFramework) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
78
|
+
if (!rawDependency || !rawDependency.group) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
return rawDependency.group.filter((group) => {
|
|
82
|
+
var _a;
|
|
83
|
+
return ((_a = group === null || group === void 0 ? void 0 : group.$) === null || _a === void 0 ? void 0 : _a.targetFramework) &&
|
|
79
84
|
targetFrameworkRegex.test(group.$.targetFramework);
|
|
80
85
|
})
|
|
81
86
|
.map((group) => {
|
|
82
|
-
const parts =
|
|
87
|
+
const parts = group.$.targetFramework.split(targetFrameworkRegex);
|
|
83
88
|
return {
|
|
84
89
|
framework: parts[1],
|
|
85
90
|
group,
|
|
86
91
|
version: parts[2],
|
|
87
92
|
};
|
|
88
93
|
})
|
|
89
|
-
.
|
|
94
|
+
.sort((a, b) => {
|
|
95
|
+
if (a.framework === b.framework) {
|
|
96
|
+
return Number(b.version) - Number(a.version);
|
|
97
|
+
}
|
|
98
|
+
return a.framework > b.framework ? -1 : 1;
|
|
99
|
+
})
|
|
100
|
+
// .orderBy(['framework', 'version'], ['asc', 'desc'])
|
|
90
101
|
.find((group) => {
|
|
91
102
|
return targetFramework.framework === group.framework &&
|
|
92
103
|
targetFramework.version >= group.version;
|
|
93
104
|
});
|
|
94
105
|
}
|
|
95
106
|
function extractDepsFromRaw(rawDependencies) {
|
|
107
|
+
if (!rawDependencies) {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
96
110
|
const deps = [];
|
|
97
|
-
|
|
111
|
+
rawDependencies.forEach((dep) => {
|
|
98
112
|
if (dep && dep.$) {
|
|
99
113
|
deps.push({
|
|
100
114
|
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;AAEnC,
|
|
1
|
+
{"version":3,"file":"nuspec-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/nuspec-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -33,9 +33,8 @@
|
|
|
33
33
|
},
|
|
34
34
|
"homepage": "https://github.com/snyk/snyk-nuget-plugin#readme",
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"lodash": "^4.17.20",
|
|
37
36
|
"debug": "^4.1.1",
|
|
38
|
-
"dotnet-deps-parser": "
|
|
37
|
+
"dotnet-deps-parser": "5.0.0",
|
|
39
38
|
"jszip": "3.4.0",
|
|
40
39
|
"snyk-paket-parser": "1.6.0",
|
|
41
40
|
"tslib": "^1.11.2",
|
|
@@ -49,5 +48,5 @@
|
|
|
49
48
|
"eslint": "^6.8.0",
|
|
50
49
|
"typescript": "^3.8.3"
|
|
51
50
|
},
|
|
52
|
-
"version": "1.
|
|
51
|
+
"version": "1.21.0"
|
|
53
52
|
}
|