@marcusrbrown/infra 0.13.0 → 0.13.2

package/src/commands/cliproxy/login.test.ts

@@ -1,415 +0,0 @@
-import type {SpawnFn} from './login'
-
-import {afterEach, beforeEach, describe, expect, it} from 'bun:test'
-
-const envKeys = ['CLIPROXY_DOMAIN', 'HOME', 'PATH', 'SSH_AUTH_SOCK'] as const
-
-type ManagedEnvKey = (typeof envKeys)[number]
-
-let originalEnv: Partial<Record<ManagedEnvKey, string | undefined>>
-let originalIsTTY: boolean | undefined
-
-function restoreManagedEnv(): void {
-  for (const key of envKeys) {
-    const value = originalEnv[key]
-
-    if (value === undefined) {
-      delete process.env[key]
-      continue
-    }
-
-    process.env[key] = value
-  }
-}
-
-/** Minimal SpawnFn mock for inherit-stdio calls — records invocations and resolves with exitCode. */
-function makeSpawnOk(exitCode = 0): {spawnFn: SpawnFn; calls: {cmd: string[]; opts: unknown}[]} {
-  const calls: {cmd: string[]; opts: unknown}[] = []
-  const spawnFn: SpawnFn = (cmd, opts) => {
-    calls.push({cmd, opts})
-    return {exited: Promise.resolve(exitCode)}
-  }
-
-  return {spawnFn, calls}
-}
-
-// Helper: a SpawnFn that must never be called (proves provider check fires before spawn)
-const neverSpawn: SpawnFn = () => {
-  throw new Error('spawn must not be called for invalid provider')
-}
-
-// Helper: set up a valid TTY + env so spawn-path tests can reach the spawn call
-function setValidEnv(): void {
-  Object.defineProperty(process.stdin, 'isTTY', {value: true, configurable: true})
-  process.env.SSH_AUTH_SOCK = '/tmp/test-agent.sock'
-  process.env.PATH = process.env.PATH ?? '/usr/bin'
-  process.env.HOME = process.env.HOME ?? '/root'
-}
-
-describe('cliproxy login', () => {
-  beforeEach(() => {
-    originalEnv = Object.fromEntries(envKeys.map(key => [key, process.env[key]]))
-    originalIsTTY = process.stdin.isTTY
-  })
-
-  afterEach(() => {
-    restoreManagedEnv()
-    Object.defineProperty(process.stdin, 'isTTY', {value: originalIsTTY, configurable: true})
-  })
-
-  describe('validation', () => {
-    it('rejects unsupported providers', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk()
-
-      // Provider check happens before TTY check — no need to set isTTY
-      await expect(cliproxyLoginAction('openai', {}, spawnFn)).rejects.toThrow('Unsupported provider')
-      await expect(cliproxyLoginAction('openai', {}, spawnFn)).rejects.toThrow('Supported: claude, codex.')
-    })
-
-    it('requires interactive terminal (checked before SSH_AUTH_SOCK)', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk()
-
-      // Simulate non-TTY environment (as subprocess tests did)
-      Object.defineProperty(process.stdin, 'isTTY', {value: false, configurable: true})
-
-      await expect(cliproxyLoginAction('claude', {}, spawnFn)).rejects.toThrow('interactive terminal')
-    })
-  })
-
-  describe('host resolution', () => {
-    it('uses CLIPROXY_DOMAIN env var', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk()
-
-      Object.defineProperty(process.stdin, 'isTTY', {value: false, configurable: true})
-      process.env.CLIPROXY_DOMAIN = 'custom.host.example'
-
-      // TTY check fires before host resolution — error is about TTY
-      await expect(cliproxyLoginAction('claude', {}, spawnFn)).rejects.toThrow('interactive terminal')
-    })
-
-    it('uses --host flag', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk()
-
-      Object.defineProperty(process.stdin, 'isTTY', {value: false, configurable: true})
-
-      // TTY check fires before host resolution — error is about TTY
-      await expect(cliproxyLoginAction('claude', {host: 'custom.host.example'}, spawnFn)).rejects.toThrow(
-        'interactive terminal',
-      )
-    })
-  })
-
-  describe('unit: resolveHost', () => {
-    it('returns input when provided', async () => {
-      const {resolveHost} = await import('./login')
-      expect(resolveHost('test.example.com')).toBe('test.example.com')
-    })
-
-    it('falls back to CLIPROXY_DOMAIN', async () => {
-      process.env.CLIPROXY_DOMAIN = 'env.example.com'
-      const {resolveHost} = await import('./login')
-      expect(resolveHost()).toBe('env.example.com')
-    })
-
-    it('falls back to default host', async () => {
-      delete process.env.CLIPROXY_DOMAIN
-      const {resolveHost} = await import('./login')
-      expect(resolveHost()).toBe('cliproxy.fro.bot')
-    })
-  })
-
-  describe('unit: requireSshAuthSock', () => {
-    it('returns SSH_AUTH_SOCK when set', async () => {
-      process.env.SSH_AUTH_SOCK = '/tmp/test-agent.sock'
-      const {requireSshAuthSock} = await import('./login')
-      expect(requireSshAuthSock()).toBe('/tmp/test-agent.sock')
-    })
-
-    it('throws when SSH_AUTH_SOCK is not set', async () => {
-      delete process.env.SSH_AUTH_SOCK
-      const {requireSshAuthSock} = await import('./login')
-      expect(() => requireSshAuthSock()).toThrow('SSH_AUTH_SOCK is required')
-    })
-  })
-
-  describe('provider flags', () => {
-    it('happy path — codex: spawn args contain --codex-device-login and --no-browser', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-
-      await cliproxyLoginAction('codex', {}, spawnFn)
-
-      const cmd = calls[0]!.cmd
-      expect(cmd.join(' ')).toContain('--codex-device-login')
-      expect(cmd.join(' ')).toContain('--no-browser')
-      expect(cmd.join(' ')).not.toContain('--codex-login ')
-    })
-
-    it('happy path — claude regression: spawn args contain --claude-login and --no-browser', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-
-      await cliproxyLoginAction('claude', {}, spawnFn)
-
-      const cmd = calls[0]!.cmd
-      expect(cmd.join(' ')).toContain('--claude-login')
-      expect(cmd.join(' ')).toContain('--no-browser')
-    })
-
-    it('error path — unknown provider "chatgpt": rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('chatgpt', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "chatgpt". Supported: claude, codex.',
-      )
-    })
-
-    it('error path — empty provider: rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "". Supported: claude, codex.',
-      )
-    })
-
-    it('error path — malformed provider path traversal: rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('../../../etc/passwd', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "../../../etc/passwd". Supported: claude, codex.',
-      )
-    })
-
-    it('error path — prototype-chain bypass "__proto__": rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('__proto__', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "__proto__". Supported: claude, codex.',
-      )
-    })
-
-    it('error path — prototype-chain bypass "constructor": rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('constructor', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "constructor". Supported: claude, codex.',
-      )
-    })
-
-    it('error path — prototype-chain bypass "hasOwnProperty": rejects with correct message, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-
-      await expect(cliproxyLoginAction('hasOwnProperty', {}, neverSpawn)).rejects.toThrow(
-        'Unsupported provider "hasOwnProperty". Supported: claude, codex.',
-      )
-    })
-  })
-
-  describe('host validation', () => {
-    it('rejects --host with a leading dash (ProxyCommand injection vector), no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      setValidEnv()
-
-      await expect(cliproxyLoginAction('codex', {host: '-oProxyCommand=evil'}, neverSpawn)).rejects.toThrow(
-        'Invalid CLIPROXY_DOMAIN',
-      )
-    })
-
-    it('rejects CLIPROXY_DOMAIN env with a leading dash, no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      setValidEnv()
-      process.env.CLIPROXY_DOMAIN = '-oProxyCommand=evil'
-
-      await expect(cliproxyLoginAction('codex', {}, neverSpawn)).rejects.toThrow('Invalid CLIPROXY_DOMAIN')
-    })
-
-    it('rejects --host with shell metacharacters (semicolon), no spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      setValidEnv()
-
-      await expect(cliproxyLoginAction('codex', {host: 'gateway.example.com;rm -rf'}, neverSpawn)).rejects.toThrow(
-        'Invalid CLIPROXY_DOMAIN',
-      )
-    })
-  })
-
-  describe('host forwarding into ssh argv', () => {
-    it('forwards resolved host from CLIPROXY_DOMAIN env var into ssh argv', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-      process.env.CLIPROXY_DOMAIN = 'env-host.example.com'
-
-      await cliproxyLoginAction('claude', {}, spawnFn)
-
-      expect(calls).toHaveLength(1)
-      expect(calls[0]!.cmd).toContain('root@env-host.example.com')
-    })
-
-    it('forwards resolved host from --host option into ssh argv', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-      delete process.env.CLIPROXY_DOMAIN
-
-      await cliproxyLoginAction('claude', {host: 'flag-host.example.com'}, spawnFn)
-
-      expect(calls).toHaveLength(1)
-      expect(calls[0]!.cmd).toContain('root@flag-host.example.com')
-    })
-  })
-
-  describe('non-zero exit propagation', () => {
-    it('throws with exit code in message when remote ssh exits non-zero', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(17)
-      setValidEnv()
-
-      await expect(cliproxyLoginAction('claude', {}, spawnFn)).rejects.toThrow(
-        'Remote login command failed with exit code 17',
-      )
-      expect(calls).toHaveLength(1)
-    })
-
-    it('codex non-zero exit: error message includes exit code and v6.10.9 version requirement', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk(1)
-      setValidEnv()
-
-      const error = await cliproxyLoginAction('codex', {}, spawnFn).catch((error_: unknown) => error_)
-      expect(error).toBeInstanceOf(Error)
-      const message = (error as Error).message
-      expect(message).toMatch(/exit code 1/)
-      expect(message).toMatch(/v6\.10\.9/)
-      expect(message).toMatch(/cliproxy-provider-version-skew\.md/)
-    })
-
-    it('codex non-zero exit: error message does not bleed into claude non-zero exit', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk(2)
-      setValidEnv()
-
-      const error = await cliproxyLoginAction('claude', {}, spawnFn).catch((error_: unknown) => error_)
-      expect(error).toBeInstanceOf(Error)
-      const message = (error as Error).message
-      expect(message).toMatch(/Remote login command failed with exit code 2/)
-      expect(message).not.toMatch(/v6\.10\.9/)
-      expect(message).not.toMatch(/cliproxy-provider-version-skew/)
-    })
-  })
-
-  describe('ssh spawn contract', () => {
-    it('happy path — claude: spawn argv and options match ssh boundary contract', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-      process.env.SSH_AUTH_SOCK = '/tmp/contract-test.sock'
-      const capturedPath = process.env.PATH!
-      const capturedHome = process.env.HOME!
-
-      await cliproxyLoginAction('claude', {}, spawnFn)
-
-      expect(calls).toHaveLength(1)
-      const {cmd, opts} = calls[0]!
-      const spawnOpts = opts as Parameters<SpawnFn>[1]
-
-      // SSH flags
-      expect(cmd).toContain('-tt')
-      expect(cmd).toContain('BatchMode=yes')
-      expect(cmd).toContain('ConnectTimeout=10')
-
-      // stdio inheritance
-      expect(spawnOpts.stdin).toBe('inherit')
-      expect(spawnOpts.stdout).toBe('inherit')
-      expect(spawnOpts.stderr).toBe('inherit')
-
-      // forwarded env vars
-      expect(spawnOpts.env.PATH).toBe(capturedPath)
-      expect(spawnOpts.env.HOME).toBe(capturedHome)
-      expect(spawnOpts.env.SSH_AUTH_SOCK).toBe('/tmp/contract-test.sock')
-    })
-
-    it('happy path — codex: spawn argv and options match ssh boundary contract', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn, calls} = makeSpawnOk(0)
-      setValidEnv()
-      process.env.SSH_AUTH_SOCK = '/tmp/contract-test.sock'
-      const capturedPath = process.env.PATH!
-      const capturedHome = process.env.HOME!
-
-      await cliproxyLoginAction('codex', {}, spawnFn)
-
-      expect(calls).toHaveLength(1)
-      const {cmd, opts} = calls[0]!
-      const spawnOpts = opts as Parameters<SpawnFn>[1]
-
-      // SSH flags
-      expect(cmd).toContain('-tt')
-      expect(cmd).toContain('BatchMode=yes')
-      expect(cmd).toContain('ConnectTimeout=10')
-
-      // stdio inheritance
-      expect(spawnOpts.stdin).toBe('inherit')
-      expect(spawnOpts.stdout).toBe('inherit')
-      expect(spawnOpts.stderr).toBe('inherit')
-
-      // forwarded env vars
-      expect(spawnOpts.env.PATH).toBe(capturedPath)
-      expect(spawnOpts.env.HOME).toBe(capturedHome)
-      expect(spawnOpts.env.SSH_AUTH_SOCK).toBe('/tmp/contract-test.sock')
-    })
-  })
-
-  describe('anti-phishing notice', () => {
-    let logLines: string[]
-    let originalLog: typeof console.log
-
-    beforeEach(() => {
-      logLines = []
-      originalLog = console.log
-      console.log = (...args: unknown[]) => {
-        logLines.push(args.map(String).join(' '))
-      }
-    })
-
-    afterEach(() => {
-      console.log = originalLog
-    })
-
-    it('codex: anti-phishing notice appears before spawn', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const linesBeforeSpawn: string[] = []
-      let spawnCalled = false
-
-      const trackingSpawn: SpawnFn = (_cmd, _opts) => {
-        linesBeforeSpawn.push(...logLines)
-        spawnCalled = true
-        return {exited: Promise.resolve(0)}
-      }
-
-      setValidEnv()
-      await cliproxyLoginAction('codex', {}, trackingSpawn)
-
-      expect(spawnCalled).toBe(true)
-      const allOutput = linesBeforeSpawn.join('\n')
-      expect(allOutput).toMatch(/openai\.com/i)
-    })
-
-    it('claude: anti-phishing notice does NOT appear', async () => {
-      const {cliproxyLoginAction} = await import('./login')
-      const {spawnFn} = makeSpawnOk(0)
-      setValidEnv()
-
-      await cliproxyLoginAction('claude', {}, spawnFn)
-
-      const allOutput = logLines.join('\n')
-      expect(allOutput).not.toMatch(/openai\.com/)
-    })
-  })
-})

