snyk 1.758.0 → 1.759.0

package/dist/cli/64.index.js

@@ -6632,7 +6632,6 @@ const lodash_omit_1 = __importDefault(__webpack_require__(76427));
 const files_1 = __webpack_require__(32083);
 const constants_1 = __webpack_require__(65765);
 const http_1 = __webpack_require__(60776);
-const utils_1 = __webpack_require__(24054);
 const bundles_1 = __webpack_require__(86639);
 const emitter_1 = __webpack_require__(37544);
 const sleep = (duration) => new Promise(resolve => setTimeout(resolve, duration));
@@ -6683,10 +6682,11 @@ async function analyzeBundle(options) {
 exports.analyzeBundle = analyzeBundle;
 function normalizeResultFiles(files, baseDir) {
     if (baseDir) {
-        return (0, utils_1.fromEntries)(Object.entries(files).map(([path, positions]) => {
+        return Object.entries(files).reduce((obj, [path, positions]) => {
             const filePath = (0, files_1.resolveBundleFilePath)(baseDir, path);
-            return [filePath, positions];
-        }));
+            obj[filePath] = positions;
+            return obj;
+        }, {});
     }
     return files;
 }
@@ -6783,9 +6783,10 @@ function mergeSarifResults(oldAnalysisResults, newAnalysisResults, limitToFiles,
 }
 const moveSuggestionIndexes = (suggestionIndex, suggestions) => {
     const entries = Object.entries(suggestions);
-    return (0, utils_1.fromEntries)(entries.map(([i, s]) => {
-        return [`${parseInt(i, 10) + suggestionIndex + 1}`, s];
-    }));
+    return entries.reduce((obj, [i, s]) => {
+        obj[`${parseInt(i, 10) + suggestionIndex + 1}`] = s;
+        return obj;
+    }, {});
 };
 function mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles = [], baseDir) {
     // expand relative file names to absolute ones only for legacy results
@@ -6795,9 +6796,10 @@ function mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles
     // Addup all new suggestions' indexes
     const newSuggestions = moveSuggestionIndexes(suggestionIndex, newAnalysisResults.suggestions);
     const suggestions = { ...oldAnalysisResults.suggestions, ...newSuggestions };
-    const newFiles = (0, utils_1.fromEntries)(Object.entries(newAnalysisResults.files).map(([fn, s]) => {
-        return [fn, moveSuggestionIndexes(suggestionIndex, s)];
-    }));
+    const newFiles = Object.entries(newAnalysisResults.files).reduce((obj, [fn, s]) => {
+        obj[fn] = moveSuggestionIndexes(suggestionIndex, s);
+        return obj;
+    }, {});
     // expand relative file names to absolute ones only for legacy results
     const changedFiles = [...limitToFiles, ...removedFiles].map(path => (0, files_1.resolveBundleFilePath)(baseDir, path));
     const files = {
@@ -7119,7 +7121,7 @@ exports.readJSON = readJSON;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DEFAULT_ERROR_MESSAGES = exports.ErrorCodes = exports.DCIGNORE_DRAFTS = exports.IGNORE_FILES_NAMES = exports.IGNORES_DEFAULT = exports.REQUEST_RETRY_DELAY = exports.MAX_RETRY_ATTEMPTS = exports.POLLING_INTERVAL = exports.UPLOAD_CONCURRENCY = exports.MAX_UPLOAD_ATTEMPTS = exports.CACHE_KEY = exports.EXCLUDED_NAMES = exports.DOTSNYK_FILENAME = exports.DCIGNORE_FILENAME = exports.GITIGNORE_FILENAME = exports.GIT_FILENAME = exports.ENCODE_TYPE = exports.HASH_ALGORITHM = exports.defaultBaseURL = exports.MAX_FILE_SIZE = exports.MAX_PAYLOAD = void 0;
+exports.DEFAULT_ERROR_MESSAGES = exports.NETWORK_ERRORS = exports.ErrorCodes = exports.DCIGNORE_DRAFTS = exports.IGNORE_FILES_NAMES = exports.IGNORES_DEFAULT = exports.REQUEST_RETRY_DELAY = exports.MAX_RETRY_ATTEMPTS = exports.POLLING_INTERVAL = exports.UPLOAD_CONCURRENCY = exports.MAX_UPLOAD_ATTEMPTS = exports.CACHE_KEY = exports.EXCLUDED_NAMES = exports.DOTSNYK_FILENAME = exports.DCIGNORE_FILENAME = exports.GITIGNORE_FILENAME = exports.GIT_FILENAME = exports.ENCODE_TYPE = exports.HASH_ALGORITHM = exports.defaultBaseURL = exports.MAX_FILE_SIZE = exports.MAX_PAYLOAD = void 0;
 const dcignore_1 = __webpack_require__(55086);
 exports.MAX_PAYLOAD = 4 * 1024 * 1024;
 exports.MAX_FILE_SIZE = 128 * 1024;
@@ -7159,6 +7161,13 @@ var ErrorCodes;
     ErrorCodes[ErrorCodes["serviceUnavailable"] = 503] = "serviceUnavailable";
     ErrorCodes[ErrorCodes["timeout"] = 504] = "timeout";
 })(ErrorCodes = exports.ErrorCodes || (exports.ErrorCodes = {}));
