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
173 lines
4.9 KiB
TypeScript
173 lines
4.9 KiB
TypeScript
/**
|
|
* git authentication via GIT_ASKPASS.
|
|
*
|
|
* a localhost HTTP server serves tokens via single-use UUID codes.
|
|
* each $git() call writes a unique askpass script with the server
|
|
* port+code baked into the file body — no secrets in subprocess env.
|
|
*
|
|
* see wiki/askpass.md for full security documentation.
|
|
*/
|
|
|
|
import { execSync } from "node:child_process";
|
|
import { createHash } from "node:crypto";
|
|
import { readFileSync, realpathSync, unlinkSync } from "node:fs";
|
|
import { log } from "./cli.ts";
|
|
import type { GitAuthServer } from "./gitAuthServer.ts";
|
|
import { filterEnv } from "./secrets.ts";
|
|
import { spawn } from "./subprocess.ts";
|
|
|
|
type SafeGitSubcommand = "fetch" | "push";
|
|
|
|
type GitAuthOptions = {
|
|
token: string;
|
|
cwd?: string;
|
|
};
|
|
|
|
type GitResult = {
|
|
stdout: string;
|
|
stderr: string;
|
|
};
|
|
|
|
// --- git binary resolution and tamper detection ---
|
|
|
|
type GitBinaryInfo = {
|
|
path: string;
|
|
sha256: string;
|
|
};
|
|
|
|
let gitBinary: GitBinaryInfo | undefined;
|
|
|
|
function hashFile(path: string): string {
|
|
return createHash("sha256").update(readFileSync(path)).digest("hex");
|
|
}
|
|
|
|
/**
|
|
* resolve and fingerprint the git binary. must be called once at startup
|
|
* (in main()) before any agent code runs, so the path and hash reflect
|
|
* the untampered binary.
|
|
*
|
|
* resolves symlinks via realpath so the hash is of the actual binary.
|
|
* a malicious agent with sudo could replace the binary later, which is
|
|
* caught by verifyGitBinary() before each authenticated call.
|
|
*/
|
|
export function resolveGit(): void {
|
|
const whichPath = execSync("which git", { encoding: "utf-8" }).trim();
|
|
const resolvedPath = realpathSync(whichPath);
|
|
const sha256 = hashFile(resolvedPath);
|
|
gitBinary = { path: resolvedPath, sha256 };
|
|
log.info(`git binary: ${resolvedPath} (sha256: ${sha256.slice(0, 12)}...)`);
|
|
}
|
|
|
|
function verifyGitBinary(): string {
|
|
if (!gitBinary) {
|
|
throw new Error("git binary not initialized — call resolveGit() at startup");
|
|
}
|
|
const currentHash = hashFile(gitBinary.path);
|
|
if (currentHash !== gitBinary.sha256) {
|
|
throw new Error(
|
|
`git binary tampered: expected sha256 ${gitBinary.sha256}, got ${currentHash}. ` +
|
|
`path: ${gitBinary.path}`
|
|
);
|
|
}
|
|
return gitBinary.path;
|
|
}
|
|
|
|
// --- auth server ---
|
|
|
|
let authServer: GitAuthServer | undefined;
|
|
|
|
export function setGitAuthServer(server: GitAuthServer): void {
|
|
authServer = server;
|
|
}
|
|
|
|
/**
|
|
* execute authenticated git command via ASKPASS.
|
|
*
|
|
* subcommand is restricted to "fetch" | "push" — operations that talk to
|
|
* a remote and need credentials. working-tree operations (checkout, merge)
|
|
* use $() from shell.ts which has no token.
|
|
*
|
|
* per call: registers a one-time code with the auth server, writes a
|
|
* unique askpass script with port+code baked in, spawns git with
|
|
* GIT_ASKPASS pointing to the script, and deletes the script in finally.
|
|
*
|
|
* @example
|
|
* await $git("fetch", ["origin", "main"], { token });
|
|
* await $git("push", ["-u", "origin", "feature"], { token });
|
|
*/
|
|
export async function $git(
|
|
subcommand: SafeGitSubcommand,
|
|
args: string[],
|
|
options: GitAuthOptions
|
|
): Promise<GitResult> {
|
|
const gitPath = verifyGitBinary();
|
|
|
|
if (!authServer) {
|
|
throw new Error("git auth server not initialized — call setGitAuthServer() at startup");
|
|
}
|
|
|
|
const cwd = options.cwd ?? process.cwd();
|
|
|
|
const code = authServer.register(options.token);
|
|
const scriptPath = authServer.writeAskpassScript(code);
|
|
|
|
// -c flags override local .git/config — defense-in-depth against
|
|
// agent-set config that could spawn subprocesses before ASKPASS runs
|
|
const fullArgs = [
|
|
"-c",
|
|
"core.fsmonitor=false",
|
|
"-c",
|
|
"credential.helper=",
|
|
"-c",
|
|
"protocol.file.allow=never",
|
|
"-c",
|
|
"core.sshCommand=ssh",
|
|
subcommand,
|
|
...args,
|
|
];
|
|
|
|
log.debug(`git ${fullArgs.join(" ")}`);
|
|
|
|
try {
|
|
const result = await spawn({
|
|
cmd: gitPath,
|
|
args: fullArgs,
|
|
cwd,
|
|
env: {
|
|
...filterEnv(),
|
|
GIT_ASKPASS: scriptPath,
|
|
GIT_TERMINAL_PROMPT: "0",
|
|
// blocks env-based git config injection from outer processes.
|
|
// GIT_CONFIG_COUNT=0 blocks the newer KEY_n/VALUE_n mechanism.
|
|
// GIT_CONFIG_PARAMETERS="" clears the legacy quoted-list mechanism.
|
|
// both are needed — they are independent systems.
|
|
GIT_CONFIG_COUNT: "0",
|
|
GIT_CONFIG_PARAMETERS: "",
|
|
},
|
|
activityTimeout: 0,
|
|
});
|
|
|
|
if (result.stderr.includes("askpass-compromised")) {
|
|
log.info("askpass code was already consumed — token has been revoked");
|
|
throw new Error("git auth failed — askpass code was already consumed, token revoked");
|
|
}
|
|
|
|
if (result.exitCode !== 0) {
|
|
const stderr = result.stderr.trim();
|
|
log.info(`git ${subcommand} failed: ${stderr}`);
|
|
throw new Error(`git ${subcommand} failed: ${stderr}`);
|
|
}
|
|
|
|
return {
|
|
stdout: result.stdout.trim(),
|
|
stderr: result.stderr.trim(),
|
|
};
|
|
} finally {
|
|
try {
|
|
unlinkSync(scriptPath);
|
|
} catch {
|
|
// script may have self-deleted already
|
|
}
|
|
}
|
|
}
|