snyk 1.771.0 → 1.772.0

package/dist/cli/64.index.js

@@ -15208,7 +15208,8 @@ exports.getImageSize = void 0;
 const get_manifest_1 = __webpack_require__(32603);
 async function getImageSize(registryBase, repo, tag, username, password, options = {}) {
     const manifest = await get_manifest_1.getManifest(registryBase, repo, tag, username, password, options);
-    return manifest.layers.reduce((size, layerConfig) => size + layerConfig.size, 0);
+    const layers = manifest.layers || [];
+    return layers.reduce((size, layerConfig) => size + layerConfig.size, 0);
 }
 exports.getImageSize = getImageSize;
 //# sourceMappingURL=get-image-size.js.map
@@ -15266,10 +15267,7 @@ const needle_1 = __webpack_require__(48360);
  */
 async function getManifest(registryBase, repo, tag, username, password, options = {}, platform) {
     var _a;
-    let accept = `${(_a = options.acceptManifest) !== null && _a !== void 0 ? _a : contentTypes.MANIFEST_V2}`;
-    if (shouldAcceptManifestList(tag, platform)) {
-        accept += `, ${contentTypes.MANIFEST_LIST_V2}`;
-    }
+    const accept = (_a = options.acceptManifest) !== null && _a !== void 0 ? _a : `${contentTypes.MANIFEST_V2}, ${contentTypes.MANIFEST_LIST_V2}`;
     const endpoint = `/${repo}/manifests/${tag}`;
     const manifestResponse = await registry_call_1.registryV2Call(registryBase, endpoint, accept, username, password, options);
     const contentType = manifestResponse.headers["content-type"];
@@ -15298,14 +15296,6 @@ function getManifestByOsAndArch(platformManifest, os, architecture) {
     return platformManifest.find(manifest => manifest.platform.os === os &&
         manifest.platform.architecture === architecture);
 }
-// Accept manifest list content type in case that:
-// - Manifest digest was requested - if it's a manifest list digest, a list is returned and some CRs are strict
-//   about the returned content type being different from the requested one (gcr)
-// - Specific platform was requested, therefore we need to get the list in order to find the specific platform
-//   (by default the CR will return linux/amd64)
-function shouldAcceptManifestList(tag, platform) {
-    return tag.includes(":") || !!platform;
-}
 //# sourceMappingURL=get-manifest.js.map
 
 /***/ }),
@@ -15352,7 +15342,7 @@ exports.getTags = getTags;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.types = exports.getTags = exports.getRepos = exports.getManifest = exports.getLayer = exports.getImageSize = exports.getImageConfig = exports.getAuthTokenForEndpoint = exports.checkSupport = void 0;
+exports.types = exports.registryCall = exports.getTags = exports.getRepos = exports.getManifest = exports.getLayer = exports.getImageSize = exports.getImageConfig = exports.getAuthTokenForEndpoint = exports.checkSupport = void 0;
 const check_support_1 = __webpack_require__(87315);
 Object.defineProperty(exports, "checkSupport", ({ enumerable: true, get: function () { return check_support_1.checkSupport; } }));
 const get_auth_token_for_endpoint_1 = __webpack_require__(80290);
@@ -15369,6 +15359,8 @@ const get_repos_1 = __webpack_require__(73905);
 Object.defineProperty(exports, "getRepos", ({ enumerable: true, get: function () { return get_repos_1.getRepos; } }));
 const get_tags_1 = __webpack_require__(80353);
 Object.defineProperty(exports, "getTags", ({ enumerable: true, get: function () { return get_tags_1.getTags; } }));
+const registry_call_1 = __webpack_require__(15271);
+Object.defineProperty(exports, "registryCall", ({ enumerable: true, get: function () { return registry_call_1.registryCall; } }));
 const types = __webpack_require__(47235);
 exports.types = types;
 //# sourceMappingURL=index.js.map
