socket 1.0.67 → 1.0.69

package/dist/cli.js

@@ -3761,7 +3761,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
       debug.debugFn('notice', `miss: CVEs expected, but not found, for ${name}`);
       continue infoEntriesLoop;
     }
-    logger.logger.log(`Processing vulns for ${name}`);
+    logger.logger.log(`Processing '${name}'`);
     logger.logger.indent();
     spinner?.indent();
     if (registry.getManifestData(partialPurlObj.type, name)) {
@@ -3777,6 +3777,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     }
     const availableVersions = Object.keys(packument.versions);
     const prs = getPrsForPurl(fixEnv, infoEntry[0]);
+    const vulnVersions = new Set();
     const warningsForAfter = new Set();
 
     // eslint-disable-next-line no-unused-labels
@@ -3851,6 +3852,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           });
           const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
           if (!(newVersion && newVersionPackument)) {
+            vulnVersions.add(oldVersion);
             warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
             continue infosLoop;
           }
@@ -3918,6 +3920,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             hasAnnouncedWorkspace = true;
             workspaceLogCallCount = logger.logger.logCallCount;
           }
+          vulnVersions.add(oldVersion);
           const newId = `${name}@${utils.applyRange(refRange, newVersion, rangeStyle)}`;
           spinner?.start();
           spinner?.info(`Installing ${newId} in ${workspace}.`);
@@ -4097,6 +4100,9 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     for (const warningText of warningsForAfter) {
       logger.logger.warn(warningText);
     }
+    if (!warningsForAfter.size && !vulnVersions.size) {
+      logger.logger.info('No vulnerable versions found.');
+    }
     if (!isLastInfoEntry) {
       logger.logger.logNewline();
     }
@@ -4747,17 +4753,33 @@ async function run$H(argv, importMeta, {
   const orgSlugCResult = await utils.getDefaultOrgSlug();
   if (!orgSlugCResult.ok) {
     process.exitCode = orgSlugCResult.code ?? 1;
-    // Always assume json mode.
-    // logger.log(serializeResultJson(orgSlugCResult))
+    logger.logger.fail('Unable to resolve a Socket account organization.\nEnsure a Socket API token is specified for the organization using the SOCKET_CLI_API_TOKEN environment variable.');
     return;
   }
   const orgSlug = orgSlugCResult.data;
+  const rawPurls = utils.cmdFlagValueToArray(cli.flags['purl']);
+  const purls = [];
+  for (const purl of rawPurls) {
+    let version;
+    try {
+      version = vendor.packageurlJsExports$1.PackageURL.fromString(purl)?.version;
+    } catch {}
+    if (version) {
+      purls.push(purl);
+    } else {
+      logger.logger.warn(`--purl ${purl} is missing a version and will be ignored.`);
+    }
+  }
+  if (rawPurls.length !== purls.length && !purls.length) {
+    process.exitCode = 1;
+    logger.logger.fail('No valid --purl values provided.');
+    return;
+  }
   const ghsas = utils.cmdFlagValueToArray(cli.flags['ghsa']);
   const limit = (cli.flags['limit'] ? parseInt(String(cli.flags['limit'] || ''), 10) : Infinity) || Infinity;
   const maxSatisfying = Boolean(cli.flags['maxSatisfying']);
   const minSatisfying = Boolean(cli.flags['minSatisfying']) || !maxSatisfying;
   const prCheck = Boolean(cli.flags['prCheck']);
-  const purls = utils.cmdFlagValueToArray(cli.flags['purl']);
   const testScript = String(cli.flags['testScript'] || 'test');
   await handleFix({
     autoMerge,
@@ -14523,5 +14545,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=8e302883-9371-47ef-9c9a-742aa1ae2a85
+//# debugId=515ed3c2-cd4e-41ad-a7f6-57b0b6683173
 //# sourceMappingURL=cli.js.map