Skip to content

fix: close remaining shell-injection vectors in github-issues and git-diff #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kovtcharov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: close remaining shell-injection vectors in github-issues and git-diff #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 45 additions & 14 deletions backend/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3863,13 +3863,30 @@ export async function createApp(basePath?: string) {
body: string;
}

// Validate state against an allowlist before passing to gh
if (!['open', 'closed', 'all'].includes(state)) {
return res.status(400).json({ error: 'state must be "open", "closed", or "all"' });
}
// Validate assignee: allow @me or a GitHub username (alphanumerics + dashes, max 39 chars)
if (assignee && assignee !== '@me' && !/^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,38})$/.test(assignee)) {
return res.status(400).json({ error: 'Invalid assignee' });
}

let issues: GitHubIssue[] = [];
try {
const assigneeArg = assignee ? `--assignee ${assignee}` : '';
const { stdout } = await execAsync(
`gh issue list --repo ${owner}/${repo} --state ${state} ${assigneeArg} --limit ${limit} --json number,title,state,url,createdAt,updatedAt,closedAt,author,assignees,labels,comments,body`,
{ cwd: workspacePath }
);
const { execFile } = await import('child_process');
const execFileAsync = (await import('util')).promisify(execFile);
const ghArgs = [
'issue', 'list',
'--repo', `${owner}/${repo}`,
'--state', state,
'--limit', String(limit),
'--json', 'number,title,state,url,createdAt,updatedAt,closedAt,author,assignees,labels,comments,body',
];
if (assignee) {
ghArgs.push('--assignee', assignee);
}
const { stdout } = await execFileAsync('gh', ghArgs, { cwd: workspacePath });
issues = JSON.parse(stdout);
} catch (err) {
const errorMsg = err instanceof Error ? err.message : String(err);
Expand Down Expand Up @@ -3984,11 +4001,20 @@ export async function createApp(basePath?: string) {

// Create issue using gh CLI
try {
const { execFile } = await import('child_process');
const execFileAsync = (await import('util')).promisify(execFile);
// gh CLI requires --body when running non-interactively, so provide empty string if not given
const bodyText = body || '';
// Auto-assign to current user (@me)
const { stdout } = await execAsync(
`gh issue create --repo ${owner}/${repo} --title "${title.replace(/"/g, '\\"')}" --body "${bodyText.replace(/"/g, '\\"')}" --assignee @me`,
const { stdout } = await execFileAsync(
'gh',
[
'issue', 'create',
'--repo', `${owner}/${repo}`,
'--title', title,
'--body', bodyText,
'--assignee', '@me',
],
{ cwd: workspacePath }
);
// gh issue create returns the URL of the created issue
Expand Down Expand Up @@ -4099,9 +4125,12 @@ export async function createApp(basePath?: string) {

// Close or reopen the issue using gh CLI
try {
const stateArg = state === 'closed' ? '--close' : '--reopen';
await execAsync(
`gh issue ${state === 'closed' ? 'close' : 'reopen'} ${issueNumber} --repo ${owner}/${repo}`,
const { execFile } = await import('child_process');
const execFileAsync = (await import('util')).promisify(execFile);
const subcommand = state === 'closed' ? 'close' : 'reopen';
await execFileAsync(
'gh',
['issue', subcommand, String(issueNumber), '--repo', `${owner}/${repo}`],
{ cwd: workspacePath }
);

Expand Down Expand Up @@ -4245,10 +4274,12 @@ export async function createApp(basePath?: string) {
// Get the diff
let diff = '';
try {
const command = staged
? `git diff --cached -- "${filePath}"`
: `git diff -- "${filePath}"`;
const { stdout } = await execAsync(command, { cwd: workspacePath, maxBuffer: 10 * 1024 * 1024 });
const { execFile } = await import('child_process');
const execFileAsync = (await import('util')).promisify(execFile);
const args = staged
? ['diff', '--cached', '--', filePath]
: ['diff', '--', filePath];
const { stdout } = await execFileAsync('git', args, { cwd: workspacePath, maxBuffer: 10 * 1024 * 1024 });
diff = stdout;
} catch (err) {
logger.error('Failed to get git diff', { error: err instanceof Error ? err.message : String(err) });
Expand Down
4 changes: 4 additions & 0 deletions backend/src/task-spawner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,6 +1810,8 @@ export class TaskSpawner extends EventEmitter {
});
this.taskLearnings.set(task.id, injectedLearnings.map(l => l.learning.id));
}
}).catch(err => {
logger.warn('Learnings promise rejected (post-spawn)', { taskId: task.id, error: err instanceof Error ? err.message : String(err) });
});

return task;
Expand Down Expand Up @@ -2073,6 +2075,8 @@ You are running as an agent inside Claudia, a multi-agent orchestrator. You have
task.gitStateBefore = gitStateBefore;
logger.info(`Git state attached to task`, { taskId: id, commit: gitStateBefore.commitBefore?.substring(0, 7) });
}
}).catch(err => {
logger.warn('Git state promise rejected (post-spawn)', { taskId: id, error: err instanceof Error ? err.message : String(err) });
});


Expand Down
Loading