snyk-nuget-plugin 4.5.0 → 4.5.1

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.
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.generate = generate;
37
37
  const path = __importStar(require("path"));
38
+ const fs = __importStar(require("fs"));
38
39
  const generator = __importStar(require("./generator"));
39
40
  function targetFrameworkFromSdkVersion(sdkVersion) {
40
41
  const major = parseInt(sdkVersion.split('.')[0], 10);
@@ -49,25 +50,38 @@ function xmlAttributeEscape(value) {
49
50
  .replace(/>/g, '>')
50
51
  .replace(/"/g, '"');
51
52
  }
52
- function generate(sdkVersion) {
53
- const targetFramework = targetFrameworkFromSdkVersion(sdkVersion);
54
- // Offline support: we ship the (single, dependency-free) NuGet.Frameworks package
55
- // alongside this module in `lib` for tests, and copied into `dist` at build time.
56
- // A generated nuget.config points `dotnet restore` at this folder as its only source,
57
- // so projects without internet access can still be scanned.
58
- const offlinePackagesSource = xmlAttributeEscape(path.join(__dirname, 'nupkgs'));
59
- const files = [
60
- {
61
- name: 'nuget.config',
62
- contents: `<?xml version="1.0" encoding="utf-8"?>
53
+ // The bundled `nupkgs` folder normally lives on disk next to this module. But when this
54
+ // plugin runs inside the Snyk CLI's packaged binary, `pkg` mounts everything under `dist`
55
+ // into a virtual snapshot filesystem, so `path.join(__dirname, 'nupkgs')` resolves to a
56
+ // snapshot-only path (e.g. `/snapshot/...`) that only the packaged Node process itself can
57
+ // read. `dotnet restore` runs as a separate OS process and can't see into that snapshot at
58
+ // all, so instead of pointing nuget.config there directly, we copy the offline packages
59
+ // into the same real, on-disk directory generator.generate() already created below for
60
+ // Parse.csproj/Program.cs, and point nuget.config at that.
61
+ function writeOfflinePackagesInto(tempDir) {
62
+ const nugetConfigPath = path.join(tempDir, 'nuget.config');
63
+ if (fs.existsSync(nugetConfigPath)) {
64
+ // Already populated by a previous call that hit generator.generate()'s content cache
65
+ // and got back this same tempDir.
66
+ return;
67
+ }
68
+ const bundledNupkgsDir = path.join(__dirname, 'nupkgs');
69
+ fs.mkdirSync(path.join(tempDir, 'nupkgs'));
70
+ for (const fileName of fs.readdirSync(bundledNupkgsDir)) {
71
+ fs.writeFileSync(path.join(tempDir, 'nupkgs', fileName), fs.readFileSync(path.join(bundledNupkgsDir, fileName)));
72
+ }
73
+ fs.writeFileSync(nugetConfigPath, `<?xml version="1.0" encoding="utf-8"?>
63
74
  <configuration>
64
75
  <packageSources>
65
76
  <clear />
66
- <add key="snyk-nuget-plugin-offline" value="${offlinePackagesSource}" />
77
+ <add key="snyk-nuget-plugin-offline" value="${xmlAttributeEscape(tempDir)}/nupkgs" />
67
78
  </packageSources>
68
79
  </configuration>
69
- `,
70
- },
80
+ `);
81
+ }
82
+ function generate(sdkVersion) {
83
+ const targetFramework = targetFrameworkFromSdkVersion(sdkVersion);
84
+ const files = [
71
85
  {
72
86
  name: 'Parse.csproj',
73
87
  contents: `
@@ -140,6 +154,8 @@ class Program
140
154
  `,
141
155
  },
142
156
  ];
143
- return generator.generate('csharp', files);
157
+ const tempDir = generator.generate('csharp', files);
158
+ writeOfflinePackagesInto(tempDir);
159
+ return tempDir;
144
160
  }
145
161
  //# sourceMappingURL=nugetframeworks_parser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"nugetframeworks_parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/csharp/nugetframeworks_parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,4BAiGC;AApHD,2CAA6B;AAE7B,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,SAAgB,QAAQ,CAAC,UAAkB;IACzC,MAAM,eAAe,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAElE,kFAAkF;IAClF,oFAAoF;IACpF,sFAAsF;IACtF,4DAA4D;IAC5D,MAAM,qBAAqB,GAAG,kBAAkB,CAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAC/B,CAAC;IAEF,MAAM,KAAK,GAAuB;QAChC;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;kDAIkC,qBAAqB;;;CAGtE;SACI;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;uBAIO,eAAe;;;;;;;;;;;CAWrC;SACI;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf;SACI;KACF,CAAC;IAEF,OAAO,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC"}
1
+ {"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 CHANGED
@@ -66,5 +66,5 @@
66
66
  "ts-jest": "^29.1.2",
67
67
  "typescript": "^6.0.3"
68
68
  },
69
- "version": "4.5.0"
69
+ "version": "4.5.1"
70
70
  }