snyk 1.1012.0 → 1.1014.0

package/dist/cli/522.index.js

@@ -158338,7 +158338,8 @@ const static_6 = __webpack_require__(5809);
 const static_7 = __webpack_require__(96704);
 const static_8 = __webpack_require__(92578);
 const static_9 = __webpack_require__(88795);
-const static_10 = __webpack_require__(45330);
+const static_10 = __webpack_require__(98157);
+const static_11 = __webpack_require__(45330);
 const option_utils_1 = __webpack_require__(48587);
 const applications_1 = __webpack_require__(19551);
 const java_1 = __webpack_require__(3823);
@@ -158353,12 +158354,13 @@ async function analyze(targetImage, dockerfileAnalysis, imageType, imagePath, gl
         static_1.getApkDbFileContentAction,
         static_2.getDpkgFileContentAction,
         static_2.getExtFileContentAction,
-        static_10.getRpmDbFileContentAction,
-        static_10.getRpmSqliteDbFileContentAction,
+        static_11.getRpmDbFileContentAction,
+        static_11.getRpmSqliteDbFileContentAction,
         ...static_7.getOsReleaseActions,
         static_3.getNodeBinariesFileContentAction,
         static_3.getOpenJDKBinariesFileContentAction,
         static_4.getDpkgPackageFileContentAction,
+        static_10.getRedHatRepositoriesContentAction,
     ];
     const checkForGlobs = shouldCheckForGlobs(globsToFind);
     if (checkForGlobs) {
@@ -158379,8 +158381,8 @@ async function analyze(targetImage, dockerfileAnalysis, imageType, imagePath, gl
     const [apkDbFileContent, aptDbFileContent, rpmDbFileContent, rpmSqliteDbFileContent,] = await Promise.all([
         (0, static_1.getApkDbFileContent)(extractedLayers),
         (0, static_2.getAptDbFileContent)(extractedLayers),
-        (0, static_10.getRpmDbFileContent)(extractedLayers),
-        (0, static_10.getRpmSqliteDbFileContent)(extractedLayers),
+        (0, static_11.getRpmDbFileContent)(extractedLayers),
+        (0, static_11.getRpmSqliteDbFileContent)(extractedLayers),
     ]);
     const distrolessAptFiles = (0, static_4.getAptFiles)(extractedLayers);
     const manifestFiles = [];
@@ -158411,6 +158413,7 @@ async function analyze(targetImage, dockerfileAnalysis, imageType, imagePath, gl
         throw new Error("Failed to detect installed OS packages");
     }
     const binaries = (0, static_3.getBinariesHashes)(extractedLayers);
+    const redHatRepositories = (0, static_10.getRedHatRepositoriesFromExtractedLayers)(extractedLayers);
     const applicationDependenciesScanResults = [];
     if (appScan) {
         const nodeDependenciesScanResults = await (0, applications_1.nodeFilesToScannedProjects)((0, inputs_1.getFileContent)(extractedLayers, static_6.getNodeAppFileContentAction.actionName));
@@ -158435,6 +158438,7 @@ async function analyze(targetImage, dockerfileAnalysis, imageType, imagePath, gl
         autoDetectedUserInstructions,
         imageLabels,
         imageCreationTime,
+        redHatRepositories,
     };
 }
 exports.analyze = analyze;
@@ -159540,7 +159544,7 @@ function isTarFile(name) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getContentAsString = exports.getContentAsBuffer = exports.extractImageContent = void 0;
+exports.getContentAsString = exports.getContentAsBuffer = exports.isDeletedFile = exports.extractImageContent = void 0;
 const types_1 = __webpack_require__(93677);
 const dockerExtractor = __webpack_require__(40637);
 const ociExtractor = __webpack_require__(27044);
@@ -159581,18 +159585,34 @@ async function extractImageContent(imageType, fileSystemPath, extractActions) {
 exports.extractImageContent = extractImageContent;
 function layersWithLatestFileModifications(layers) {
     const extractedLayers = {};
+    const removedFilesToIgnore = new Set();
     // TODO: This removes the information about the layer name, maybe we would need it in the future?
     for (const layer of layers) {
         // go over extracted files products found in this layer
         for (const filename of Object.keys(layer)) {
-            // file was not found
-            if (!Reflect.has(extractedLayers, filename)) {
+            // if finding a deleted file - trimming to its original file name for excluding it from extractedLayers
+            if (isDeletedFile(filename)) {
+                removedFilesToIgnore.add(filename.replace(/.wh./, ""));
+            }
+            // not adding the original file to extractedLayers
+            // and removing it from the set since it can be found in consecutive layers
+            if (removedFilesToIgnore.has(filename)) {
+                removedFilesToIgnore.delete(filename);
+            }
+            else if (
+            // file was not found + avoid adding deleted files with .wh.
+            !Reflect.has(extractedLayers, filename) &&
+                !isDeletedFile(filename)) {
                 extractedLayers[filename] = layer[filename];
             }
         }
     }
     return extractedLayers;
 }
+function isDeletedFile(filename) {
+    return filename.match(/.wh./gm);
+}
+exports.isDeletedFile = isDeletedFile;
 function isBufferType(type) {
     return type.buffer !== undefined;
 }
@@ -159632,6 +159652,7 @@ const Debug = __webpack_require__(15158);
 const gunzip = __webpack_require__(65923);
 const path = __webpack_require__(85622);
 const tar_stream_1 = __webpack_require__(53871);
+const _1 = __webpack_require__(18141);
 const callbacks_1 = __webpack_require__(12518);
 const debug = Debug("snyk");
 /**
@@ -159651,7 +159672,8 @@ async function extractImageLayer(layerTarStream, extractActions) {
                 if (matchedActions.length > 0) {
                     try {
                         const callbackResult = await (0, callbacks_1.applyCallbacks)(matchedActions, stream, headers.size);
-                        if (!(0, callbacks_1.isResultEmpty)(callbackResult)) {
+                        if (!(0, callbacks_1.isResultEmpty)(callbackResult) ||
+                            (0, _1.isDeletedFile)(absoluteFileName)) {
                             result[absoluteFileName] = callbackResult;
                         }
                     }
@@ -160960,9 +160982,11 @@ exports.getNodeAppFileContentAction = void 0;
 const path_1 = __webpack_require__(85622);
 const stream_utils_1 = __webpack_require__(54540);
 const nodeAppFiles = ["package.json", "package-lock.json", "yarn.lock"];
+const deletedAppFiles = nodeAppFiles.map((file) => ".wh." + file);
 function filePathMatches(filePath) {
     const fileName = (0, path_1.basename)(filePath);
-    return (filePath.indexOf("node_modules") === -1 && nodeAppFiles.includes(fileName));
+    return (filePath.indexOf("node_modules") === -1 &&
+        (nodeAppFiles.includes(fileName) || deletedAppFiles.includes(fileName)));
 }
 exports.getNodeAppFileContentAction = {
     actionName: "node-app-files",
@@ -161076,9 +161100,10 @@ exports.getPhpAppFileContentAction = void 0;
 const path_1 = __webpack_require__(85622);
 const stream_utils_1 = __webpack_require__(54540);
 const phpAppFiles = ["composer.json", "composer.lock"];
+const deletedAppFiles = phpAppFiles.map((file) => ".wh." + file);
 function filePathMatches(filePath) {
     const fileName = (0, path_1.basename)(filePath);
-    return phpAppFiles.includes(fileName);
+    return phpAppFiles.includes(fileName) || deletedAppFiles.includes(fileName);
 }
 exports.getPhpAppFileContentAction = {
     actionName: "php-app-files",
@@ -161101,9 +161126,12 @@ const stream_utils_1 = __webpack_require__(54540);
 const poetryManifestFiles = ["pyproject.toml", "poetry.lock"];
 const pipManifestFiles = ["requirements.txt"];
 const pythonMetadataFilesRegex = /\/lib\/python.*?\/site-packages\/.*?\.dist-info\/METADATA/;
+const deletedPoetryAppFiles = poetryManifestFiles.map((file) => ".wh." + file);
+const deletedPipAppFiles = pipManifestFiles.map((file) => ".wh." + file);
 function poetryFilePathMatches(filePath) {
     const fileName = (0, path_1.basename)(filePath);
-    return poetryManifestFiles.includes(fileName);
+    return (poetryManifestFiles.includes(fileName) ||
+        deletedPoetryAppFiles.includes(fileName));
 }
 exports.getPoetryAppFileContentAction = {
     actionName: "poetry-app-files",
@@ -161113,7 +161141,8 @@ exports.getPoetryAppFileContentAction = {
 function pipFilePathMatches(filePath) {
     const fileName = (0, path_1.basename)(filePath);
     return (pipManifestFiles.includes(fileName) ||
-        pythonMetadataFilesRegex.test(filePath));
+        pythonMetadataFilesRegex.test(filePath) ||
+        deletedPipAppFiles.includes(fileName));
 }
 exports.getPipAppFileContentAction = {
     actionName: "pip-app-files",
@@ -161124,6 +161153,37 @@ exports.getPipAppFileContentAction = {
 
 /***/ }),
 
+/***/ 98157:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getRedHatRepositoriesFromExtractedLayers = exports.getRedHatRepositoriesContentAction = void 0;
+const stream_utils_1 = __webpack_require__(54540);
+exports.getRedHatRepositoriesContentAction = {
+    actionName: "redhat-content-manifests",
+    filePathMatches: isRedHatContentManifest,
+    callback: stream_utils_1.streamToJson,
+};
+function getRedHatRepositoriesFromExtractedLayers(extractedLayers) {
+    const repositories = [];
+    for (const filePath in extractedLayers) {
+        if (isRedHatContentManifest(filePath)) {
+            const contentManifest = extractedLayers[filePath]["redhat-content-manifests"];
+            repositories.push(...contentManifest === null || contentManifest === void 0 ? void 0 : contentManifest.content_sets);
+        }
+    }
+    return [...new Set(repositories)];
+}
+exports.getRedHatRepositoriesFromExtractedLayers = getRedHatRepositoriesFromExtractedLayers;
+function isRedHatContentManifest(filePath) {
+    return filePath.startsWith("/root/buildinfo/content_manifests/");
+}
+//# sourceMappingURL=static.js.map
+
+/***/ }),
+
 /***/ 45330:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -161495,6 +161555,13 @@ async function buildResponse(depsAnalysis, dockerfileAnalysis, excludeBaseImageV
         };
         additionalFacts.push(autoDetectedUserInstructionsFact);
     }
+    if (depsAnalysis.redHatRepositories.length > 0) {
+        const redHatRepositoriesFact = {
+            type: "redHatRepositories",
+            data: depsAnalysis.redHatRepositories,
+        };
+        additionalFacts.push(redHatRepositoriesFact);
+    }
     const applicationDependenciesScanResults = (depsAnalysis.applicationDependenciesScanResults || []).map((appDepsScanResult) => {
         if (depsAnalysis.imageId) {
             const imageIdFact = {