-
Notifications
You must be signed in to change notification settings - Fork 0
🛡️ Sentinel: [CRITICAL] Fix command injection in docker logs API #82
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
jules-6683742158593781981-a0c79778
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-06-01 - Fix Command Injection in API endpoints using Docker logs | ||
| **Vulnerability:** The API route `src/pages/api/docker-logs.ts` constructed shell commands using unvalidated, unsanitized user input (`id` and `tail` query parameters) directly into `execSync`, creating a severe command injection vulnerability. | ||
| **Learning:** Shell-based execution (`execSync` or `exec`) implicitly runs commands within a shell environment where operators like `;` and `&&` evaluate, allowing an attacker to inject arbitrary system commands via user-supplied parameters if not strictly validated or escaped. | ||
| **Prevention:** Always use `execFile` or `execFileAsync` which execute specific binaries directly and accept an array of arguments, bypassing shell parsing. Additionally, strictly validate all query parameters (e.g., using regex `^[a-zA-Z0-9_-]+$`) to prevent flag/argument injection. |
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 { | ||
|
|
@@ -21,12 +24,25 @@ export const GET: APIRoute = async ({ url }) => { | |
| }); | ||
| } | ||
|
|
||
| // Commande Docker pour récupérer les logs | ||
| const command = `docker logs --tail ${tail} ${containerId}`; | ||
| // Validation stricte pour éviter l'injection de commandes/flags | ||
| if (!/^[a-zA-Z0-9_-]+$/.test(containerId) || !/^\d+$/.test(tail)) { | ||
| return new Response(JSON.stringify({ error: "Paramètres invalides" }), { | ||
| status: 400, | ||
| headers: { 'Content-Type': 'application/json' } | ||
| }); | ||
| } | ||
|
|
||
| // Utilisation d'un tableau d'arguments pour empêcher l'injection via shell | ||
| let logs = []; | ||
| try { | ||
| const output = execSync(command, { stdio: ['pipe', 'pipe', 'pipe'] }).toString(); | ||
| logs = output.trim().split('\n'); | ||
| const { stdout, stderr } = await execFileAsync('docker', ['logs', '--tail', tail, containerId]); | ||
| // Docker logs output can be stdout or stderr | ||
| logs = stdout ? stdout.trim().split('\n') : []; | ||
| if (stderr && stderr.trim().length > 0 && logs.length === 0) { | ||
| logs = stderr.trim().split('\n'); | ||
| } else if (stderr && stderr.trim().length > 0) { | ||
| logs.push(...stderr.trim().split('\n')); | ||
| } | ||
|
Comment on lines
+40
to
+45
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. Improvement: Simplify stdout/stderr MergingThe current logic for merging Using const stdoutLines = stdout ? stdout.trim().split('\n').filter(Boolean) : [];
const stderrLines = stderr ? stderr.trim().split('\n').filter(Boolean) : [];
logs = [...stdoutLines, ...stderrLines]; |
||
| } catch (err: any) { | ||
| // Certains logs sortent sur stderr, checkons stderr si stdout est vide ou si erreur | ||
| if (err.stderr) { | ||
|
|
||
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.
Issue: Overly Restrictive Regex Validation
Docker container names can contain dots (
.) and often start with a leading slash (/) when retrieved from the Docker API (e.g.,/my-container). The current regex/^[a-zA-Z0-9_-]+$/will reject these valid names, causing the API to return a400error and breaking the logs view for those containers.Additionally, the
tailparameter in Docker logs can accept"all"to retrieve all logs. Restricting it to only digits/^\d+$/prevents this valid use case.Recommendation
Update the regex to:
--helpas a container ID)."all"as a valid value fortail.