@@ -15478,7 +15470,7 @@ class NeedleWrapperException extends Error {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.buildUnauthenticatedV2RequestConfig = exports.parseChallengeHeaders = exports.getToken = exports.paginatedV2Call = exports.registryV2Call = void 0;
+exports.buildUnauthenticatedV2RequestConfig = exports.parseChallengeHeaders = exports.getToken = exports.paginatedV2Call = exports.registryCall = exports.registryV2Call = void 0;
 const parseLink = __webpack_require__(28490);
 const url = __webpack_require__(78835);
 const needle_1 = __webpack_require__(48360);
@@ -15515,6 +15507,47 @@ async function registryV2Call(registryBase, endpoint, accept, username, password
     }
 }
 exports.registryV2Call = registryV2Call;
+/**
+ * WARNING!!!
+ *
+ * This function was created for a very specific usecase (https://snyksec.atlassian.net/browse/MAGMA-1262)
+ * It uses the existing mechanism of obtaining a token for authenticating, but can be used to hit any API endpoint,
+ * and not necessarily a Docker V2 endpoint.
+ * This is clearly an abuse of a library that's named after the v2 API, and this function should be considered a tech debt.
+ * Once it's no longer necessary, it is advised that this function is removed.
+ *
+ */
+async function registryCall(uri, username, password, reqOptions = {}) {
+    const reqConfig = applyRequestOptions({ uri: `https://${uri}` }, reqOptions);
+    try {
+        return await needle_1.needleWrapper(reqConfig, MAX_RETRIES);
+    }
+    catch (err) {
+        if (err.statusCode === 401) {
+            if (!username || !password) {
+                // Supply and empty username and password if no credentials
+                // are provided. These might be added later by a broker client.
+                username = username ? username : "";
+                password = password ? password : "";
+            }
+            const authConfig = await setAuthConfig("", err, reqConfig, username, password, reqOptions);
+            try {
+                return await needle_1.needleWrapper(authConfig, MAX_RETRIES);
+            }
+            catch (err) {
+                if (err.statusCode === 307 || err.statusCode === 302) {
+                    return await handleRedirect(err, reqConfig);
+                }
+                throw err;
+            }
+        }
+        if (err.statusCode === 307 || err.statusCode === 302) {
+            return await handleRedirect(err, reqConfig);
+        }
+        throw err;
+    }
+}
+exports.registryCall = registryCall;
 async function paginatedV2Call(registryBase, accept, username, password, endpoint, key, pageSize = 1000, maxPages = Number.MAX_SAFE_INTEGER, reqOptions = {}) {
     const result = [];
     let pageEndpoint = `${endpoint}?n=${pageSize}`;
@@ -15552,12 +15585,22 @@ async function getToken(registryBase, authBase, service, scope, username, passwo
     return body.token || body.access_token;
 }
 exports.getToken = getToken;
-function parseChallengeHeaders(challangeHeaders) {
-    const headersMap = challangeHeaders.split(",").reduce((map, entry) => {
+function parseChallengeHeaders(challengeHeaders) {
+    const headersMap = {};
+    const headerSplit = challengeHeaders.split(",");
+    for (let i = 0; i < headerSplit.length; i++) {
+        const entry = headerSplit[i];
+        if (!entry.includes("=") && i > 0) {
+            // we'll get here in case a value includes a comma. we want to concat what's after the comma to the previous value
+            headerSplit[i - 1] += `,${entry}`;
+            headerSplit.splice(i, 1);
+            i--;
+        }
+    }
+    headerSplit.forEach(entry => {
         const [key, value] = entry.split("=");
-        map[key] = JSON.parse(value);
-        return map;
-    }, {});
+        headersMap[key] = JSON.parse(value);
+    });
     return [headersMap[BEARER_REALM], headersMap.service, headersMap.scope];
 }
 exports.parseChallengeHeaders = parseChallengeHeaders;