-
Notifications
You must be signed in to change notification settings - Fork 0
🛡️ Sentinel: [CRITICAL] Fix command injection in docker logs API #65
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.
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
dev
Choose a base branch
from
sentinel-fix-docker-logs-injection-5251450566315646849
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| ## 2024-05-24 - [CRITICAL] Command Injection in docker logs API | ||
| **Vulnerability:** The API endpoint `src/pages/api/docker-logs.ts` utilized `execSync` with unsanitized user inputs (`id` and `tail` query parameters) concatenated directly into a shell command string, creating a critical risk of arbitrary command execution. | ||
| **Learning:** Shell strings generated with external user input inherently trust that input to not contain shell metacharacters or secondary commands (e.g., using `;` or `&&`). Relying solely on `execSync` without passing an arguments array bypasses proper encoding. | ||
| **Prevention:** Always use `execFile` (or its async wrapper) with an array of arguments for external commands instead of string concatenation. Validate and strictly cast types (e.g., parsing integers for numeric limits), sanitize error outputs to avoid stack trace leaks, and block flags from being injected by rejecting inputs starting with hyphens (`-`). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| import type { APIRoute } from 'astro'; | ||
| import { execSync } from 'child_process'; | ||
| import { execFile } from 'child_process'; | ||
| import { promisify } from 'util'; | ||
|
|
||
| const execFileAsync = promisify(execFile); | ||
|
|
||
| export const GET: APIRoute = async ({ url }) => { | ||
| try { | ||
|
|
@@ -12,27 +15,36 @@ export const GET: APIRoute = async ({ url }) => { | |
| } | ||
|
|
||
| const containerId = url.searchParams.get('id'); | ||
| const tail = url.searchParams.get('tail') || '100'; | ||
| const tailParam = url.searchParams.get('tail') || '100'; | ||
|
|
||
| // 🛡️ Security: Validate input and prevent flag injection | ||
| if (!containerId || containerId.startsWith('-')) { | ||
| return new Response(JSON.stringify({ error: "ID du conteneur invalide ou manquant" }), { | ||
| status: 400, | ||
| headers: { 'Content-Type': 'application/json' } | ||
| }); | ||
| } | ||
|
|
||
| if (!containerId) { | ||
| return new Response(JSON.stringify({ error: "ID du conteneur manquant" }), { | ||
| const tail = parseInt(tailParam, 10); | ||
| if (isNaN(tail)) { | ||
| return new Response(JSON.stringify({ error: "Paramètre tail invalide" }), { | ||
| status: 400, | ||
| headers: { 'Content-Type': 'application/json' } | ||
| }); | ||
| } | ||
|
|
||
| // Commande Docker pour récupérer les logs | ||
| const command = `docker logs --tail ${tail} ${containerId}`; | ||
| let logs = []; | ||
| // 🛡️ Security: Use execFile to prevent command injection | ||
| let logs: string[] = []; | ||
| try { | ||
| const output = execSync(command, { stdio: ['pipe', 'pipe', 'pipe'] }).toString(); | ||
| logs = output.trim().split('\n'); | ||
| const { stdout, stderr } = await execFileAsync('docker', ['logs', '--tail', tail.toString(), '--', containerId]); | ||
| const output = stdout.trim() || stderr.trim(); | ||
| logs = output ? output.split('\n') : []; | ||
| } catch (err: any) { | ||
| // Certains logs sortent sur stderr, checkons stderr si stdout est vide ou si erreur | ||
| if (err.stderr) { | ||
| logs = err.stderr.toString().trim().split('\n'); | ||
| } else { | ||
| throw err; | ||
| throw new Error("Execution failed"); | ||
| } | ||
| } | ||
|
Comment on lines
+37
to
49
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are two issues with the current implementation of log retrieval and error handling:
let logs: string[] = [];
try {
const { stdout, stderr } = await execFileAsync('docker', ['logs', '--tail', tail.toString(), '--', containerId]);
const output = [stdout.trim(), stderr.trim()].filter(Boolean).join('
');
logs = output ? output.split('
') : [];
} catch (err: any) {
throw new Error("Execution failed");
} |
||
|
|
||
|
|
@@ -41,7 +53,8 @@ export const GET: APIRoute = async ({ url }) => { | |
| headers: { 'Content-Type': 'application/json' } | ||
| }); | ||
| } catch (error: any) { | ||
| return new Response(JSON.stringify({ error: "Logs indisponibles: " + error.message }), { | ||
| // 🛡️ Security: Sanitize error message to prevent leaking system details | ||
| return new Response(JSON.stringify({ error: "Logs indisponibles" }), { | ||
| status: 500, | ||
| headers: { 'Content-Type': 'application/json' } | ||
| }); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Validate that the
tailparameter is a non-negative integer. If a negative value is passed, it could lead to unexpected behavior or errors when passed to thedocker logscommand.