snyk 1.1062.0 → 1.1064.0

package/dist/cli/263.index.js

@@ -5797,7 +5797,7 @@ async function* prepareRemoteBundle(options) {
     emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
     for (const chunkedFiles of (0, files_1.composeFilePayloads)(options.files, constants_1.MAX_PAYLOAD)) {
         const apiParams = {
-            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles', 'requestId', 'base64Encoding', 'org']),
+            ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles', 'requestId', 'org']),
             files: chunkedFiles.reduce((d, f) => {
                 // deepcode ignore PrototypePollution: FP this is an internal code
                 d[f.bundlePath] = f.hash;
@@ -5832,15 +5832,7 @@ async function* prepareRemoteBundle(options) {
 async function uploadRemoteBundle(options) {
     let uploadedFiles = 0;
     emitter_1.emitter.uploadBundleProgress(0, options.files.length);
-    const apiParams = (0, lodash_pick_1.default)(options, [
-        'baseURL',
-        'sessionToken',
-        'source',
-        'bundleHash',
-        'requestId',
-        'base64Encoding',
-        'org',
-    ]);
+    const apiParams = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'bundleHash', 'requestId', 'org']);
     const uploadFileChunks = async (bucketFiles) => {
         // Note: we specifically create __new__ isolated bundles here to faster files upload
         const resp = await (0, http_1.createBundle)({
@@ -5869,7 +5861,7 @@ async function fullfillRemoteBundle(options) {
     // Check remove bundle to make sure no missing files left
     let attempts = 0;
     let { remoteBundle } = options;
-    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'base64Encoding', 'org']);
+    const connectionOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']);
     while (remoteBundle.missingFiles.length && attempts < (options.maxAttempts || constants_1.MAX_UPLOAD_ATTEMPTS)) {
         const missingFiles = await (0, files_1.resolveBundleFiles)(options.baseDir, remoteBundle.missingFiles);
         await uploadRemoteBundle({
@@ -5889,15 +5881,7 @@ async function fullfillRemoteBundle(options) {
 }
 async function remoteBundleFactory(options) {
     let remoteBundle = null;
-    const baseOptions = (0, lodash_pick_1.default)(options, [
-        'baseURL',
-        'sessionToken',
-        'source',
-        'baseDir',
-        'requestId',
-        'base64Encoding',
-        'org',
-    ]);
+    const baseOptions = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'baseDir', 'requestId', 'org']);
     const bundleFactory = prepareRemoteBundle((0, lodash_omit_1.default)(options, ['baseDir']));
     for await (const response of bundleFactory) {
         if (response.type === 'error') {
@@ -5969,7 +5953,7 @@ async function createBundleFromFolders(options) {
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
-        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'base64Encoding']),
+        ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'requestId']),
         baseDir,
         files: bundleFiles,
         ...(((_b = (_a = options.analysisContext) === null || _a === void 0 ? void 0 : _a.org) === null || _b === void 0 ? void 0 : _b.name) ? { org: options.analysisContext.org.name } : {}),
@@ -6627,14 +6611,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getVerifyCallbackUrl = exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = exports.compressAndEncode = exports.setBase64Encoding = void 0;
+exports.getVerifyCallbackUrl = exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = exports.compressAndEncode = void 0;
 const uuid_1 = __webpack_require__(42277);
 const lodash_pick_1 = __importDefault(__webpack_require__(25030));
 const zlib_1 = __webpack_require__(78761);
 const util_1 = __webpack_require__(31669);
 const constants_1 = __webpack_require__(65765);
 const needle_1 = __webpack_require__(14577);
-const url_1 = __webpack_require__(78835);
 // The trick to typecast union type alias
 function isSubsetErrorCode(code, messages) {
     if (code in messages) {
@@ -6665,22 +6648,6 @@ const GENERIC_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.dnsNotFound]: constants_1.DEFAULT_ERROR_MESSAGES[constants_1.ErrorCodes.dnsNotFound],
     [constants_1.ErrorCodes.connectionRefused]: constants_1.DEFAULT_ERROR_MESSAGES[constants_1.ErrorCodes.connectionRefused],
 };
-function setBase64Encoding(options) {
-    if (!options.base64Encoding) {
-        const { hostname } = new url_1.URL(options.baseURL);
-        const rg = new RegExp('^(|dev.)snyk.io');
-        if (rg.test(hostname.slice(hostname.indexOf('.') + 1))) {
-            return options.base64Encoding;
-        }
-        else {
-            return true;
-        }
-    }
-    else {
-        return options.base64Encoding;
-    }
-}
-exports.setBase64Encoding = setBase64Encoding;
 async function compressAndEncode(payload) {
     // encode payload and compress;
     const deflate = (0, util_1.promisify)(zlib_1.gzip);
@@ -6770,26 +6737,19 @@ const CREATE_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Unable to resolve requested oid',
 };
 async function createBundle(options) {
-    const base64Encoding = setBase64Encoding(options);
-    let payloadBody;
-    if (base64Encoding) {
-        payloadBody = await compressAndEncode(options.files);
-    }
-    else {
-        payloadBody = options.files;
-    }
+    const payloadBody = await compressAndEncode(options.files);
     const payload = {
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
             ...(options.requestId && { 'snyk-request-id': options.requestId }),
-            ...(base64Encoding ? { 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' } : null),
+            ...{ 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' },
             ...(options.org && { 'snyk-org-name': options.org }),
         },
         url: `${options.baseURL}/bundle`,
         method: 'post',
         body: payloadBody,
-        isJson: base64Encoding ? false : true,
+        isJson: false,
     };
     const res = await (0, needle_1.makeRequest)(payload);
     if (res.success) {
@@ -6829,26 +6789,19 @@ const EXTEND_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Parent bundle has expired',
 };
 async function extendBundle(options) {
-    const base64Encoding = setBase64Encoding(options);
-    let payloadBody;
-    if (base64Encoding) {
-        payloadBody = await compressAndEncode((0, lodash_pick_1.default)(options, ['files', 'removedFiles']));
-    }
-    else {
-        payloadBody = (0, lodash_pick_1.default)(options, ['files', 'removedFiles']);
-    }
+    const payloadBody = await compressAndEncode((0, lodash_pick_1.default)(options, ['files', 'removedFiles']));
     const res = await (0, needle_1.makeRequest)({
         headers: {
             ...prepareTokenHeaders(options.sessionToken),
             source: options.source,
             ...(options.requestId && { 'snyk-request-id': options.requestId }),
-            ...(base64Encoding ? { 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' } : null),
+            ...{ 'content-type': 'application/octet-stream', 'content-encoding': 'gzip' },
             ...(options.org && { 'snyk-org-name': options.org }),
         },
         url: `${options.baseURL}/bundle/${options.bundleHash}`,
         method: 'put',
         body: payloadBody,
-        isJson: base64Encoding ? false : true,
+        isJson: false,
     });
     if (res.success)
         return { type: 'success', value: res.body };
@@ -17389,7 +17342,7 @@ function getAllDeps(lockfilePath) {
             throw new Error(`Error while parsing ${LOCKFILE_NAME}:\n${error.message}`);
         }
         const graph = parser.toDepGraph();
-        return legacy_1.graphToDepTree(graph, "cocoapods");
+        return (0, legacy_1.graphToDepTree)(graph, "cocoapods");
     });
 }
 function cocoapodsVersion(root) {
@@ -17434,11 +17387,13 @@ exports.OutOfSyncError = OutOfSyncError;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
+const shescape_1 = __webpack_require__(79114);
 function execute(command, args = [], options) {
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';
@@ -19274,6 +19229,7 @@ exports.init = init;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.inspect = exports.scan = void 0;
 var scan_1 = __webpack_require__(3113);
 Object.defineProperty(exports, "scan", ({ enumerable: true, get: function () { return scan_1.scan; } }));
 var inspect_1 = __webpack_require__(12442);
@@ -19295,7 +19251,7 @@ const PLUGIN_NAME = 'snyk-hex-plugin';
 async function inspect(root, targetFile, options = {}) {
     const { debug, dev, allProjects, 'project-name': projectName } = options;
     const [scanResult, pluginVersion] = await Promise.all([
-        scan_1.scan({ debug, dev, allProjects, projectName, path: root, targetFile }),
+        (0, scan_1.scan)({ debug, dev, allProjects, projectName, path: root, targetFile }),
         getPluginVersion(),
     ]);
     const scannedProjects = scanResult.scanResults.map(({ identity, facts: [{ data: depGraph }], name }) => ({
@@ -19338,14 +19294,14 @@ const debug_1 = __webpack_require__(39410);
 const copy_elixir_code_to_temp_dir_1 = __webpack_require__(88395);
 const MANIFEST_FILE_NAME = 'mix.exs';
 async function scan(options) {
-    debug_1.init(options.debug);
+    (0, debug_1.init)(options.debug);
     const targetFile = path.parse(path.resolve(options.path, options.targetFile || MANIFEST_FILE_NAME));
     if (targetFile.base !== MANIFEST_FILE_NAME) {
         throw new Error("target file must be 'mix.exs'.");
     }
     await verifyMixInstalled();
     const mixResult = await getMixResult(targetFile.dir);
-    const depGraphMap = mix_parser_1.buildDepGraphs(mixResult, !!options.dev, true, options.allProjects);
+    const depGraphMap = (0, mix_parser_1.buildDepGraphs)(mixResult, !!options.dev, true, options.allProjects);
     const scanResults = Object.entries(depGraphMap).map(([name, depGraph], index) => {
         const isRoot = index === 0;
         const relativePathToManifest = getRelativePathToManifest(options, targetFile, isRoot, name);
@@ -19371,28 +19327,28 @@ exports.scan = scan;
 async function verifyMixInstalled() {
     try {
         const mixVersion = await subProcess.execute('mix', ['-v']);
-        debug_1.debug(`mix version: `, mixVersion);
+        (0, debug_1.debug)(`mix version: `, mixVersion);
     }
     catch (_a) {
         throw new Error('mix is not installed. please make sure Elixir is installed and try again.');
     }
 }
 async function getMixResult(root) {
-    const elixirTmpDir = copy_elixir_code_to_temp_dir_1.copyElixirCodeToTempDir();
+    const elixirTmpDir = (0, copy_elixir_code_to_temp_dir_1.copyElixirCodeToTempDir)();
     const cwd = elixirTmpDir.name;
     let filePath;
     try {
         const output = await subProcess.execute('mix', ['read.mix', root], { cwd });
-        debug_1.debug(`read.mix output: ${output}`);
+        (0, debug_1.debug)(`read.mix output: ${output}`);
         const fileName = output.trim().split('\n').pop();
-        debug_1.debug(`fileName: ${fileName}`);
+        (0, debug_1.debug)(`fileName: ${fileName}`);
         filePath = path.resolve(cwd, fileName);
         const result = (await fs.promises.readFile(filePath, 'utf8'));
         return JSON.parse(result);
     }
     catch (err) {
         const errorMessage = `Error parsing manifest file on ${root}`;
-        debug_1.debug(errorMessage, err);
+        (0, debug_1.debug)(errorMessage, err);
         throw new Error(errorMessage);
     }
     finally {
@@ -19400,7 +19356,7 @@ async function getMixResult(root) {
             elixirTmpDir.removeCallback();
         }
         catch (err) {
-            debug_1.debug(`can't remove ${elixirTmpDir.name}`, err);
+            (0, debug_1.debug)(`can't remove ${elixirTmpDir.name}`, err);
         }
     }
 }
@@ -19430,28 +19386,31 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
 const debug_1 = __webpack_require__(39410);
+const shescape_1 = __webpack_require__(79114);
 function execute(command, args, options) {
-    debug_1.debug(`running "${command} ${args.join(' ')}"`);
+    (0, debug_1.debug)(`running "${command} ${args.join(' ')}"`);
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return new Promise((resolve, reject) => {
+        var _a, _b;
         let stdout = '';
         let stderr = '';
         const proc = childProcess.spawn(command, args, spawnOptions);
-        proc.stdout.on('data', (data) => {
+        (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             stdout = stdout + data;
         });
-        proc.stderr.on('data', (data) => {
+        (_b = proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
             stderr = stderr + data;
         });
         proc.on('close', (code) => {
             if (code !== 0) {
-                debug_1.debug(`Error running "${command} ${args.join(' ')}", exit code: ${code}`);
+                (0, debug_1.debug)(`Error running "${command} ${args.join(' ')}", exit code: ${code}`);
                 return reject(stdout || stderr);
             }
-            debug_1.debug(`Sub process stderr:`, stderr);
+            (0, debug_1.debug)(`Sub process stderr:`, stderr);
             resolve(stdout || stderr);
         });
     });
@@ -141741,11 +141700,11 @@ class Docker {
         return await dockerPull.pull(registry, repo, tag, opt);
     }
     async pullCli(targetImage, options) {
-        const opts = ["pull", targetImage];
+        const args = ["pull", targetImage];
         if (options === null || options === void 0 ? void 0 : options.platform) {
-            opts.push(`--platform=${options.platform}`);
+            args.push(`--platform=${options.platform}`);
         }
-        return subProcess.execute("docker", opts);
+        return subProcess.execute("docker", args);
     }
     async save(targetImage, destination) {
         const request = {
@@ -144726,11 +144685,13 @@ exports.streamToJson = streamToJson;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
+const shescape_1 = __webpack_require__(79114);
 function execute(command, args, options) {
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return new Promise((resolve, reject) => {
         let stdout = "";
         let stderr = "";
@@ -165341,11 +165302,15 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
 const index_1 = __webpack_require__(29615);
+const shescape_1 = __webpack_require__(79114);
 function execute(command, args, options) {
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    if (args) {
+        args = (0, shescape_1.quoteAll)(args, spawnOptions);
+    }
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';
@@ -192980,6 +192945,7 @@ exports.getPoetryDependencies = getPoetryDependencies;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.executeSync = exports.execute = void 0;
 const child_process_1 = __webpack_require__(63129);
+const shescape_1 = __webpack_require__(79114);
 function makeSpawnOptions(options) {
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
@@ -192992,6 +192958,7 @@ function makeSpawnOptions(options) {
 }
 function execute(command, args, options) {
     const spawnOptions = makeSpawnOptions(options);
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';
@@ -193013,6 +192980,7 @@ function execute(command, args, options) {
 exports.execute = execute;
 function executeSync(command, args, options) {
     const spawnOptions = makeSpawnOptions(options);
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return (0, child_process_1.spawnSync)(command, args, spawnOptions);
 }
 exports.executeSync = executeSync;
@@ -196613,7 +196581,7 @@ function buildHintMessage(options) {
 }
 function buildArgs(sbtArgs, isCoursierProject, isOutputGraph) {
     // force plain output so we don't have to parse colour codes
-    let args = ['"-Dsbt.log.noformat=true"'];
+    let args = ['-Dsbt.log.noformat=true'];
     if (sbtArgs) {
         args = args.concat(sbtArgs);
     }
@@ -196947,6 +196915,7 @@ exports.execute = void 0;
 const childProcess = __webpack_require__(63129);
 const treeKill = __webpack_require__(28);
 const debugModule = __webpack_require__(15158);
+const shescape_1 = __webpack_require__(79114);
 // To enable debugging output, run the CLI as `DEBUG=snyk-sbt-plugin snyk ...`
 const debugLogging = debugModule('snyk-sbt-plugin');
 // Disabled by default, to set run the CLI as `PROC_TIMEOUT=100000 snyk ...`
@@ -196957,6 +196926,7 @@ const execute = (command, args, options) => {
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    args = (0, shescape_1.quoteAll)(args, spawnOptions);
     return new Promise((resolve, reject) => {
         const out = {
             stdout: '',