snyk 1.1082.0 → 1.1083.0

package/dist/cli/95.index.js

@@ -142599,7 +142599,7 @@ function isTarFile(name) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ImageDigest = exports.ImageName = void 0;
+exports.getImageNames = exports.ImageDigest = exports.ImageName = void 0;
 class ImageName {
     constructor(targetImage, digests = {}) {
         // this regex has been copied from
@@ -142705,6 +142705,23 @@ class ImageDigest {
     }
 }
 exports.ImageDigest = ImageDigest;
+function getImageNames(options, imageName) {
+    if (imageName) {
+        return imageName.getAllNames();
+    }
+    const names = [];
+    if (options === null || options === void 0 ? void 0 : options.imageNameAndTag) {
+        const imageName = new ImageName(options.imageNameAndTag);
+        names.push(...imageName.getAllNames());
+    }
+    if ((options === null || options === void 0 ? void 0 : options.imageNameAndDigest) &&
+        (options === null || options === void 0 ? void 0 : options.imageNameAndDigest) !== (options === null || options === void 0 ? void 0 : options.imageNameAndTag)) {
+        const imageName = new ImageName(options.imageNameAndDigest);
+        names.push(...imageName.getAllNames());
+    }
+    return names;
+}
+exports.getImageNames = getImageNames;
 //# sourceMappingURL=image.js.map
 
 /***/ }),
@@ -144319,7 +144336,7 @@ const path_1 = __webpack_require__(85622);
 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 pythonMetadataFilesRegex = /\/lib\/python.*?\/(?:dist|site)-packages\/.*?\.dist-info\/METADATA/;
 const deletedPoetryAppFiles = poetryManifestFiles.map((file) => ".wh." + file);
 const deletedPipAppFiles = pipManifestFiles.map((file) => ".wh." + file);
 function poetryFilePathMatches(filePath) {
@@ -144654,7 +144671,7 @@ const dep_graph_1 = __webpack_require__(26326);
 // Module that provides functions to collect and build response after all
 // analyses' are done.
 const dockerfile_1 = __webpack_require__(79652);
-async function buildResponse(depsAnalysis, dockerfileAnalysis, excludeBaseImageVulns, imageName) {
+async function buildResponse(depsAnalysis, dockerfileAnalysis, excludeBaseImageVulns, names) {
     var _a, _b;
     const deps = depsAnalysis.depTree.dependencies;
     const dockerfilePkgs = collectDockerfilePkgs(dockerfileAnalysis, deps);
@@ -144775,8 +144792,7 @@ async function buildResponse(depsAnalysis, dockerfileAnalysis, excludeBaseImageV
         type: "depGraph",
         data: depGraph,
     };
-    if (imageName) {
-        const names = imageName.getAllNames();
+    if (names) {
         if (names.length > 0) {
             const imageNameInfo = { names };
             const imageNamesFact = {
@@ -144990,6 +145006,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.analyzeStatically = void 0;
 const analyzer = __webpack_require__(55269);
 const dependency_tree_1 = __webpack_require__(95997);
+const image_1 = __webpack_require__(92748);
 const option_utils_1 = __webpack_require__(48587);
 const parser_1 = __webpack_require__(45062);
 const response_builder_1 = __webpack_require__(75319);
@@ -145000,7 +145017,8 @@ async function analyzeStatically(targetImage, dockerfileAnalysis, imageType, ima
     const dependenciesTree = (0, dependency_tree_1.buildTree)(targetImage, parsedAnalysisResult.packageFormat, parsedAnalysisResult.depInfosList, parsedAnalysisResult.targetOS);
     const analysis = Object.assign(Object.assign({}, staticAnalysis), { depTree: dependenciesTree, imageId: parsedAnalysisResult.imageId, imageLayers: parsedAnalysisResult.imageLayers, packageFormat: parsedAnalysisResult.packageFormat });
     const excludeBaseImageVulns = (0, option_utils_1.isTrue)(options["exclude-base-image-vulns"]);
-    return (0, response_builder_1.buildResponse)(analysis, dockerfileAnalysis, excludeBaseImageVulns, imageName);
+    const names = (0, image_1.getImageNames)(options, imageName);
+    return (0, response_builder_1.buildResponse)(analysis, dockerfileAnalysis, excludeBaseImageVulns, names);
 }
 exports.analyzeStatically = analyzeStatically;
 //# sourceMappingURL=static.js.map
@@ -154137,10 +154155,10 @@ async function getGradleVersion(root, command) {
     }
     return gradleVersionOutput;
 }
-async function getAllDepsWithPlugin(root, targetFile, options) {
+async function getAllDepsWithPlugin(root, targetFile, options, gradleVersion) {
     const command = getCommand(root, targetFile);
     const { injectedPluginFilePath, cleanupCallback } = await injectedPlugin('init.gradle');
-    const args = buildArgs(root, targetFile, injectedPluginFilePath, options);
+    const args = buildArgs(root, targetFile, injectedPluginFilePath, options, gradleVersion);
     const fullCommandText = 'gradle command: ' + command + ' ' + args.join(' ');
     debugLog('Executing ' + fullCommandText);
     const stdoutText = await subProcess.execute(command, args, { cwd: root }, printIfEcho);
@@ -154170,7 +154188,7 @@ async function getAllDeps(root, targetFile, options, snykHttpClient) {
         throw new Error('Gradle 1.x is not supported');
     }
     try {
-        const extractedJSON = await getAllDepsWithPlugin(root, targetFile, options);
+        const extractedJSON = await getAllDepsWithPlugin(root, targetFile, options, gradleVersion);
         const versionBuildInfo = getVersionBuildInfo(gradleVersion);
         if (versionBuildInfo) {
             extractedJSON.versionBuildInfo = versionBuildInfo;
@@ -154309,8 +154327,8 @@ function getCommand(root, targetFile) {
     }
     return 'gradle';
 }
-function buildArgs(root, targetFile, initGradlePath, options) {
-    const args = [];
+function buildArgs(root, targetFile, initGradlePath, options, gradleVersion) {
+    let args = [];
     const taskName = options.gradleNormalizeDeps
         ? 'snykNormalizedResolvedDepsJson'
         : 'snykResolvedDepsJson';
@@ -154352,6 +154370,10 @@ function buildArgs(root, targetFile, initGradlePath, options) {
     if (options.args) {
         args.push(...options.args);
     }
+    // Gradle 7 introduced configuration caching which we don't support yet
+    // If it is enabled in a gradle.properties file, it can be disabled on the command line with --no-configuration-cache
+    if (gradleVersion.match(/Gradle 7/))
+        args.push('--no-configuration-cache');
     // There might be a legacy --configuration option in 'args'.
     // It has been superseded by --configuration-matching option for Snyk CLI (see buildArgs),
     // but we are handling it to support the legacy setups.
@@ -154364,6 +154386,15 @@ function buildArgs(root, targetFile, initGradlePath, options) {
             args[i + 1] = '';
         }
     });
+    const unsupportedArgs = ['--configuration-cache'];
+    args = args.filter((arg) => {
+        if (unsupportedArgs.includes(arg)) {
+            debugLog(`Argument ${arg} not currently supported by Snyk.`);
+            return false;
+        }
+        else
+            return true;
+    });
     return args.filter(Boolean);
 }
 exports.exportsForTests = {