update socket scan reach to include the same flags as socket scan create --reach and to use the same --manifests-tar-hash based approach for computing SBOMs

Author: mtorp

src/commands/scan/cmd-scan-create.mts

@@ -4,6 +4,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleCreateNewScan } from './handle-create-new-scan.mts'
 import { outputCreateNewScan } from './output-create-new-scan.mts'
+import { reachabilityFlags } from './reachability-flags.mts'
 import { suggestOrgSlug } from './suggest-org-slug.mts'
 import { suggestTarget } from './suggest_target.mts'
 import constants from '../../constants.mts'
@@ -31,42 +32,6 @@ const {
   SOCKET_DEFAULT_REPOSITORY,
 } = constants
 
-const reachabilityFlags: MeowFlags = {
-  reachDisableAnalytics: {
-    type: 'boolean',
-    description:
-      'Disable reachability analytics sharing with Socket. Also disables caching-based optimizations.',
-  },
-  reachAnalysisMemoryLimit: {
-    type: 'number',
-    description:
-      'The maximum memory in MB to use for the reachability analysis. The default is 8192MB.',
-    default: 8192,
-  },
-  reachAnalysisTimeout: {
-    type: 'number',
-    description:
-      'Set timeout for the reachability analysis. Split analysis runs may cause the total scan time to exceed this timeout significantly.',
-  },
-  reachEcosystems: {
-    type: 'string',
-    isMultiple: true,
-    description:
-      'List of ecosystems to conduct reachability analysis on, as either a comma separated value or as multiple flags. Defaults to all ecosystems.',
-  },
-  reachContinueOnFailingProjects: {
-    type: 'boolean',
-    description:
-      'Continue reachability analysis even when some projects/workspaces fail. Default is to crash the CLI at the first failing project/workspace.',
-  },
-  reachExcludePaths: {
-    type: 'string',
-    isMultiple: true,
-    description:
-      'List of paths to exclude from reachability analysis, as either a comma separated value or as multiple flags.',
-  },
-}
-
 const config: CliCommandConfig = {
   commandName: 'create',
   description: 'Create a new Socket scan and report',

src/commands/scan/cmd-scan-reach.mts

@@ -3,12 +3,21 @@ import path from 'node:path'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleScanReach } from './handle-scan-reach.mts'
+import { reachabilityFlags } from './reachability-flags.mts'
+import { suggestTarget } from './suggest_target.mts'
 import constants from '../../constants.mts'
-import { commonFlags, outputFlags } from '../../flags.mts'
+import { type MeowFlags, commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
+import { cmdFlagValueToArray } from '../../utils/cmd.mts'
+import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
+import {
+  type EcosystemString,
+  getEcosystemChoicesForMeow,
+} from '../../utils/ecosystem.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
+import { hasDefaultToken } from '../../utils/sdk.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
@@ -21,18 +30,43 @@ const config: CliCommandConfig = {
   flags: {
     ...commonFlags,
     ...outputFlags,
+    cwd: {
+      type: 'string',
+      description: 'working directory, defaults to process.cwd()',
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config',
+    },
+    ...reachabilityFlags,
   },
-  help: (command, config) => `
+  help: (command, config) => {
+    const allFlags = config.flags || {}
+    const generalFlags: MeowFlags = {}
+
+    // Separate general flags from reachability flags
+    for (const [key, value] of Object.entries(allFlags)) {
+      if (!reachabilityFlags[key]) {
+        generalFlags[key] = value
+      }
+    }
+
+    return `
     Usage
       $ ${command} [options] [CWD=.]
 
     Options
-      ${getFlagListOutput(config.flags)}
+      ${getFlagListOutput(generalFlags)}
+
+    Reachability Options
+      ${getFlagListOutput(reachabilityFlags)}
 
     Examples
       $ ${command}
       $ ${command} ./proj
-  `,
+  `
+  },
 }
 
 export const cmdScanReach = {
@@ -53,30 +87,108 @@ async function run(
     parentName,
   })
 
-  const { dryRun, json, markdown } = cli.flags
+  const {
+    cwd: cwdOverride,
+    dryRun = false,
+    interactive = true,
+    json,
+    markdown,
+    org: orgFlag,
+    reachAnalysisMemoryLimit,
+    reachAnalysisTimeout,
+    reachContinueOnFailingProjects,
+    reachDisableAnalytics,
+  } = cli.flags as {
+    cwd: string
+    dryRun: boolean
+    interactive: boolean
+    json: boolean
+    markdown: boolean
+    org: string
+    reachAnalysisTimeout?: number
+    reachAnalysisMemoryLimit?: number
+    reachContinueOnFailingProjects: boolean
+    reachDisableAnalytics: boolean
+  }
+
+  // Process comma-separated values for isMultiple flags
+  const reachEcosystemsRaw = cmdFlagValueToArray(cli.flags['reachEcosystems'])
+  const reachExcludePaths = cmdFlagValueToArray(cli.flags['reachExcludePaths'])
+
+  // Validate ecosystem values
+  const validEcosystems = getEcosystemChoicesForMeow()
+  const reachEcosystems: EcosystemString[] = []
+  for (const ecosystem of reachEcosystemsRaw) {
+    if (!validEcosystems.includes(ecosystem)) {
+      throw new Error(
+        `Invalid ecosystem: "${ecosystem}". Valid values are: ${validEcosystems.join(', ')}`,
+      )
+    }
+    reachEcosystems.push(ecosystem as EcosystemString)
+  }
 
   const outputKind = getOutputKind(json, markdown)
 
-  const wasValidInput = checkCommandInput(outputKind)
-  if (!wasValidInput) {
-    return
-  }
+  const cwd =
+    cwdOverride && cwdOverride !== 'process.cwd()'
+      ? path.resolve(process.cwd(), String(cwdOverride))
+      : process.cwd()
 
+  // Accept zero or more paths. Default to cwd() if none given.
+  let targets = cli.input || [cwd]
+
+  // Check if we're in dry-run mode first
   if (dryRun) {
     logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 
-  const { unknownFlags } = cli
+  // Use suggestTarget if no targets specified and in interactive mode
+  if (!targets.length && !dryRun && interactive) {
+    targets = await suggestTarget()
+  }
+
+  // Determine org slug
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    interactive,
+    dryRun,
+  )
+
+  const hasApiToken = hasDefaultToken()
 
-  let [cwd = '.'] = cli.input
-  // Note: path.resolve vs .join:
-  // If given path is absolute then cwd should not affect it.
-  cwd = path.resolve(process.cwd(), cwd)
+  const wasValidInput = checkCommandInput(
+    outputKind,
+    {
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
+      fail: 'missing',
+    },
+    {
+      nook: true,
+      test: hasApiToken,
+      message: 'This command requires an API token for access',
+      fail: 'missing (try `socket login`)',
+    },
+  )
+  if (!wasValidInput) {
+    return
+  }
 
   await handleScanReach({
     cwd,
+    orgSlug,
     outputKind,
-    unknownFlags,
+    targets,
+    interactive,
+    reachabilityOptions: {
+      reachContinueOnFailingProjects: Boolean(reachContinueOnFailingProjects),
+      reachDisableAnalytics: Boolean(reachDisableAnalytics),
+      reachAnalysisTimeout: Number(reachAnalysisTimeout),
+      reachAnalysisMemoryLimit: Number(reachAnalysisMemoryLimit),
+      reachEcosystems,
+      reachExcludePaths,
+    },
   })
 }