refactor: replace narrow parameter types with context objects (#519)
* refactor: replace narrow parameter types with context objects across action/ pass broader context objects (ToolContext, PromptContext, PostCleanupContext) to utility functions instead of cherry-picking fields into single-use interfaces. deletes 8 narrow types, simplifies call sites, and makes buildCommentFooter synchronous by reading ctx.runId/ctx.jobId directly instead of re-deriving from env vars and making an extra API call. Made-with: Cursor * fix: replace non-null assertion with local guard in validatePushDestination addresses review feedback — the function now validates pushUrl itself instead of relying on the caller's check, eliminating the ! assertion. Made-with: Cursor * revert: remove GH_TOKEN injection from restricted shell the original change exposed the git token in restricted-mode shell so `gh` CLI would work. this is a security regression for public repos: MCP tools are deliberately constrained (no merge, no release, no arbitrary API calls), but `gh api` with the token gives full GitHub API access to any prompt-injected agent. Made-with: Cursor
This commit is contained in:
committed by
pullfrog[bot]
parent
ab76a4ad04
commit
2ea447a780
+8
-19
@@ -57,23 +57,20 @@ function normalizeUrl(url: string): string {
|
||||
return url.replace(/\.git$/, "").toLowerCase();
|
||||
}
|
||||
|
||||
type ValidatePushParams = {
|
||||
branch: string;
|
||||
pushUrl: string;
|
||||
storedDest: StoredPushDest | undefined;
|
||||
};
|
||||
|
||||
/**
|
||||
* validate that the push destination matches expected URL.
|
||||
* pushUrl is set by setupGit (base repo) and updated by checkout_pr (fork repo).
|
||||
*/
|
||||
function validatePushDestination(params: ValidatePushParams): PushDestination {
|
||||
const dest = getPushDestination(params.branch, params.storedDest);
|
||||
function validatePushDestination(ctx: ToolContext, branch: string): PushDestination {
|
||||
const pushUrl = ctx.toolState.pushUrl;
|
||||
if (!pushUrl) throw new Error("pushUrl not set - setupGit must run before push_branch");
|
||||
|
||||
if (normalizeUrl(dest.url) !== normalizeUrl(params.pushUrl)) {
|
||||
const dest = getPushDestination(branch, ctx.toolState.pushDest);
|
||||
|
||||
if (normalizeUrl(dest.url) !== normalizeUrl(pushUrl)) {
|
||||
throw new Error(
|
||||
`Push blocked: destination does not match expected repository.\n` +
|
||||
`Expected: ${params.pushUrl}\n` +
|
||||
`Expected: ${pushUrl}\n` +
|
||||
`Actual: ${dest.url}\n` +
|
||||
`Git configuration may have been tampered with.`
|
||||
);
|
||||
@@ -119,15 +116,7 @@ export function PushBranchTool(ctx: ToolContext) {
|
||||
}
|
||||
|
||||
// validate push destination matches expected URL
|
||||
const pushUrl = ctx.toolState.pushUrl;
|
||||
if (!pushUrl) {
|
||||
throw new Error("pushUrl not set - setupGit must run before push_branch");
|
||||
}
|
||||
const pushDest = validatePushDestination({
|
||||
branch,
|
||||
pushUrl,
|
||||
storedDest: ctx.toolState.pushDest,
|
||||
});
|
||||
const pushDest = validatePushDestination(ctx, branch);
|
||||
|
||||
// block pushes to default branch in restricted mode
|
||||
if (pushPermission === "restricted" && pushDest.remoteBranch === defaultBranch) {
|
||||
|
||||
Reference in New Issue
Block a user