snyk 1.766.0 → 1.767.0

package/dist/cli/917.index.js

@@ -672,7 +672,7 @@ exports.computeCustomRulesBundleChecksum = computeCustomRulesBundleChecksum;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.FailedToExecuteCustomRulesError = exports.FailedToPullCustomBundleError = exports.pullIaCCustomRules = exports.isValidURL = exports.removeFileContent = exports.test = void 0;
+exports.FailedToExecuteCustomRulesError = exports.FailedToPullCustomBundleError = exports.pullIaCCustomRules = exports.removeFileContent = exports.test = void 0;
 const detect_1 = __webpack_require__(45318);
 const types_1 = __webpack_require__(42258);
 const analytics_1 = __webpack_require__(22716);
@@ -688,6 +688,7 @@ const errors_1 = __webpack_require__(55191);
 const error_utils_1 = __webpack_require__(23872);
 const oci_pull_1 = __webpack_require__(5029);
 const unsupported_entitlement_error_1 = __webpack_require__(78673);
+const url_utils_1 = __webpack_require__(80256);
 // this method executes the local processing engine and then formats the results to adapt with the CLI output.
 // this flow is the default GA flow for IAC scanning.
 async function test(pathToScan, options) {
@@ -759,17 +760,6 @@ function removeFileContent({ filePath, fileType, failureReason, projectType, })
     };
 }
 exports.removeFileContent = removeFileContent;
-function isValidURL(str) {
-    let url;
-    try {
-        url = new URL(str);
-    }
-    catch (e) {
-        return false;
-    }
-    return url.protocol === 'http:' || url.protocol === 'https:';
-}
-exports.isValidURL = isValidURL;
 /**
  * Checks if the OCI registry URL has been provided.
  */
@@ -790,9 +780,6 @@ function checkOCIRegistryURLExistsInSettings(iacOrgSettings) {
  */
 function getOCIRegistryURLComponentsFromSettings(iacOrgSettings) {
     const settingsOCIRegistryURL = iacOrgSettings.customRules.ociRegistryURL;
-    if (!isValidURL(settingsOCIRegistryURL)) {
-        throw new oci_pull_1.InvalidRemoteRegistryURLError();
-    }
     return {
         ...oci_pull_1.extractOCIRegistryURLComponents(settingsOCIRegistryURL),
         tag: iacOrgSettings.customRules.ociRegistryTag || 'latest',
@@ -803,7 +790,7 @@ function getOCIRegistryURLComponentsFromSettings(iacOrgSettings) {
  */
 function getOCIRegistryURLComponentsFromEnv() {
     const envOCIRegistryURL = user_config_1.config.get('oci-registry-url');
-    if (!isValidURL(envOCIRegistryURL)) {
+    if (!url_utils_1.isValidUrl(envOCIRegistryURL)) {
         throw new oci_pull_1.InvalidRemoteRegistryURLError();
     }
     return oci_pull_1.extractOCIRegistryURLComponents(envOCIRegistryURL);
@@ -1216,15 +1203,28 @@ const debug = Debug('iac-oci-pull');
 exports.CUSTOM_RULES_TARBALL = 'custom-bundle.tar.gz';
 function extractOCIRegistryURLComponents(OCIRegistryURL) {
     try {
-        const url = new URL(OCIRegistryURL);
-        const registryBase = url.hostname;
-        // with or without a path, there will at least be a / in the pathname
-        const repoWithTag = url.pathname.substring(1);
+        const urlWithoutProtocol = OCIRegistryURL.includes('://')
+            ? OCIRegistryURL.split('://')[1]
+            : OCIRegistryURL;
+        const firstSlashIdx = urlWithoutProtocol.indexOf('/');
+        if (firstSlashIdx === -1) {
+            throw new InvalidRemoteRegistryURLError(OCIRegistryURL);
+        }
+        const [registryHost, repoWithTag] = [
+            urlWithoutProtocol.substring(0, firstSlashIdx),
+            urlWithoutProtocol.substring(firstSlashIdx + 1),
+        ];
+        if (!registryHost || !repoWithTag) {
+            throw new InvalidRemoteRegistryURLError(OCIRegistryURL);
+        }
         const [repo, tag = 'latest'] = repoWithTag.split(':');
-        return { registryBase, repo, tag };
+        if (!repo) {
+            throw new InvalidRemoteRegistryURLError(OCIRegistryURL);
+        }
+        return { registryBase: registryHost, repo, tag };
     }
     catch (_a) {
-        throw new InvalidRemoteRegistryURLError();
+        throw new InvalidRemoteRegistryURLError(OCIRegistryURL);
     }
 }
 exports.extractOCIRegistryURLComponents = extractOCIRegistryURLComponents;
@@ -1278,12 +1278,11 @@ class InvalidManifestSchemaVersionError extends errors_1.CustomError {
 }
 exports.InvalidManifestSchemaVersionError = InvalidManifestSchemaVersionError;
 class InvalidRemoteRegistryURLError extends errors_1.CustomError {
-    constructor(message) {
-        super(message || 'Invalid URL for Remote Registry');
+    constructor(url) {
+        super('Invalid URL for Remote Registry');
         this.code = types_1.IaCErrorCodes.InvalidRemoteRegistryURLError;
         this.strCode = error_utils_1.getErrorStringCode(this.code);
-        this.userMessage =
-            'The Remote Registry URL is invalid, or does not include a http/https protocol. Please check it again.';
+        this.userMessage = `The provided remote registry URL${url ? `: "${url}"` : ''} is invalid. Please check it again.`;
     }
 }
 exports.InvalidRemoteRegistryURLError = InvalidRemoteRegistryURLError;
@@ -1821,6 +1820,25 @@ class FailedToFormatResults extends errors_1.CustomError {
 exports.FailedToFormatResults = FailedToFormatResults;
 
 
+/***/ }),
+
+/***/ 80256:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isValidUrl = void 0;
+const URL_REGEX = /^((?:https?:\/\/)?[^./]+(?:\.[^./]+)+(?:\/.*)?)$/;
+/**
+ * Checks if the provided URL string is valid.
+ */
+function isValidUrl(urlStr) {
+    return URL_REGEX.test(urlStr);
+}
+exports.isValidUrl = isValidUrl;
+
+
 /***/ }),
 
 /***/ 43156: