snyk-nuget-plugin 1.9.2 → 1.10.0

package/.eslintrc

@@ -25,7 +25,7 @@
       }
     ],
     "max-depth": [1, 3],
-    "max-len": [1, 80],
+    "max-len": [1, 100],
     "max-statements": [1, 25],
     "new-cap": 0,
     "no-caller": 2,

package/README.md

@@ -8,4 +8,4 @@ Snyk helps you find, fix and monitor for known vulnerabilities in your dependenc
 
 ## Snyk NuGet CLI Plugin
 
-The plugin provides dependency metadata for NuGet projects that manifest dependencies in `project.json` or `packages.config` files.
+The plugin provides dependency metadata for NuGet projects that manifest dependencies in `project.json`, `packages.config` or `project.assets.json` files.

package/lib/index.js

@@ -60,6 +60,7 @@ module.exports = {
       root,
       targetFile,
       options.packagesFolder,
-      manifestType).then(createPackageTree);
+      manifestType,
+      options['assets-project-name']).then(createPackageTree);
   },
 };

package/lib/nuget-parser/index.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const debug = require('debug')('snyk');
 const getTargetFrameworkFromProjFile = require('./csproj-parser');
+const _ = require('lodash');
 
 const dotnetCoreParser = require('./dotnet-core-parser');
 const dotnetFrameworkParser = require('./dotnet-framework-parser');
@@ -32,7 +33,7 @@ function getPackagesFolder(packagesFolder, projectRootFolder) {
 }
 
 module.exports = {
-  buildDepTreeFromFiles: function (root, targetFile, packagesFolderPath, manifestType) {
+  buildDepTreeFromFiles: function (root, targetFile, packagesFolderPath, manifestType, useProjectNameFromAssetsFile) {
     const fileContentPath = path.resolve(root || '.', targetFile || '.');
     let fileContent;
     try {
@@ -43,6 +44,13 @@ module.exports = {
     const projectRootFolder = path.resolve(fileContentPath, '../../');
     const packagesFolder = getPackagesFolder(packagesFolderPath, projectRootFolder);
 
+    const tree = {
+      name: path.basename(root || projectRootFolder),
+      version: '0.0.0',
+      packageFormatVersion: 'nuget:0.0.0',
+      dependencies: {},
+    };
+
     let targetFramework;
     try {
       if (manifestType === 'dotnet-core') {
@@ -55,22 +63,25 @@ module.exports = {
       return Promise.reject(error);
     }
 
-    debug('Loaded ' + targetFile + ' with manifest type ' + manifestType);
-
-    const tree = {
-      name: path.basename(root || projectRootFolder),
-      version: '0.0.0',
-      packageFormatVersion: 'nuget:0.0.0',
-      dependencies: {},
-      meta: {
-        targetFramework: targetFramework ? targetFramework.original : undefined, //TODO implement for more than one TF
-      },
+    tree.meta = {
+      targetFramework: targetFramework ? targetFramework.original : undefined, //TODO implement for more than one TF
     };
 
     const parser = PARSERS[manifestType];
+    let manifest = parser.fileContentParser.parse(fileContent, tree);
+
+    if (manifestType === 'dotnet-core' && useProjectNameFromAssetsFile) {
+      let projectName = _.get(manifest, 'project.restore.projectName');
+      if (projectName) {
+        tree.name = projectName;
+      } else {
+        debug("project.assets.json file doesn't contain a value for 'projectName'. Using default value: " + tree.name);
+      }
+    }
+
     return parser.depParser.parse(
       tree,
-      parser.fileContentParser.parse(fileContent, tree),
+      manifest,
       targetFramework,
       packagesFolder);
   },

package/package.json

@@ -34,5 +34,5 @@
     "tap": "12.4.1",
     "tap-only": "0.0.5"
   },
-  "version": "1.9.2"
+  "version": "1.10.0"
 }