Skip to content

🛡️ Sentinel: [CRITICAL] Fix command injection in forge-tools #227

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
bobdivx wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

🛡️ Sentinel: [CRITICAL] Fix command injection in forge-tools #227

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
4 changes: 4 additions & 0 deletions .jules/sentinel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## 2024-05-23 - Command injection vulnerabilities in forge-tools.ts
**Vulnerability:** Several tools in `src/lib/forge-tools.ts` executed shell commands using unsanitized or insufficiently sanitized user input via `execSync` wrapper `safeExec(cmd)`, leading to potential command and argument injection.
**Learning:** Shell commands constructed by concatenating user input are always susceptible to injection attacks when executed in a shell (`sh -c`). Even wrapping commands or slightly sanitizing variables can be bypassed.
**Prevention:** Always use execution functions that take argument arrays directly (like `execFileSync` or `execFile`) and pass the program and its arguments separately, bypassing the shell. If shell execution is strictly required (e.g. pipes), aggressively validate the inputs (e.g., regex `^[a-zA-Z0-9_.-]+$`) and restrict execution scope.
33 changes: 15 additions & 18 deletions src/lib/forge-tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Réimplémenté from scratch pour Ageton (Astro/Node.js).
* SERVEUR UNIQUEMENT — utilise child_process et fs.
*/
import { execFileSync, execSync } from 'child_process';
import { execFileSync } from 'child_process';
import fs from 'fs';
import path from 'path';
import {
Expand Down Expand Up @@ -54,9 +54,9 @@ export interface ForgeTool<

// ── Helpers ───────────────────────────────────────────────────────────────────

function safeExec(cmd: string, cwd: string): { stdout: string; ok: boolean } {
function safeExec(file: string, args: string[], cwd: string): { stdout: string; ok: boolean } {
try {
const stdout = execSync(cmd, {
const stdout = execFileSync(file, args, {
cwd,
timeout: 15_000,
encoding: 'utf8',
Expand Down Expand Up @@ -108,7 +108,7 @@ const gitStatus: ForgeTool<{ project: string }, string> = {
durationMs: 0,
toolName: 'git_status',
};
const { stdout, ok } = safeExec('git status', dir);
const { stdout, ok } = safeExec('git', ['status'], dir);
return { ok, output: stdout, toolName: 'git_status', durationMs: 0 };
}),
};
Expand Down Expand Up @@ -137,10 +137,7 @@ const gitLog: ForgeTool<{ project: string; limit?: number }, string> = {
toolName: 'git_log',
};
const n = Math.min(Number(limit) || 10, 50);
const { stdout, ok } = safeExec(
`git log --oneline --decorate -${n}`,
dir,
);
const { stdout, ok } = safeExec('git', ['log', '--oneline', '--decorate', `-${n}`], dir);
return { ok, output: stdout, toolName: 'git_log', durationMs: 0 };
}),
};
Expand Down Expand Up @@ -168,10 +165,10 @@ const gitDiff: ForgeTool<{ project: string; staged?: boolean }, string> = {
durationMs: 0,
toolName: 'git_diff',
};
const cmd = staged
? 'git diff --staged --name-status'
: 'git diff --name-status';
const { stdout, ok } = safeExec(cmd, dir);
const args = staged
? ['diff', '--staged', '--name-status']
: ['diff', '--name-status'];
const { stdout, ok } = safeExec('git', args, dir);
return {
ok,
output: stdout || '(aucune modification)',
Expand Down Expand Up @@ -199,7 +196,7 @@ const gitBranch: ForgeTool<{ project: string }, string> = {
durationMs: 0,
toolName: 'git_branch',
};
const { stdout, ok } = safeExec('git branch -a', dir);
const { stdout, ok } = safeExec('git', ['branch', '-a'], dir);
return { ok, output: stdout, toolName: 'git_branch', durationMs: 0 };
}),
};
Expand Down Expand Up @@ -349,7 +346,7 @@ const fileTree: ForgeTool<{ project: string; depth?: number }, string> = {
};
const d = Math.min(Number(depth) || 2, 4);
const { stdout, ok } = safeExec(
`find . -maxdepth ${d} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/.next/*' | sort | head -80`,
'sh', ['-c', `find . -maxdepth ${d} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/.next/*' | sort | head -80`],
dir,
);
return { ok, output: stdout, toolName: 'file_tree', durationMs: 0 };
Expand All @@ -366,7 +363,7 @@ const dockerPs: ForgeTool<Record<string, never>, string> = {
execute: (_input, _ctx) =>
run('docker_ps', () => {
const { stdout, ok } = safeExec(
'docker ps --format "table {{.Names}}\\t{{.Status}}\\t{{.Image}}"',
'docker', ['ps', '--format', 'table {{.Names}}\t{{.Status}}\t{{.Image}}'],
'/tmp',
);
return {
Expand Down Expand Up @@ -410,7 +407,7 @@ const dockerLogs: ForgeTool<
};
const n = Math.min(Number(lines) || 50, 200);
const { stdout, ok } = safeExec(
`docker logs --tail ${n} ${safe} 2>&1`,
'sh', ['-c', `docker logs --tail ${n} ${safe} 2>&1`],
'/tmp',
);
return { ok, output: stdout, toolName: 'docker_logs', durationMs: 0 };
Expand Down Expand Up @@ -638,7 +635,7 @@ const githubCommit: ForgeTool<
toolName: 'github_commit',
};
}
const gitStatusBefore = safeExec('git status --porcelain', dir);
const gitStatusBefore = safeExec('git', ['status', '--porcelain'], dir);
if (!gitStatusBefore.ok) {
return {
ok: false,
Expand Down Expand Up @@ -822,7 +819,7 @@ const systemExec: ForgeTool<{ project?: string; command: string }, string> = {
if (d) dir = d;
}

const { stdout, ok } = safeExec(command, dir);
const { stdout, ok } = safeExec('sh', ['-c', command], dir);
return { ok, output: stdout, toolName: 'system_exec', durationMs: 0 };
}),
};
Expand Down