+exports.NETWORK_ERRORS = {
+    ETIMEDOUT: ErrorCodes.timeout,
+    ECONNREFUSED: ErrorCodes.connectionRefused,
+    ECONNRESET: ErrorCodes.connectionRefused,
+    ENETUNREACH: ErrorCodes.connectionRefused,
+    ENOTFOUND: ErrorCodes.dnsNotFound,
+};
 exports.DEFAULT_ERROR_MESSAGES = {
     [ErrorCodes.serverError]: 'Unexpected server error',
     [ErrorCodes.badGateway]: 'Bad gateway',
@@ -7654,34 +7663,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = exports.determineErrorCode = void 0;
+exports.getAnalysis = exports.AnalysisStatus = exports.extendBundle = exports.checkBundle = exports.createBundle = exports.getFilters = exports.checkSession = exports.getIpFamily = exports.startSession = void 0;
 const uuid_1 = __webpack_require__(42277);
 const lodash_pick_1 = __importDefault(__webpack_require__(25030));
 const constants_1 = __webpack_require__(65765);
 const needle_1 = __webpack_require__(14577);
-function determineErrorCode(error) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const { response } = error;
-    if (response) {
-        return response.statusCode;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const { errno, code } = error;
-    if (errno === 'ECONNREFUSED') {
-        // set connectionRefused item
-        return constants_1.ErrorCodes.connectionRefused;
-    }
-    if (errno === 'ECONNRESET') {
-        // set connectionRefused item
-        return constants_1.ErrorCodes.connectionRefused;
-    }
-    if (code === 'ENOTFOUND') {
-        return constants_1.ErrorCodes.dnsNotFound;
-    }
-    // We must be strict here and if none of our existing logic recognized this error, just throw it up.
-    throw error;
-}
-exports.determineErrorCode = determineErrorCode;
 // The trick to typecast union type alias
 function isSubsetErrorCode(code, messages) {
     if (code in messages) {
@@ -7689,10 +7675,9 @@ function isSubsetErrorCode(code, messages) {
     }
     return false;
 }
-function generateError(error, messages, apiName) {
-    const errorCode = determineErrorCode(error);
+function generateError(errorCode, messages, apiName) {
     if (!isSubsetErrorCode(errorCode, messages)) {
-        throw error;
+        throw { errorCode, messages, apiName };
     }
     const statusCode = errorCode;
     const statusText = messages[errorCode];
@@ -7729,18 +7714,13 @@ exports.startSession = startSession;
  */
 async function getIpFamily(authHost) {
     const family = 6;
-    try {
-        // Dispatch a FORCED IPv6 request to test client's ISP and network capability
-        await (0, needle_1.makeRequest)({
-            url: `${authHost}/verify/callback`,
-            method: 'post',
-            family, // family param forces the handler to dispatch a request using IP at "family" version
-        });
-        return family;
-    }
-    catch (e) {
-        return undefined;
-    }
+    // Dispatch a FORCED IPv6 request to test client's ISP and network capability
+    const res = await (0, needle_1.makeRequest)({
+        url: `${authHost}/verify/callback`,
+        method: 'post',
+        family, // family param forces the handler to dispatch a request using IP at "family" version
+    }, 0);
+    return res.success ? family : undefined;
 }
 exports.getIpFamily = getIpFamily;
 const CHECK_SESSION_ERROR_MESSAGES = {
@@ -7749,53 +7729,38 @@ const CHECK_SESSION_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.loginInProgress]: constants_1.DEFAULT_ERROR_MESSAGES[constants_1.ErrorCodes.loginInProgress],
 };
 async function checkSession(options) {
-    var _a;
     const defaultValue = {
         type: 'success',
         value: '',
     };
-    try {
-        const { success, response } = await (0, needle_1.makeRequest)({
-            url: `${options.authHost}/api/v1/verify/callback`,
-            body: {
-                token: options.draftToken,
-            },
-            family: options.ipFamily,
-            method: 'post',
-        });
-        if (success) {
-            const responseBody = response.body;
-            defaultValue.value = (responseBody.ok && responseBody.api) || '';
-        }
-        return defaultValue;
+    const res = await (0, needle_1.makeRequest)({
+        url: `${options.authHost}/api/v1/verify/callback`,
+        body: {
+            token: options.draftToken,
+        },
+        family: options.ipFamily,
+        method: 'post',
+    });
+    if (res.success) {
+        return { ...defaultValue, value: (res.body.ok && res.body.api) || '' };
     }
-    catch (err) {
-        if ([constants_1.ErrorCodes.loginInProgress, constants_1.ErrorCodes.badRequest, constants_1.ErrorCodes.unauthorizedUser].includes(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        (_a = err.response) === null || _a === void 0 ? void 0 : _a.status)) {
-            return defaultValue;
-        }
-        return generateError(err, CHECK_SESSION_ERROR_MESSAGES, 'checkSession');
+    else if ([constants_1.ErrorCodes.loginInProgress, constants_1.ErrorCodes.badRequest, constants_1.ErrorCodes.unauthorizedUser].includes(res.errorCode)) {
+        return defaultValue;
     }
+    return generateError(res.errorCode, CHECK_SESSION_ERROR_MESSAGES, 'checkSession');
 }
 exports.checkSession = checkSession;
-async function getFilters(baseURL, source) {
+async function getFilters(baseURL, source, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
     const apiName = 'filters';
-    try {
-        const { success, response } = await (0, needle_1.makeRequest)({
-            headers: { source },
-            url: `${baseURL}/${apiName}`,
-            method: 'get',
-        });
-        if (success) {
-            const responseBody = response.body;
-            return { type: 'success', value: responseBody };
-        }
-        return generateError({ response }, GENERIC_ERROR_MESSAGES, apiName);
-    }
-    catch (error) {
-        return generateError(error, GENERIC_ERROR_MESSAGES, 'filters');
+    const res = await (0, needle_1.makeRequest)({
+        headers: { source },
+        url: `${baseURL}/${apiName}`,
+        method: 'get',
+    }, attempts);
+    if (res.success) {
+        return { type: 'success', value: res.body };
     }
+    return generateError(res.errorCode, GENERIC_ERROR_MESSAGES, apiName);
 }
 exports.getFilters = getFilters;
 function prepareTokenHeaders(sessionToken) {
@@ -7814,25 +7779,20 @@ const CREATE_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Unable to resolve requested oid',
 };
 async function createBundle(options) {
-    try {
-        const payload = {
-            headers: {
-                ...prepareTokenHeaders(options.sessionToken),
-                source: options.source,
-            },
-            url: `${options.baseURL}/bundle`,
-            method: 'post',
-            body: options.files,
-        };
-        const { response, success } = await (0, needle_1.makeRequest)(payload);
-        if (success) {
-            return { type: 'success', value: response.body };
-        }
-        return generateError({ response }, CREATE_BUNDLE_ERROR_MESSAGES, 'createBundle');
-    }
-    catch (error) {
-        return generateError(error, CREATE_BUNDLE_ERROR_MESSAGES, 'createBundle');
+    const payload = {
+        headers: {
+            ...prepareTokenHeaders(options.sessionToken),
+            source: options.source,
+        },
+        url: `${options.baseURL}/bundle`,
+        method: 'post',
+        body: options.files,
+    };
+    const res = await (0, needle_1.makeRequest)(payload);
+    if (res.success) {
+        return { type: 'success', value: res.body };
     }
+    return generateError(res.errorCode, CREATE_BUNDLE_ERROR_MESSAGES, 'createBundle');
 }
 exports.createBundle = createBundle;
 const CHECK_BUNDLE_ERROR_MESSAGES = {
@@ -7842,22 +7802,17 @@ const CHECK_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Uploaded bundle has expired',
 };
 async function checkBundle(options) {
-    try {
-        const { response, success } = await (0, needle_1.makeRequest)({
-            headers: {
-                ...prepareTokenHeaders(options.sessionToken),
-                source: options.source,
-            },
-            url: `${options.baseURL}/bundle/${options.bundleHash}`,
-            method: 'get',
-        });
-        if (success)
-            return { type: 'success', value: response.body };
-        return generateError({ response }, CHECK_BUNDLE_ERROR_MESSAGES, 'checkBundle');
-    }
-    catch (error) {
-        return generateError(error, CHECK_BUNDLE_ERROR_MESSAGES, 'checkBundle');
-    }
+    const res = await (0, needle_1.makeRequest)({
+        headers: {
+            ...prepareTokenHeaders(options.sessionToken),
+            source: options.source,
+        },
+        url: `${options.baseURL}/bundle/${options.bundleHash}`,
+        method: 'get',
+    });
+    if (res.success)
+        return { type: 'success', value: res.body };
+    return generateError(res.errorCode, CHECK_BUNDLE_ERROR_MESSAGES, 'checkBundle');
 }
 exports.checkBundle = checkBundle;
 const EXTEND_BUNDLE_ERROR_MESSAGES = {
@@ -7869,23 +7824,18 @@ const EXTEND_BUNDLE_ERROR_MESSAGES = {
     [constants_1.ErrorCodes.notFound]: 'Parent bundle has expired',
 };
 async function extendBundle(options) {
-    try {
-        const { response, success } = await (0, needle_1.makeRequest)({
-            headers: {
-                ...prepareTokenHeaders(options.sessionToken),
-                source: options.source,
-            },
-            url: `${options.baseURL}/bundle/${options.bundleHash}`,
-            method: 'put',
-            body: (0, lodash_pick_1.default)(options, ['files', 'removedFiles']),
-        });
-        if (success)
-            return { type: 'success', value: response.body };
-        return generateError({ response }, EXTEND_BUNDLE_ERROR_MESSAGES, 'extendBundle');
-    }
-    catch (error) {
-        return generateError(error, EXTEND_BUNDLE_ERROR_MESSAGES, 'extendBundle');
-    }
+    const res = await (0, needle_1.makeRequest)({
+        headers: {
+            ...prepareTokenHeaders(options.sessionToken),
+            source: options.source,
+        },
+        url: `${options.baseURL}/bundle/${options.bundleHash}`,
+        method: 'put',
+        body: (0, lodash_pick_1.default)(options, ['files', 'removedFiles']),
+    });
+    if (res.success)
+        return { type: 'success', value: res.body };
+    return generateError(res.errorCode, EXTEND_BUNDLE_ERROR_MESSAGES, 'extendBundle');
 }
 exports.extendBundle = extendBundle;
 // eslint-disable-next-line no-shadow
@@ -7924,15 +7874,10 @@ async function getAnalysis(options) {
             ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized', 'legacy']),
         },
     };
-    try {
-        const { response, success } = await (0, needle_1.makeRequest)(config);
-        if (success)
-            return { type: 'success', value: response.body };
-        return generateError({ response }, GET_ANALYSIS_ERROR_MESSAGES, 'getAnalysis');
-    }
-    catch (error) {
-        return generateError(error, GET_ANALYSIS_ERROR_MESSAGES, 'getAnalysis');
-    }
+    const res = await (0, needle_1.makeRequest)(config);
+    if (res.success)
+        return { type: 'success', value: res.body };
+    return generateError(res.errorCode, GET_ANALYSIS_ERROR_MESSAGES, 'getAnalysis');
 }
 exports.getAnalysis = getAnalysis;
 //# sourceMappingURL=http.js.map
@@ -8005,24 +7950,6 @@ var AnalysisSeverity;
 
 /***/ }),
 
-/***/ 24054:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.fromEntries = void 0;
-function fromEntries(entries) {
-    return [...entries].reduce((obj, [key, val]) => {
-        obj[key] = val; // eslint-disable-line no-param-reassign
-        return obj;
-    }, {});
-}
-exports.fromEntries = fromEntries;
-//# sourceMappingURL=utils.js.map
-
-/***/ }),
-
 /***/ 14577:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
@@ -8052,6 +7979,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.makeRequest = void 0;
+/* eslint-disable camelcase */
 const http_1 = __importDefault(__webpack_require__(98605));
 const needle_1 = __importDefault(__webpack_require__(11642));
 const querystring = __importStar(__webpack_require__(71191));
@@ -8059,6 +7987,8 @@ const https_1 = __importDefault(__webpack_require__(57211));
 const url_1 = __webpack_require__(78835);
 const emitter_1 = __webpack_require__(37544);
 const constants_1 = __webpack_require__(65765);
+const sleep = (duration) => new Promise(resolve => setTimeout(resolve, duration));
+const TIMEOUT_DEFAULT = 10000;
 const agentOptions = {
     keepAlive: true,
     keepAliveMsecs: 1000,
@@ -8068,8 +7998,7 @@ const agentOptions = {
     socketActiveTTL: 1000 * 60 * 10,
     rejectUnauthorized: !global.ignoreUnknownCA,
 };
-async function makeRequest(payload) {
-    var _a, _b;
+async function makeRequest(payload, attempts = constants_1.MAX_RETRY_ATTEMPTS) {
     const data = JSON.stringify(payload.body);
     const parsedUrl = new url_1.URL(payload.url);
     const agent = parsedUrl.protocol === 'http:' ? new http_1.default.Agent(agentOptions) : new https_1.default.Agent(agentOptions);
@@ -8084,9 +8013,9 @@ async function makeRequest(payload) {
     }
     const options = {
         headers: payload.headers,
-        open_timeout: 0,
-        response_timeout: payload.timeout,
-        read_timeout: payload.timeout,
+        open_timeout: TIMEOUT_DEFAULT,
+        response_timeout: payload.timeout || TIMEOUT_DEFAULT,
+        read_timeout: payload.timeout || TIMEOUT_DEFAULT,
         family: payload.family,
         json: true,
         compressed: true,
@@ -8095,40 +8024,40 @@ async function makeRequest(payload) {
         agent,
     };
     emitter_1.emitter.apiRequestLog(`=> HTTP ${method === null || method === void 0 ? void 0 : method.toUpperCase()} ${url} ${data !== null && data !== void 0 ? data : ''}`.slice(0, 399));
-    let attempts = (_a = payload.attempts) !== null && _a !== void 0 ? _a : constants_1.MAX_RETRY_ATTEMPTS;
-    let retryDelay = (_b = payload.retryDelay) !== null && _b !== void 0 ? _b : constants_1.REQUEST_RETRY_DELAY;
-    let response, success;
     do {
+        let errorCode;
+        let response;
         try {
             response = await (0, needle_1.default)(method, url, data, options);
             emitter_1.emitter.apiRequestLog(`<= Response: ${response.statusCode} ${JSON.stringify(response.body)}`);
-            success = !!(response.statusCode && response.statusCode >= 200 && response.statusCode < 300);
+            const success = !!(response.statusCode && response.statusCode >= 200 && response.statusCode < 300);
             if (success)
-                return { success, response };
-            // Try to avoid breaking requests due to temporary network errors
-            if (attempts > 1 && response.statusCode && [
+                return { success, body: response.body };
+            errorCode = response.statusCode;
+        }
+        catch (err) {
+            errorCode = constants_1.NETWORK_ERRORS[err.code || err.errno];
+            emitter_1.emitter.apiRequestLog(`Requested url --> ${url} | error --> ${err}`);
+        }
+        errorCode = errorCode !== null && errorCode !== void 0 ? errorCode : constants_1.ErrorCodes.serviceUnavailable;
+        // Try to avoid breaking requests due to temporary network errors
+        if (attempts > 1 &&
+            [
                 constants_1.ErrorCodes.serviceUnavailable,
                 constants_1.ErrorCodes.badGateway,
                 constants_1.ErrorCodes.connectionRefused,
                 constants_1.ErrorCodes.timeout,
                 constants_1.ErrorCodes.dnsNotFound,
-            ].includes(response.statusCode)) {
-                attempts--;
-                await new Promise(resolve => setTimeout(resolve, retryDelay));
-            }
-            else {
-                attempts = 0;
-            }
+            ].includes(errorCode)) {
+            attempts--;
+            await sleep(constants_1.REQUEST_RETRY_DELAY);
         }
-        catch (err) {
-            emitter_1.emitter.apiRequestLog(`Request error --> ${err}`.slice(0, 399));
-            throw err;
+        else {
+            attempts = 0;
+            return { success: false, errorCode };
         }
     } while (attempts > 0);
-    if (response)
-        return { success, response };
-    // Following line should be unreachable
-    throw new Error('Unknown network error');
+    return { success: false, errorCode: constants_1.ErrorCodes.serviceUnavailable };
 }
 exports.makeRequest = makeRequest;
 //# sourceMappingURL=needle.js.map