@socketsecurity/cli-with-sentry 1.10.0 → 1.11.0

package/dist/utils.js

@@ -6305,6 +6305,9 @@ async function setGitRemoteGithubRepoUrl(owner, repo, token, cwd = process.cwd()
   return false;
 }
 
+const CVE_FORMAT_REGEXP = /^CVE-\d{4}-\d{4,}$/;
+const GHSA_FORMAT_REGEXP = /^GHSA-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}$/;
+
 /**
  * Converts CVE IDs to GHSA IDs using GitHub API.
  * CVE to GHSA mappings are permanent, so we cache for 30 days.
@@ -6404,6 +6407,68 @@ async function convertPurlToGhsas(purl) {
   }
 }
 
+/**
+ * Converts mixed CVE/GHSA/PURL IDs to GHSA IDs, collecting one error for each
+ * ID that is malformed or cannot be converted.
+ */
+async function resolveAdvisoryIds(ids, options) {
+  const {
+    silence = false
+  } = {
+    __proto__: null,
+    ...options
+  };
+  const ghsas = [];
+  const errors = [];
+  for (const id of ids) {
+    const trimmedId = id.trim();
+    if (trimmedId.startsWith('GHSA-')) {
+      // Already a GHSA ID, validate format
+      if (GHSA_FORMAT_REGEXP.test(trimmedId)) {
+        ghsas.push(trimmedId);
+      } else {
+        errors.push(`Invalid GHSA format: ${trimmedId}`);
+      }
+    } else if (trimmedId.startsWith('CVE-')) {
+      // Convert CVE to GHSA
+      if (!CVE_FORMAT_REGEXP.test(trimmedId)) {
+        errors.push(`Invalid CVE format: ${trimmedId}`);
+        continue;
+      }
+
+      // eslint-disable-next-line no-await-in-loop
+      const conversionResult = await convertCveToGhsa(trimmedId);
+      if (conversionResult.ok) {
+        ghsas.push(conversionResult.data);
+        if (!silence) {
+          logger.logger.info(`Converted ${trimmedId} to ${conversionResult.data}`);
+        }
+      } else {
+        errors.push(`${trimmedId}: ${conversionResult.message}`);
+      }
+    } else if (trimmedId.startsWith('pkg:')) {
+      // Convert PURL to GHSAs.
+      // eslint-disable-next-line no-await-in-loop
+      const conversionResult = await convertPurlToGhsas(trimmedId);
+      if (conversionResult.ok && conversionResult.data.length) {
+        ghsas.push(...conversionResult.data);
+        if (!silence) {
+          logger.logger.info(`Converted ${trimmedId} to ${conversionResult.data.length} GHSA(s): ${arrays.joinAnd(conversionResult.data)}`);
+        }
+      } else {
+        errors.push(`${trimmedId}: ${conversionResult.message || 'No GHSAs found'}`);
+      }
+    } else {
+      // Neither CVE, GHSA, nor PURL, skip
+      errors.push(`Unsupported ID format (expected CVE, GHSA, or PURL): ${trimmedId}`);
+    }
+  }
+  return {
+    errors,
+    ghsas
+  };
+}
+
 /**
  * Command-line utilities for Socket CLI.
  * Handles argument parsing, flag processing, and command formatting.
@@ -8999,6 +9064,8 @@ function safeNpmSpecToPurl(pkgSpec) {
 exports.ALL_PACKAGE_MANAGERS = ALL_PACKAGE_MANAGERS;
 exports.AuthError = AuthError;
 exports.COMPLETION_CMD_PREFIX = COMPLETION_CMD_PREFIX;
+exports.CVE_FORMAT_REGEXP = CVE_FORMAT_REGEXP;
+exports.GHSA_FORMAT_REGEXP = GHSA_FORMAT_REGEXP;
 exports.IGNORED_DIRS = IGNORED_DIRS;
 exports.InputError = InputError;
 exports.RangeStyles = RangeStyles;
@@ -9012,8 +9079,6 @@ exports.cmdFlagValueToArray = cmdFlagValueToArray;
 exports.cmdFlagsToString = cmdFlagsToString;
 exports.cmdPrefixMessage = cmdPrefixMessage;
 exports.compressSocketFactsForUpload = compressSocketFactsForUpload;
-exports.convertCveToGhsa = convertCveToGhsa;
-exports.convertPurlToGhsas = convertPurlToGhsas;
 exports.createEnum = createEnum;
 exports.debugApiRequest = debugApiRequest;
 exports.debugApiResponse = debugApiResponse;
@@ -9122,6 +9187,7 @@ exports.readPnpmLockfile = readPnpmLockfile;
 exports.readSocketJsonCascade = readSocketJsonCascade;
 exports.readSocketJsonSync = readSocketJsonSync;
 exports.realpathOrResolved = realpathOrResolved;
+exports.resolveAdvisoryIds = resolveAdvisoryIds;
 exports.runAgentInstall = runAgentInstall;
 exports.runSelfUpdateCheck = runSelfUpdateCheck;
 exports.safeNpa = safeNpa$1;
@@ -9152,5 +9218,5 @@ exports.walkNestedMap = walkNestedMap;
 exports.webLink = webLink;
 exports.withTmpDir = withTmpDir;
 exports.writeSocketJson = writeSocketJson;
-//# debugId=fb1b348d-02eb-480b-b9d8-21c9c0862c85
+//# debugId=d923588e-ce3f-4f3d-be3d-d07c37af3876
 //# sourceMappingURL=utils.js.map