-
-
Notifications
You must be signed in to change notification settings - Fork 437
security: harden shell command execution against injection (1.2.x backport) #6902
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
Merged
TheWitness
merged 6 commits into
Cacti:1.2.x
from
somethingwithproof:backport/1.2.x-shell-injection-hardening
Mar 29, 2026
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d21bdae
security: harden shell command execution against injection (1.2.x bac…
somethingwithproof 685730e
Remove type casting from host_id assignment
TheWitness 69a9dd7
Fix local_graph_id retrieval in view case
TheWitness 2d86d16
Change local_graph_id retrieval method
TheWitness a286c24
Execute command using shell_exec in ss_sql.php
TheWitness fb3ba80
Merge branch '1.2.x' into backport/1.2.x-shell-injection-hardening
TheWitness 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
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
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
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
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
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
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,50 @@ | ||
| <?php | ||
| /* | ||
| +-------------------------------------------------------------------------+ | ||
| | Copyright (C) 2004-2026 The Cacti Group | | ||
| | | | ||
| | This program is free software; you can redistribute it and/or | | ||
| | modify it under the terms of the GNU General Public License | | ||
| | as published by the Free Software Foundation; either version 2 | | ||
| | of the License, or (at your option) any later version. | | ||
| +-------------------------------------------------------------------------+ | ||
| | Cacti: The Complete RRDtool-based Graphing Solution | | ||
| +-------------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| /* | ||
| * Tests for command injection hardening in graph_realtime.php. | ||
| * | ||
| * grv('local_graph_id') was interpolated into shell_exec via sprintf without | ||
| * escaping. The fix casts to (int), uses cacti_escapeshellcmd for the PHP | ||
| * binary, and cacti_escapeshellarg for the script path. | ||
| */ | ||
|
|
||
| $graphRealtimePath = __DIR__ . '/../../graph_realtime.php'; | ||
|
|
||
| // --- graph_realtime.php: shell escaping for poller invocation --- | ||
|
|
||
| test('graph_realtime.php uses cacti_escapeshellcmd for PHP binary', function () use ($graphRealtimePath) { | ||
| $contents = file_get_contents($graphRealtimePath); | ||
|
|
||
| expect($contents)->toContain("cacti_escapeshellcmd(read_config_option('path_php_binary')"); | ||
| }); | ||
|
|
||
| test('graph_realtime.php uses cacti_escapeshellarg for poller_realtime script path', function () use ($graphRealtimePath) { | ||
| $contents = file_get_contents($graphRealtimePath); | ||
|
|
||
| expect($contents)->toContain('cacti_escapeshellarg(CACTI_PATH_BASE'); | ||
| expect($contents)->toContain('poller_realtime.php'); | ||
| }); | ||
|
|
||
| test('graph_realtime.php casts local_graph_id to int before shell_exec', function () use ($graphRealtimePath) { | ||
| $contents = file_get_contents($graphRealtimePath); | ||
|
|
||
| expect($contents)->toMatch('/\(int\)\s+gfrv\s*\(\s*[\'"]local_graph_id[\'"]\s*\)/'); | ||
| }); | ||
|
|
||
| test('graph_realtime.php does not pass raw grv local_graph_id to sprintf for shell', function () use ($graphRealtimePath) { | ||
| $contents = file_get_contents($graphRealtimePath); | ||
|
|
||
| expect($contents)->not->toMatch('/sprintf\s*\([^)]*grv\s*\(\s*[\'"]local_graph_id[\'"]\s*\)/'); | ||
TheWitness marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }); | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.