snyk-nuget-plugin 4.4.0 → 4.5.1

package/dist/nuget-parser/csharp/nugetframeworks_parser.js

@@ -34,11 +34,51 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = generate;
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 const generator = __importStar(require("./generator"));
 function targetFrameworkFromSdkVersion(sdkVersion) {
     const major = parseInt(sdkVersion.split('.')[0], 10);
     return `net${major}.0`;
 }
+// Escape a filesystem path so it can be safely embedded in a double-quoted XML
+// attribute value (Windows user paths can legitimately contain '&', etc.).
+function xmlAttributeEscape(value) {
+    return value
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
+}
+// The bundled `nupkgs` folder normally lives on disk next to this module. But when this
+// plugin runs inside the Snyk CLI's packaged binary, `pkg` mounts everything under `dist`
+// into a virtual snapshot filesystem, so `path.join(__dirname, 'nupkgs')` resolves to a
+// snapshot-only path (e.g. `/snapshot/...`) that only the packaged Node process itself can
+// read. `dotnet restore` runs as a separate OS process and can't see into that snapshot at
+// all, so instead of pointing nuget.config there directly, we copy the offline packages
+// into the same real, on-disk directory generator.generate() already created below for
+// Parse.csproj/Program.cs, and point nuget.config at that.
+function writeOfflinePackagesInto(tempDir) {
+    const nugetConfigPath = path.join(tempDir, 'nuget.config');
+    if (fs.existsSync(nugetConfigPath)) {
+        // Already populated by a previous call that hit generator.generate()'s content cache
+        // and got back this same tempDir.
+        return;
+    }
+    const bundledNupkgsDir = path.join(__dirname, 'nupkgs');
+    fs.mkdirSync(path.join(tempDir, 'nupkgs'));
+    for (const fileName of fs.readdirSync(bundledNupkgsDir)) {
+        fs.writeFileSync(path.join(tempDir, 'nupkgs', fileName), fs.readFileSync(path.join(bundledNupkgsDir, fileName)));
+    }
+    fs.writeFileSync(nugetConfigPath, `<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="snyk-nuget-plugin-offline" value="${xmlAttributeEscape(tempDir)}/nupkgs" />
+  </packageSources>
+</configuration>
+`);
+}
 function generate(sdkVersion) {
     const targetFramework = targetFrameworkFromSdkVersion(sdkVersion);
     const files = [
@@ -56,8 +96,7 @@ function generate(sdkVersion) {
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include='Newtonsoft.Json' Version='13.0.3' />
-    <PackageReference Include='NuGet.Frameworks' Version='6.7.0' />
+    <PackageReference Include='NuGet.Frameworks' Version='6.14.3' />
   </ItemGroup>
 </Project>
 `,
@@ -66,8 +105,8 @@ function generate(sdkVersion) {
             name: 'Program.cs',
             contents: `
 using System;
+using System.Text.Json;
 using NuGet.Frameworks;
-using Newtonsoft.Json;
 
 class Program
 {
@@ -84,12 +123,12 @@ class Program
         try
         {
             NuGetFramework framework = NuGetFramework.Parse(shortName);
-            string json = JsonConvert.SerializeObject(new
+            string json = JsonSerializer.Serialize(new
             {
                 framework.Framework,
-                framework.Version,
+                Version = framework.Version.ToString(),
                 framework.Platform,
-                framework.PlatformVersion,
+                PlatformVersion = framework.PlatformVersion?.ToString(),
                 framework.HasPlatform,
                 framework.HasProfile,
                 framework.Profile,
@@ -103,7 +142,7 @@ class Program
                 framework.IsAny,
                 framework.IsSpecificFramework,
                 ShortName = shortName
-            }, Formatting.None);
+            });
             Console.Write(json);
         }
         catch (Exception ex)
@@ -116,6 +155,7 @@ class Program
         },
     ];
     const tempDir = generator.generate('csharp', files);
+    writeOfflinePackagesInto(tempDir);
     return tempDir;
 }
 //# sourceMappingURL=nugetframeworks_parser.js.map

package/dist/nuget-parser/csharp/nugetframeworks_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"nugetframeworks_parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/csharp/nugetframeworks_parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,4BAgFC;AAvFD,uDAAyC;AAEzC,SAAS,6BAA6B,CAAC,UAAkB;IACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,MAAM,KAAK,IAAI,CAAC;AACzB,CAAC;AAED,SAAgB,QAAQ,CAAC,UAAkB;IACzC,MAAM,eAAe,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAElE,MAAM,KAAK,GAAuB;QAChC;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;uBAIO,eAAe;;;;;;;;;;;;CAYrC;SACI;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf;SACI;KACF,CAAC;IAEF,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"nugetframeworks_parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/csharp/nugetframeworks_parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0DA,4BAgFC;AA1ID,2CAA6B;AAC7B,uCAAyB;AAEzB,uDAAyC;AAEzC,SAAS,6BAA6B,CAAC,UAAkB;IACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,MAAM,KAAK,IAAI,CAAC;AACzB,CAAC;AAED,+EAA+E;AAC/E,2EAA2E;AAC3E,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK;SACT,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAED,wFAAwF;AACxF,0FAA0F;AAC1F,wFAAwF;AACxF,2FAA2F;AAC3F,2FAA2F;AAC3F,wFAAwF;AACxF,uFAAuF;AACvF,2DAA2D;AAC3D,SAAS,wBAAwB,CAAC,OAAe;IAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC3D,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACnC,qFAAqF;QACrF,kCAAkC;QAClC,OAAO;IACT,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACxD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxD,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACtC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CACvD,CAAC;IACJ,CAAC;IAED,EAAE,CAAC,aAAa,CACd,eAAe,EACf;;;;kDAI8C,kBAAkB,CAAC,OAAO,CAAC;;;CAG5E,CACE,CAAC;AACJ,CAAC;AAED,SAAgB,QAAQ,CAAC,UAAkB;IACzC,MAAM,eAAe,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAElE,MAAM,KAAK,GAAuB;QAChC;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;uBAIO,eAAe;;;;;;;;;;;CAWrC;SACI;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf;SACI;KACF,CAAC;IAEF,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpD,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/package.json

@@ -11,7 +11,8 @@
     "lint:eslint": "eslint '{lib,test}/**/*.ts'",
     "lint:prettier": "prettier --check '{lib,test}/**/*.{ts,csproj,json}' --log-level 'warn'",
     "lint:fix": "prettier --write '{lib,test}/**/*.{ts,csproj,json}' && eslint --fix '{lib,test}/**/*.ts'",
-    "build": "tsc",
+    "build": "tsc && npm run copy-nupkgs",
+    "copy-nupkgs": "node -e \"require('fs').cpSync('lib/nuget-parser/csharp/nupkgs','dist/nuget-parser/csharp/nupkgs',{recursive:true})\"",
     "build:watch": "tsc -w",
     "prepare": "npm run build"
   },
@@ -65,5 +66,5 @@
     "ts-jest": "^29.1.2",
     "typescript": "^6.0.3"
   },
-  "version": "4.4.0"
+  "version": "4.5.1"
 }