snyk 1.1118.0 → 1.1119.0

package/dist/cli/95.index.js

@@ -127692,7 +127692,7 @@ module.exports = arrify;
 /* module decorator */ module = __webpack_require__.nmd(module);
 
 try {
-  process.dlopen(module, __dirname + __webpack_require__(85622).sep + __webpack_require__.p + "160330cb588043b376e80837e6664733.node");
+  process.dlopen(module, __dirname + __webpack_require__(85622).sep + __webpack_require__.p + "a8f8676967c7b025b7bbc9bf05eac2de.node");
 } catch (error) {
   throw new Error('node-loader:\n' + error);
 }
@@ -127706,7 +127706,7 @@ try {
 /* module decorator */ module = __webpack_require__.nmd(module);
 
 try {
-  process.dlopen(module, __dirname + __webpack_require__(85622).sep + __webpack_require__.p + "d0231d5874891854e13ca7a7d010e42a.node");
+  process.dlopen(module, __dirname + __webpack_require__(85622).sep + __webpack_require__.p + "0f81c7f0efca6359e87b0892f010b7e5.node");
 } catch (error) {
   throw new Error('node-loader:\n' + error);
 }
@@ -137080,9 +137080,8 @@ exports.isResultEmpty = isResultEmpty;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getUserInstructionLayersFromConfig = exports.getDetectedLayersInfoFromConfig = exports.getPlatformFromConfig = exports.getRootFsLayersFromConfig = exports.getImageIdFromManifest = exports.getManifestLayers = exports.extractArchive = void 0;
+exports.getImageIdFromManifest = exports.getManifestLayers = exports.extractArchive = void 0;
 const path_1 = __webpack_require__(85622);
-const instruction_parser_1 = __webpack_require__(50387);
 const types_1 = __webpack_require__(93677);
 var layer_1 = __webpack_require__(71544);
 Object.defineProperty(exports, "extractArchive", ({ enumerable: true, get: function () { return layer_1.extractArchive; } }));
@@ -137104,49 +137103,6 @@ function getImageIdFromManifest(manifest) {
     }
 }
 exports.getImageIdFromManifest = getImageIdFromManifest;
-function getRootFsLayersFromConfig(imageConfig) {
-    try {
-        return imageConfig.rootfs.diff_ids;
-    }
-    catch (err) {
-        throw new Error("Failed to extract rootfs array from image config");
-    }
-}
-exports.getRootFsLayersFromConfig = getRootFsLayersFromConfig;
-function getPlatformFromConfig(imageConfig) {
-    return imageConfig.os && imageConfig.architecture
-        ? `${imageConfig.os}/${imageConfig.architecture}`
-        : undefined;
-}
-exports.getPlatformFromConfig = getPlatformFromConfig;
-function getDetectedLayersInfoFromConfig(imageConfig) {
-    const runInstructions = getUserInstructionLayersFromConfig(imageConfig)
-        .filter((instruction) => !instruction.empty_layer && instruction.created_by)
-        .map((instruction) => instruction.created_by.replace("# buildkit", ""));
-    const dockerfilePackages = (0, instruction_parser_1.getPackagesFromRunInstructions)(runInstructions);
-    const dockerfileLayers = (0, instruction_parser_1.getLayersFromPackages)(dockerfilePackages);
-    return { dockerfilePackages, dockerfileLayers };
-}
-exports.getDetectedLayersInfoFromConfig = getDetectedLayersInfoFromConfig;
-function getUserInstructionLayersFromConfig(imageConfig) {
-    const diffInHours = (d1, d2) => Math.abs(d1 - d2) / 1000 / (60 * 60);
-    const maxDiffInHours = 5;
-    const history = imageConfig.history;
-    if (!history) {
-        return [];
-    }
-    const lastInstructionTime = new Date(history.slice(-1)[0].created);
-    const userInstructionLayers = history.filter((layer) => {
-        return (diffInHours(new Date(layer.created), lastInstructionTime) <=
-            maxDiffInHours);
-    });
-    // should only happen if there are no layers created by user instructions
-    if (userInstructionLayers.length === history.length) {
-        return [];
-    }
-    return userInstructionLayers;
-}
-exports.getUserInstructionLayersFromConfig = getUserInstructionLayersFromConfig;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -137163,6 +137119,7 @@ const fs_1 = __webpack_require__(35747);
 const gunzip = __webpack_require__(65923);
 const path_1 = __webpack_require__(85622);
 const tar_stream_1 = __webpack_require__(53871);
+const __1 = __webpack_require__(18141);
 const stream_utils_1 = __webpack_require__(54540);
 const layer_1 = __webpack_require__(56423);
 const debug = Debug("snyk");
