6d25adfd1a
* agent & model refactor with ASKPASS git auth, UI restructure, clerk v7 Made-with: Cursor * fix stale agent/effort refs, add tests for askpass + model resolution - reviewCleanup.ts: payload.agent -> payload.model, remove effort - selectMode.ts PlanEdit: remove delegation/subagent/effort references - pullfrog.yml.ts: update env vars (drop GOOGLE_API_KEY/CURSOR_API_KEY, add GOOGLE_GENERATIVE_AI_API_KEY/XAI_API_KEY/MOONSHOT_API_KEY/OPENCODE_API_KEY) - FlagsSettings/RepoInstructionsSection: remove stale effort/timeout copy - new: gitAuthServer.test.ts (10 tests — lifecycle, token delivery, tamper detection, script gen) - new: agent.test.ts (4 tests — default opentoad, AGENT_OVERRIDE, invalid override) - new: models.test.ts (19 tests — parseModel, resolution, registry invariants) - update models.dev snapshot Made-with: Cursor * fix changed-agents.sh to filter legacy agent files from CI matrix legacy agent files (claude.ts, codex.ts, etc.) are @ts-nocheck and not exported from index.ts. changed-agents.sh now reads index.ts imports to build the active agent set and treats changes to inactive files as non-agent changes (opentoad canary only). Made-with: Cursor * remove MCP file tools, old agent harnesses, and obsolete security tests ASKPASS-based git auth makes the old MCP file tool security layer unnecessary: - token never in subprocess env, so symlink/gitattributes/hook attacks can't exfiltrate it - agents now use native file tools (OpenCode builtin read/edit) deleted: - action/mcp/file.ts (file_read, file_write, file_edit, file_delete, list_directory) - action/mcp/index.ts (dead re-export) - agent harnesses: claude.ts, codex.ts, cursor.ts, gemini.ts, opencode.ts - opencode-runner.ts (inlined into opentoad.ts) - security tests that validated MCP file tool restrictions - commented-out three-step review flow (~300 lines) - sanitizeSchema/wrapSchema dead code from mcp/shared.ts - OPENCODE_MODEL_MINI/MAX env vars (effort-level model overrides removed) updated test prompts to use generic file ops instead of MCP tool names. restored pkg-json-scripts + requirements-txt-attack (test --ignore-scripts defense). Made-with: Cursor * bump actions/checkout v4 → v6 (node 24) node 20 actions deprecated june 2, 2026. Made-with: Cursor * temporarily disable fail-fast on agnostic tests to debug checkout@v6 Made-with: Cursor * re-enable fail-fast on agnostic tests Made-with: Cursor * fix test token mismatch: mint OIDC tokens scoped to target repo CI tests override GITHUB_REPOSITORY to pullfrog/test-repo but inherit the runner's GITHUB_TOKEN (scoped to pullfrog/app), causing 401s on every run-context fetch. Clear GITHUB_TOKEN in the test subprocess so ensureGitHubToken() mints a properly scoped token via OIDC. Also centralizes the default GITHUB_REPOSITORY in runAgentStreaming instead of repeating it in every test file, and fixes preview-cleanup to remove workers from all queues (not just name-matching ones). Made-with: Cursor * fix ensureGitHubToken to try OIDC when app credentials are absent ensureGitHubToken only attempted token minting when GITHUB_APP_ID and GITHUB_PRIVATE_KEY were set. In CI, OIDC is available but app creds aren't exposed — so the guard prevented minting entirely. Made-with: Cursor * dead code cleanup: remove remnants of deleted agents, file tools, effort system remove unused @anthropic-ai/claude-agent-sdk and @openai/codex-sdk deps, orphaned file-tool security tests, dead GEMINI_MODEL passthrough, stale opencode-runner wiki refs, deleted test file references, and MCP file tool docs. rename docs/effort → docs/models. fix vitest setup: move dotenv to globalSetup (runs once before forks instead of per-file, 19s → 200ms). Made-with: Cursor * address review feedback: remove dead code, update stale references - remove AGENT_OVERRIDE (only opentoad exists) - remove shellToolName plumbing (always restricted shell) - bump action version to 0.0.179 - remove CURSOR_API_KEY from all workflows/configs - remove OPENCODE_MODEL_MINI/MAX from workflows/docs - delete wiki/effort.md, rewrite docs/effort.mdx as "Models" - rewrite wiki/modes.md: orchestrator/subagent → single agent - simplify flag system: drop builtin flag extraction (debug, effort, timeout, agent), keep custom flag replacement only - reserve all legacy flag names to prevent custom flag conflicts Made-with: Cursor * regenerate lockfile after removing claude-agent-sdk and codex-sdk Made-with: Cursor * fix import ordering, add lockfile check to pre-push hook Made-with: Cursor * remove dead debug payload field, stale packageExtensions Made-with: Cursor * merge proc-sandbox and token-exfil into a single test proc-sandbox and token-exfil were duplicative — both tested that SANDBOX_TEST_TOKEN couldn't be exfiltrated. consolidated into token-exfil with shell:restricted (which actually exercises filterEnv) and the /proc attack vector hints from proc-sandbox. Made-with: Cursor * fix wiki adversarial.md to match actual tokenExfil validator Made-with: Cursor
281 lines
8.3 KiB
TypeScript
281 lines
8.3 KiB
TypeScript
/**
|
|
* shared docker utilities for running commands in containers.
|
|
* used by both play.ts (dev) and test/run.ts (CI).
|
|
*/
|
|
|
|
import { type SpawnSyncReturns, spawnSync } from "node:child_process";
|
|
import { existsSync } from "node:fs";
|
|
import { platform } from "node:os";
|
|
import { join } from "node:path";
|
|
|
|
export type DockerRunContext = {
|
|
actionDir: string;
|
|
args: string[];
|
|
platformName: NodeJS.Platform;
|
|
home: string | undefined;
|
|
env: NodeJS.ProcessEnv;
|
|
uid: number;
|
|
gid: number;
|
|
};
|
|
|
|
export type SshSetup = {
|
|
sshFlags: string[];
|
|
sshSetupCmd: string;
|
|
};
|
|
|
|
export type DockerRunArgsContext = {
|
|
ctx: DockerRunContext;
|
|
envFlags: string[];
|
|
nodeCmd: string;
|
|
sshSetup: SshSetup;
|
|
volumeName: string;
|
|
};
|
|
|
|
export type VolumeInitContext = {
|
|
actionDir: string;
|
|
volumeName: string;
|
|
uid: number;
|
|
gid: number;
|
|
};
|
|
|
|
export function buildDockerRunContext(ctx: {
|
|
actionDir: string;
|
|
args: string[];
|
|
}): DockerRunContext {
|
|
return {
|
|
actionDir: ctx.actionDir,
|
|
args: ctx.args,
|
|
platformName: platform(),
|
|
home: process.env.HOME,
|
|
env: process.env,
|
|
uid: process.getuid?.() ?? 1000,
|
|
gid: process.getgid?.() ?? 1000,
|
|
};
|
|
}
|
|
|
|
export function assertDockerSupported(ctx: DockerRunContext): void {
|
|
if (ctx.platformName === "win32") {
|
|
throw new Error("docker mode is not supported on native windows. use wsl2.");
|
|
}
|
|
}
|
|
|
|
function buildDarwinSshSetup(ctx: DockerRunContext): SshSetup {
|
|
const sshFlags: string[] = [];
|
|
const sshSetupCmd = "";
|
|
if (ctx.home) {
|
|
const knownHostsPath = join(ctx.home, ".ssh", "known_hosts");
|
|
if (existsSync(knownHostsPath)) {
|
|
sshFlags.push("-v", `${knownHostsPath}:/root/.ssh/known_hosts:ro`);
|
|
}
|
|
}
|
|
sshFlags.push(
|
|
"-v",
|
|
"/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock",
|
|
"-e",
|
|
"SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
|
|
);
|
|
return { sshFlags, sshSetupCmd };
|
|
}
|
|
|
|
function buildLinuxSshSetup(ctx: DockerRunContext): SshSetup {
|
|
const sshFlags: string[] = [];
|
|
let sshSetupCmd = "";
|
|
if (ctx.home) {
|
|
const sshDir = join(ctx.home, ".ssh");
|
|
if (existsSync(sshDir)) {
|
|
sshFlags.push("-v", `${sshDir}:/tmp/.ssh-host:ro`);
|
|
sshSetupCmd =
|
|
"mkdir -p /tmp/home/.ssh && cp /tmp/.ssh-host/id_* /tmp/home/.ssh/ 2>/dev/null; chmod 600 /tmp/home/.ssh/id_* 2>/dev/null; " +
|
|
"ssh-keyscan -t ed25519,rsa github.com >> /tmp/home/.ssh/known_hosts 2>/dev/null; chmod 644 /tmp/home/.ssh/known_hosts; " +
|
|
"export GIT_SSH_COMMAND='ssh -i /tmp/home/.ssh/id_rsa -o UserKnownHostsFile=/tmp/home/.ssh/known_hosts -o StrictHostKeyChecking=no'; ";
|
|
}
|
|
}
|
|
return { sshFlags, sshSetupCmd };
|
|
}
|
|
|
|
export function buildSshSetup(ctx: DockerRunContext): SshSetup {
|
|
if (ctx.platformName === "darwin") {
|
|
return buildDarwinSshSetup(ctx);
|
|
}
|
|
return buildLinuxSshSetup(ctx);
|
|
}
|
|
|
|
// allowlist of env vars to pass through to the container for `pnpm runtest`.
|
|
// NOTE: `pnpm play` uses "passthrough" mode and passes ALL env vars.
|
|
// if your env var isn't working with `pnpm runtest`, add it here!
|
|
// see wiki/adversarial.md for documentation.
|
|
const testEnvAllowList = new Set([
|
|
"CI",
|
|
"GITHUB_ACTIONS",
|
|
"PULLFROG_DISABLE_SECURITY_INSTRUCTIONS", // disables security messaging for pentest
|
|
"GITHUB_TOKEN",
|
|
"GH_TOKEN",
|
|
"GITHUB_REPOSITORY",
|
|
"GITHUB_APP_ID",
|
|
"GITHUB_PRIVATE_KEY",
|
|
"OPENAI_API_KEY",
|
|
"ANTHROPIC_API_KEY",
|
|
"GEMINI_API_KEY",
|
|
"GOOGLE_GENERATIVE_AI_API_KEY",
|
|
"OPENCODE_MODEL",
|
|
"LOG_LEVEL",
|
|
"DEBUG",
|
|
"NODE_ENV",
|
|
"PLAY_LOCAL",
|
|
"HOME",
|
|
"USER",
|
|
"SSH_AUTH_SOCK",
|
|
"ACTIONS_ID_TOKEN_REQUEST_URL",
|
|
"ACTIONS_ID_TOKEN_REQUEST_TOKEN",
|
|
"GITHUB_API_URL",
|
|
"GITHUB_SERVER_URL",
|
|
"GITHUB_GRAPHQL_URL",
|
|
"GITHUB_OUTPUT",
|
|
]);
|
|
|
|
export type EnvFilterMode = "allowlist" | "passthrough";
|
|
|
|
export function buildEnvFlags(ctx: DockerRunContext, mode: EnvFilterMode): string[] {
|
|
const envFlags: string[] = [];
|
|
const entries = Object.entries(ctx.env);
|
|
|
|
for (const entry of entries) {
|
|
const key = entry[0];
|
|
const value = entry[1];
|
|
|
|
if (value === undefined) continue;
|
|
|
|
if (mode === "passthrough" || testEnvAllowList.has(key)) {
|
|
envFlags.push("-e", `${key}=${value}`);
|
|
}
|
|
}
|
|
return envFlags;
|
|
}
|
|
|
|
export function initializeNodeModulesVolume(ctx: VolumeInitContext): void {
|
|
spawnSync(
|
|
"docker",
|
|
[
|
|
"run",
|
|
"--rm",
|
|
"-v",
|
|
`${ctx.volumeName}:/app/action/node_modules`,
|
|
"node:24",
|
|
"chown",
|
|
"-R",
|
|
`${ctx.uid}:${ctx.gid}`,
|
|
"/app/action/node_modules",
|
|
],
|
|
{ stdio: "ignore", cwd: ctx.actionDir }
|
|
);
|
|
}
|
|
|
|
/**
|
|
* escape a string for embedding in a double-quoted shell context.
|
|
* handles: backslash, double quote, dollar sign, backtick.
|
|
*/
|
|
function escapeForDoubleQuotes(str: string): string {
|
|
return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$").replace(/`/g, "\\`");
|
|
}
|
|
|
|
export function buildDockerRunArgs(config: DockerRunArgsContext): string[] {
|
|
const args: string[] = [
|
|
"run",
|
|
"--rm",
|
|
"-t",
|
|
"--privileged", // needed for PID namespace isolation (unshare --pid)
|
|
"-v",
|
|
`${config.ctx.actionDir}:/app/action:cached`,
|
|
"-v",
|
|
`${config.volumeName}:/app/action/node_modules`,
|
|
"-w",
|
|
"/app/action",
|
|
];
|
|
args.push(...config.envFlags);
|
|
args.push(...config.sshSetup.sshFlags);
|
|
|
|
// escape nodeCmd for embedding in su -c "..." context
|
|
const escapedNodeCmd = escapeForDoubleQuotes(config.nodeCmd);
|
|
|
|
// run as root initially, setup sudo for a test user, then run tests as that user
|
|
// this simulates GHA environment where sudo is available
|
|
const setupCmd = [
|
|
// install sudo (node:24 is Debian-based) - check if already installed first
|
|
`which sudo > /dev/null 2>&1 || (apt-get update -qq && apt-get install -qq -y sudo > /dev/null 2>&1)`,
|
|
// remove any existing user/group with the same uid/gid (e.g. node:24 has "node" at 1000:1000)
|
|
`existing_user=$(getent passwd ${config.ctx.uid} | cut -d: -f1) && [ -n "$existing_user" ] && [ "$existing_user" != "testuser" ] && userdel "$existing_user" 2>/dev/null || true`,
|
|
`existing_group=$(getent group ${config.ctx.gid} | cut -d: -f1) && [ -n "$existing_group" ] && [ "$existing_group" != "testuser" ] && groupdel "$existing_group" 2>/dev/null || true`,
|
|
// create user matching host uid/gid for file permissions
|
|
`id testuser > /dev/null 2>&1 || (groupadd -g ${config.ctx.gid} testuser 2>/dev/null || true; useradd -u ${config.ctx.uid} -g ${config.ctx.gid} -m -s /bin/bash testuser 2>/dev/null || true)`,
|
|
// configure passwordless sudo (like GHA runners) - check if already configured
|
|
`grep -q "testuser ALL" /etc/sudoers 2>/dev/null || echo "testuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers`,
|
|
// setup directories
|
|
`mkdir -p /tmp/home/.config /tmp/home/.cache`,
|
|
`chown -R ${config.ctx.uid}:${config.ctx.gid} /tmp/home /app/action/node_modules`,
|
|
// install deps as user
|
|
`su testuser -c "corepack pnpm install --frozen-lockfile --ignore-scripts"`,
|
|
// run test as user - nodeCmd is escaped for double-quote context
|
|
`su testuser -c "${escapedNodeCmd}"`,
|
|
].join(" && ");
|
|
args.push(
|
|
"-e",
|
|
"COREPACK_ENABLE_DOWNLOAD_PROMPT=0",
|
|
"-e",
|
|
"HOME=/tmp/home",
|
|
"-e",
|
|
"TMPDIR=/tmp",
|
|
// always set CI=true in docker to enable sandbox - this is critical for security tests
|
|
// without this, PID namespace isolation is skipped and tests may pass vacuously
|
|
"-e",
|
|
"CI=true",
|
|
"node:24",
|
|
"bash",
|
|
"-c",
|
|
`${config.sshSetup.sshSetupCmd}${setupCmd}`
|
|
);
|
|
return args;
|
|
}
|
|
|
|
export type RunInDockerOptions = {
|
|
actionDir: string;
|
|
args: string[];
|
|
nodeCmd: string;
|
|
volumeName: string;
|
|
envFilterMode: EnvFilterMode;
|
|
onStart?: () => void;
|
|
};
|
|
|
|
export function runInDocker(options: RunInDockerOptions): SpawnSyncReturns<Buffer> {
|
|
const ctx = buildDockerRunContext({
|
|
actionDir: options.actionDir,
|
|
args: options.args,
|
|
});
|
|
assertDockerSupported(ctx);
|
|
|
|
const sshSetup = buildSshSetup(ctx);
|
|
const envFlags = buildEnvFlags(ctx, options.envFilterMode);
|
|
|
|
initializeNodeModulesVolume({
|
|
actionDir: ctx.actionDir,
|
|
volumeName: options.volumeName,
|
|
uid: ctx.uid,
|
|
gid: ctx.gid,
|
|
});
|
|
|
|
if (options.onStart) {
|
|
options.onStart();
|
|
}
|
|
|
|
return spawnSync(
|
|
"docker",
|
|
buildDockerRunArgs({
|
|
ctx,
|
|
envFlags,
|
|
nodeCmd: options.nodeCmd,
|
|
sshSetup,
|
|
volumeName: options.volumeName,
|
|
}),
|
|
{ stdio: "inherit", cwd: ctx.actionDir }
|
|
);
|
|
}
|