package/src/commands/cliproxy/login.ts

@@ -1,131 +0,0 @@
-import type {goke} from 'goke'
-
-import {z} from 'zod'
-
-import {validateCliproxyHost} from './host'
-
-const DEFAULT_HOST = 'cliproxy.fro.bot'
-const DEFAULT_REMOTE_USER = 'root'
-
-const PROVIDER_FLAGS = {
-  claude: '--claude-login',
-  codex: '--codex-device-login',
-} as const satisfies Record<string, string>
-
-const SUPPORTED_PROVIDERS_DISPLAY = Object.keys(PROVIDER_FLAGS).join(', ')
-
-export type SpawnFn = (
-  cmd: string[],
-  opts: {env: Record<string, string>; stdin: 'inherit'; stdout: 'inherit'; stderr: 'inherit'},
-) => {exited: Promise<number>}
-
-export interface LoginOptions {
-  host?: string
-}
-
-export function resolveHost(input?: string): string {
-  const host = input ?? process.env.CLIPROXY_DOMAIN ?? DEFAULT_HOST
-
-  if (!host) {
-    throw new Error('CLIPROXY_DOMAIN is required. Pass --host or set CLIPROXY_DOMAIN.')
-  }
-
-  return host
-}
-
-export function requireSshAuthSock(): string {
-  const sshAuthSock = process.env.SSH_AUTH_SOCK
-  if (!sshAuthSock) {
-    throw new Error('SSH_AUTH_SOCK is required. Start ssh-agent and load your SSH key before running cliproxy login.')
-  }
-
-  return sshAuthSock
-}
-
-export async function cliproxyLoginAction(
-  provider: string,
-  options: LoginOptions,
-  spawnFn: SpawnFn = Bun.spawn,
-): Promise<void> {
-  if (!Object.prototype.hasOwnProperty.call(PROVIDER_FLAGS, provider)) {
-    throw new Error(`Unsupported provider "${provider}". Supported: ${SUPPORTED_PROVIDERS_DISPLAY}.`)
-  }
-  const providerFlag = PROVIDER_FLAGS[provider as keyof typeof PROVIDER_FLAGS]
-
-  if (!process.stdin.isTTY) {
-    throw new Error('cliproxy login requires an interactive terminal. Run from a shell with TTY attached.')
-  }
-
-  const host = validateCliproxyHost(resolveHost(options.host))
-  const sshAuthSock = requireSshAuthSock()
-  const path = process.env.PATH
-  const home = process.env.HOME
-
-  if (!path) {
-    throw new Error('PATH is required to invoke ssh')
-  }
-
-  if (!home) {
-    throw new Error('HOME is required to invoke ssh')
-  }
-
-  if (provider === 'codex') {
-    console.log()
-    console.log('  Verify the URL')
-    console.log('  ─────────────')
-    console.log("  Codex login uses OpenAI's device-code flow. The droplet will print a code")
-    console.log('  and a URL. Before entering the code, verify the URL points to openai.com —')
-    console.log('  only complete the flow on the official OpenAI domain.')
-    console.log()
-  }
-
-  const remoteCommand = `cd /opt/cliproxy && docker compose exec cli-proxy-api /CLIProxyAPI/CLIProxyAPI --no-browser ${providerFlag}`
-
-  const child = spawnFn(
-    ['ssh', '-tt', '-o', 'BatchMode=yes', '-o', 'ConnectTimeout=10', `${DEFAULT_REMOTE_USER}@${host}`, remoteCommand],
-    {
-      env: {
-        PATH: path,
-        HOME: home,
-        SSH_AUTH_SOCK: sshAuthSock,
-      },
-      stdin: 'inherit',
-      stdout: 'inherit',
-      stderr: 'inherit',
-    },
-  )
-
-  const exitCode = await child.exited
-  if (exitCode !== 0) {
-    if (provider === 'codex') {
-      throw new Error(
-        `Remote login command failed with exit code ${exitCode}. ` +
-          `The most likely cause is that the droplet's CLIProxyAPI binary predates --codex-device-login support (requires v6.10.9+). ` +
-          `See docs/runbooks/cliproxy-provider-version-skew.md for diagnosis and remediation steps.`,
-      )
-    }
-
-    throw new Error(`Remote login command failed with exit code ${exitCode}`)
-  }
-
-  console.log('If an OAuth URL was printed above, open it in your browser to complete login.')
-}
-
-export function registerCliproxyLogin(cli: ReturnType<typeof goke>): void {
-  cli
-    .command(
-      'cliproxy login <provider>',
-      `Run provider login on the remote CLIProxyAPI host. Supported providers: ${SUPPORTED_PROVIDERS_DISPLAY}.`,
-    )
-    .option(
-      '--host [host]',
-      z
-        .string()
-        .describe('CLIProxyAPI droplet host for SSH execution. Falls back to CLIPROXY_DOMAIN or cliproxy.fro.bot.'),
-    )
-    .example('# Start Claude login flow on remote CLIProxyAPI instance')
-    .example('infra cliproxy login claude')
-    .example('# Start ChatGPT Pro login flow via device-code')
-    .example('infra cliproxy login codex')
-    .action((provider, options) => cliproxyLoginAction(provider, options))
-}