@@ -137207,7 +137164,7 @@ async function extractArchive(dockerArchiveFilesystemPath, extractActions) {
             }
             catch (error) {
                 debug(`Error getting layers and manifest content from docker archive: ${error}`);
-                reject(new Error("Invalid Docker archive"));
+                reject(new __1.InvalidArchiveError("Invalid Docker archive"));
             }
         });
         tarExtractor.on("error", (error) => reject(error));
@@ -137397,10 +137354,38 @@ exports.getImageNames = getImageNames;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getContentAsString = exports.getContentAsBuffer = exports.isDeletedFile = exports.extractImageContent = void 0;
+exports.getContentAsString = exports.getContentAsBuffer = exports.isDeletedFile = exports.getUserInstructionLayersFromConfig = exports.getDetectedLayersInfoFromConfig = exports.getPlatformFromConfig = exports.getRootFsLayersFromConfig = exports.extractImageContent = exports.InvalidArchiveError = void 0;
+const instruction_parser_1 = __webpack_require__(50387);
 const types_1 = __webpack_require__(93677);
 const dockerExtractor = __webpack_require__(40637);
 const ociExtractor = __webpack_require__(27044);
+class InvalidArchiveError extends Error {
+    constructor(message) {
+        super();
+        this.name = "InvalidArchiveError";
+        this.message = message;
+    }
+}
+exports.InvalidArchiveError = InvalidArchiveError;
+class ArchiveExtractor {
+    constructor(extractor, path, actions) {
+        this.fileSystemPath = path;
+        this.extractActions = actions;
+        this.extractor = extractor;
+    }
+    getExtractor() {
+        return this.extractor;
+    }
+    async getLayersAndManifest() {
+        return await this.extractor.extractArchive(this.fileSystemPath, this.extractActions);
+    }
+    getImageIdFromManifest(manifest) {
+        return this.extractor.getImageIdFromManifest(manifest);
+    }
+    getManifestLayers(manifest) {
+        return this.extractor.getManifestLayers(manifest);
+    }
+}
 /**
  * Given a path on the file system to a image archive, open it up to inspect the layers
  * and look for specific files. File content can be transformed with a custom callback function if needed.
@@ -137409,33 +137394,98 @@ const ociExtractor = __webpack_require__(27044);
  * By default the file is returned raw if no processing is desired.
  */
 async function extractImageContent(imageType, fileSystemPath, extractActions) {
-    switch (imageType) {
-        case types_1.ImageType.OciArchive:
-            const ociArchive = await ociExtractor.extractArchive(fileSystemPath, extractActions);
-            return {
-                imageId: ociExtractor.getImageIdFromManifest(ociArchive.manifest),
-                manifestLayers: ociExtractor.getManifestLayers(ociArchive.manifest),
-                extractedLayers: layersWithLatestFileModifications(ociArchive.layers),
-                rootFsLayers: dockerExtractor.getRootFsLayersFromConfig(ociArchive.imageConfig),
-                autoDetectedUserInstructions: dockerExtractor.getDetectedLayersInfoFromConfig(ociArchive.imageConfig),
-                platform: dockerExtractor.getPlatformFromConfig(ociArchive.imageConfig),
-                imageLabels: ociArchive.imageConfig.config.Labels,
-            };
-        default:
-            const dockerArchive = await dockerExtractor.extractArchive(fileSystemPath, extractActions);
-            return {
-                imageId: dockerExtractor.getImageIdFromManifest(dockerArchive.manifest),
-                manifestLayers: dockerExtractor.getManifestLayers(dockerArchive.manifest),
-                extractedLayers: layersWithLatestFileModifications(dockerArchive.layers),
-                rootFsLayers: dockerExtractor.getRootFsLayersFromConfig(dockerArchive.imageConfig),
-                autoDetectedUserInstructions: dockerExtractor.getDetectedLayersInfoFromConfig(dockerArchive.imageConfig),
-                platform: dockerExtractor.getPlatformFromConfig(dockerArchive.imageConfig),
-                imageLabels: dockerArchive.imageConfig.config.Labels,
-                imageCreationTime: dockerArchive.imageConfig.created,
-            };
+    const extractors = new Map([
+        [
+            types_1.ImageType.DockerArchive,
+            new ArchiveExtractor(dockerExtractor, fileSystemPath, extractActions),
+        ],
+        [
+            types_1.ImageType.OciArchive,
+            new ArchiveExtractor(ociExtractor, fileSystemPath, extractActions),
+        ],
+    ]);
+    let extractor;
+    let archiveContent;
+    if (extractors.has(imageType)) {
+        extractor = extractors.get(imageType);
+        archiveContent = await extractor.getLayersAndManifest();
+    }
+    else {
+        // At this stage we do not know the format of the image so we will attempt
+        // to extract the archive using the dockerExtractor but fall back to use the
+        // ociExtractor if we encounter an invalid format.
+        // This will happen on images pulled by the docker binary when using
+        // containerd under the hood
+        // @see https://snyksec.atlassian.net/browse/LUM-147
+        try {
+            extractor = extractors.get(types_1.ImageType.DockerArchive);
+            archiveContent = await extractor.getLayersAndManifest();
+        }
+        catch (err) {
+            if (err instanceof InvalidArchiveError) {
+                extractor = extractors.get(types_1.ImageType.OciArchive);
+                archiveContent = await extractor.getLayersAndManifest();
+            }
+            else {
+                throw err;
+            }
+        }
     }
+    return {
+        imageId: extractor.getImageIdFromManifest(archiveContent.manifest),
+        manifestLayers: extractor.getManifestLayers(archiveContent.manifest),
+        imageCreationTime: archiveContent.imageConfig.created,
+        extractedLayers: layersWithLatestFileModifications(archiveContent.layers),
+        rootFsLayers: getRootFsLayersFromConfig(archiveContent.imageConfig),
+        autoDetectedUserInstructions: getDetectedLayersInfoFromConfig(archiveContent.imageConfig),
+        platform: getPlatformFromConfig(archiveContent.imageConfig),
+        imageLabels: archiveContent.imageConfig.config.Labels,
+    };
 }
 exports.extractImageContent = extractImageContent;
+function getRootFsLayersFromConfig(imageConfig) {
+    try {
+        return imageConfig.rootfs.diff_ids;
+    }
+    catch (err) {
+        throw new Error("Failed to extract rootfs array from image config");
+    }
+}
+exports.getRootFsLayersFromConfig = getRootFsLayersFromConfig;
+function getPlatformFromConfig(imageConfig) {
+    return imageConfig.os && imageConfig.architecture
+        ? `${imageConfig.os}/${imageConfig.architecture}`
+        : undefined;
+}
+exports.getPlatformFromConfig = getPlatformFromConfig;
+function getDetectedLayersInfoFromConfig(imageConfig) {
+    const runInstructions = getUserInstructionLayersFromConfig(imageConfig)
+        .filter((instruction) => !instruction.empty_layer && instruction.created_by)
+        .map((instruction) => instruction.created_by.replace("# buildkit", ""));
+    const dockerfilePackages = (0, instruction_parser_1.getPackagesFromRunInstructions)(runInstructions);
+    const dockerfileLayers = (0, instruction_parser_1.getLayersFromPackages)(dockerfilePackages);
+    return { dockerfilePackages, dockerfileLayers };
+}
+exports.getDetectedLayersInfoFromConfig = getDetectedLayersInfoFromConfig;
+function getUserInstructionLayersFromConfig(imageConfig) {
+    const diffInHours = (d1, d2) => Math.abs(d1 - d2) / 1000 / (60 * 60);
+    const maxDiffInHours = 5;
+    const history = imageConfig.history;
+    if (!history) {
+        return [];
+    }
+    const lastInstructionTime = new Date(history.slice(-1)[0].created);
+    const userInstructionLayers = history.filter((layer) => {
+        return (diffInHours(new Date(layer.created), lastInstructionTime) <=
+            maxDiffInHours);
+    });
+    // should only happen if there are no layers created by user instructions
+    if (userInstructionLayers.length === history.length) {
+        return [];
+    }
+    return userInstructionLayers;
+}
+exports.getUserInstructionLayersFromConfig = getUserInstructionLayersFromConfig;
 function layersWithLatestFileModifications(layers) {
     const extractedLayers = {};
     const removedFilesToIgnore = new Set();
@@ -137592,9 +137642,14 @@ const gunzip = __webpack_require__(65923);
 const path_1 = __webpack_require__(85622);
 const stream_1 = __webpack_require__(92413);
 const tar_stream_1 = __webpack_require__(53871);
+const __1 = __webpack_require__(18141);
 const stream_utils_1 = __webpack_require__(54540);
 const layer_1 = __webpack_require__(56423);
 const debug = Debug("snyk");
+const MEDIATYPE_DOCKER_MANIFEST_V2 = "application/vnd.docker.distribution.manifest.v2+json";
+const MEDIATYPE_DOCKER_MANIFEST_LIST_V2 = "application/vnd.docker.distribution.manifest.list.v2+json";
+const MEDIATYPE_OCI_MANIFEST_V1 = "application/vnd.oci.image.manifest.v1+json";
+const MEDIATYPE_OCI_MANIFEST_LIST_V1 = "application/vnd.oci.image.index.v1+json";
 /**
  * Retrieve the products of files content from the specified oci-archive.
  * @param ociArchiveFilesystemPath Path to image file saved in oci-archive format.
@@ -137654,7 +137709,7 @@ async function extractArchive(ociArchiveFilesystemPath, extractActions) {
             }
             catch (error) {
                 debug(`Error getting layers and manifest content from oci archive: '${error}'`);
-                reject(new Error("Invalid OCI archive"));
+                reject(new __1.InvalidArchiveError("Invalid OCI archive"));
             }
         });
         tarExtractor.on("error", (error) => {
@@ -137704,11 +137759,13 @@ function getManifest(imageIndex, manifestCollection, indexFiles) {
 function getAllManifestsIndexItems(imageIndex, indexFiles) {
     const allManifestsInfo = [];
     for (const manifest of imageIndex.manifests) {
-        if (manifest.mediaType === "application/vnd.oci.image.manifest.v1+json") {
+        if (manifest.mediaType === MEDIATYPE_OCI_MANIFEST_V1 ||
+            manifest.mediaType === MEDIATYPE_DOCKER_MANIFEST_V2) {
             // an archive manifest file
             allManifestsInfo.push(manifest);
         }
-        else if (manifest.mediaType === "application/vnd.oci.image.index.v1+json") {
+        else if (manifest.mediaType === MEDIATYPE_OCI_MANIFEST_LIST_V1 ||
+            manifest.mediaType === MEDIATYPE_DOCKER_MANIFEST_LIST_V2) {
             // nested index
             const index = indexFiles[manifest.digest];
             allManifestsInfo.push(...getAllManifestsIndexItems(index, indexFiles));
@@ -137723,7 +137780,8 @@ function isImageConfigFile(json) {
     return json !== undefined && json.architecture && json.rootfs;
 }
 function isImageIndexFile(json) {
-    return ((json === null || json === void 0 ? void 0 : json.mediaType) === "application/vnd.oci.image.index.v1+json" &&
+    return (((json === null || json === void 0 ? void 0 : json.mediaType) === MEDIATYPE_OCI_MANIFEST_LIST_V1 ||
+        (json === null || json === void 0 ? void 0 : json.mediaType) === MEDIATYPE_DOCKER_MANIFEST_LIST_V2) &&
         Array.isArray(json === null || json === void 0 ? void 0 : json.manifests));
 }
 function isMainIndexFile(name) {
@@ -137866,11 +137924,20 @@ function extractModuleInformation(binary) {
     }
     const modules = [];
     versionsLines.forEach((versionLine) => {
-        const [, name, ver] = versionLine.split("\t");
+        const [depType, name, ver] = versionLine.split("\t");
         if (!name || !ver) {
             return;
         }
-        modules.push(new go_module_1.GoModule(name, ver));
+        if (depType === "dep") {
+            modules.push(new go_module_1.GoModule(name, ver));
+        }
+        else if (depType === "=>") {
+            // we've found a replace directive. These are always for the previous
+            // line/ module, so we simply need to replace the last module we added.
+            const last = modules.length - 1;
+            modules[last].name = name;
+            modules[last].version = ver;
+        }
     });
     return [name, modules];
 }
@@ -138341,8 +138408,16 @@ class LineTable {
             this.binary = bigEndian;
             this.version = pclnVersion.v118;
         }
+        else if (beMagic === LineTable.go120magic) {
+            this.binary = bigEndian;
+            this.version = pclnVersion.v120;
+        }
+        else if (leMagic === LineTable.go120magic) {
+            this.binary = littleEndian;
+            this.version = pclnVersion.v118;
+        }
         else {
-            throw new Error("unknown / unsupported Go version");
+            throw new Error(`unknown / unsupported Go version`);
         }
         this.ptrsize = b[7];
         const uintptr = (b) => {
@@ -138359,6 +138434,7 @@ class LineTable {
         };
         switch (this.version) {
             case pclnVersion.v118:
+            case pclnVersion.v120:
                 this.nfiletab = Number(offset(1));
                 this.filetab = data(5);
                 this.funcdata = data(7);
@@ -138450,6 +138526,7 @@ exports.LineTable = LineTable;
 LineTable.go12magic = 0xfffffffb;
 LineTable.go116magic = 0xfffffffa;
 LineTable.go118magic = 0xfffffff0;
+LineTable.go120magic = 0xfffffff1;
 var pclnVersion;
 (function (pclnVersion) {
     pclnVersion[pclnVersion["unknown"] = 0] = "unknown";
@@ -138457,6 +138534,7 @@ var pclnVersion;
     pclnVersion[pclnVersion["v12"] = 2] = "v12";
     pclnVersion[pclnVersion["v116"] = 3] = "v116";
     pclnVersion[pclnVersion["v118"] = 4] = "v118";
+    pclnVersion[pclnVersion["v120"] = 5] = "v120";
 })(pclnVersion || (pclnVersion = {}));
 const bigEndian = {
     Uint32(b) {