snyk 1.1052.0 → 1.1054.0

package/dist/cli/263.index.js

@@ -140362,7 +140362,12 @@ async function pullWithDockerBinary(docker, targetImage, saveLocation, username,
             err.stderr.includes("operating system is not supported")) {
             throw new Error(`Operating system is not supported`);
         }
-        if (err.stderr && err.stderr.includes("no matching manifest for")) {
+        const unknownManifestConditions = [
+            "no matching manifest for",
+            "manifest unknown",
+        ];
+        if (err.stderr &&
+            unknownManifestConditions.some((value) => err.stderr.includes(value))) {
             if (platform) {
                 throw new Error(`The image does not exist for ${platform}`);
             }
@@ -142709,8 +142714,17 @@ function extractModuleInformation(binary) {
     if (!mod) {
         throw Error("binary contains empty module info");
     }
-    const [, mainModuleLine, ...versionsLines] = mod.split("\n");
-    const [, name] = mainModuleLine.split("\t");
+    const [pathDirective, mainModuleLine, ...versionsLines] = mod.split("\n");
+    const lineSplit = mainModuleLine.split("\t");
+    let name = lineSplit[1];
+    if (lineSplit[0] !== "mod") {
+        // If the binary has no mod directive, it is a binary from the Go
+        // distribution, like the "go" command, "vet", "gofmt" or others. In that
+        // case, we use "go-distribution@" plus the path directive ("cmd/vet" for
+        // example) as the name.  Using the "@" ensures that customers cannot create
+        // name-clashes with these as "@" is an invalid character in Go modules.
+        name = "go-distribution@" + pathDirective.split("\t")[1];
+    }
     const modules = [];
     versionsLines.forEach((versionLine) => {
         const [, name, ver] = versionLine.split("\t");
@@ -159209,13 +159223,24 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
 function execute(command, args, options, shell = false) {
-    const spawnOptions = { shell };
+    const spawnOptions = { shell, env: process.env };
     if (options === null || options === void 0 ? void 0 : options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
     if (options === null || options === void 0 ? void 0 : options.env) {
         spawnOptions.env = Object.assign(Object.assign({}, process.env), options.env);
     }
+    // Before spawning an external process, we look if we need to restore the system proxy configuration,
+    // which overides the cli internal proxy configuration.
+    if (process.env.SNYK_SYSTEM_HTTP_PROXY !== undefined) {
+        spawnOptions.env.HTTP_PROXY = process.env.SNYK_SYSTEM_HTTP_PROXY;
+    }
+    if (process.env.SNYK_SYSTEM_HTTPS_PROXY !== undefined) {
+        spawnOptions.env.HTTPS_PROXY = process.env.SNYK_SYSTEM_HTTPS_PROXY;
+    }
+    if (process.env.SNYK_SYSTEM_NO_PROXY !== undefined) {
+        spawnOptions.env.NO_PROXY = process.env.SNYK_SYSTEM_NO_PROXY;
+    }
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';