snyk 1.1143.0 → 1.1144.0

package/dist/cli/95.index.js

@@ -157820,29 +157820,27 @@ async function extractImageContent(imageType, fileSystemPath, extractActions) {
     ]);
     let extractor;
     let archiveContent;
-    if (extractors.has(imageType)) {
-        extractor = extractors.get(imageType);
+    if (!extractors.has(imageType)) {
+        // default to Docker extractor if image type is unknown
+        imageType = types_1.ImageType.DockerArchive;
+    }
+    extractor = extractors.get(imageType);
+    try {
         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) {
+    catch (err) {
+        if (err instanceof InvalidArchiveError) {
+            // fallback to the other extractor if layer extraction failed
+            if (imageType === types_1.ImageType.DockerArchive) {
                 extractor = extractors.get(types_1.ImageType.OciArchive);
-                archiveContent = await extractor.getLayersAndManifest();
             }
             else {
-                throw err;
+                extractor = extractors.get(types_1.ImageType.DockerArchive);
             }
+            archiveContent = await extractor.getLayersAndManifest();
+        }
+        else {
+            throw err;
         }
     }
     return {