-
-
Notifications
You must be signed in to change notification settings - Fork 437
security: parameterize SQL in sequence functions and data_queries.php (1.2.x backport) #6911
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 3 commits into
Cacti:1.2.x
from
somethingwithproof:backport/1.2.x-sqli-sequence-functions
Mar 29, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <?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 | | ||
| +-------------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| require_once dirname(__DIR__) . '/Helpers/CactiStubs.php'; | ||
|
|
||
TheWitness marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // build_where_from_array is defined in lib/functions.php | ||
| // We'll test it here by mock or by inclusion if dependencies allow. | ||
|
|
||
| function test_build_where_from_array(array $filters, array &$params) : string { | ||
| $where = []; | ||
|
|
||
| foreach ($filters as $field => $value) { | ||
| if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $field)) { | ||
| continue; | ||
| } | ||
|
|
||
| $where[] = "`$field` = ?"; | ||
| $params[] = $value; | ||
| } | ||
|
|
||
| return implode(' AND ', $where); | ||
| } | ||
TheWitness marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| test('build_where_from_array handles single filter', function () { | ||
| $params = []; | ||
| $filters = ['id' => 123]; | ||
| $where = test_build_where_from_array($filters, $params); | ||
|
|
||
| expect($where)->toBe('`id` = ?') | ||
| ->and($params)->toBe([123]); | ||
| }); | ||
|
|
||
| test('build_where_from_array handles multiple filters', function () { | ||
| $params = []; | ||
| $filters = ['host_id' => 1, 'field_name' => "test' OR 1=1"]; | ||
| $where = test_build_where_from_array($filters, $params); | ||
|
|
||
| expect($where)->toBe('`host_id` = ? AND `field_name` = ?') | ||
| ->and($params)->toBe([1, "test' OR 1=1"]); | ||
| }); | ||
|
|
||
| test('build_where_from_array handles empty filters', function () { | ||
| $params = []; | ||
| $filters = []; | ||
| $where = test_build_where_from_array($filters, $params); | ||
|
|
||
| expect($where)->toBe('') | ||
| ->and($params)->toBe([]); | ||
| }); | ||
|
|
||
| test('build_where_from_array rejects field names with semicolons', function () { | ||
| $params = []; | ||
| $where = test_build_where_from_array(['valid' => 1, 'invalid;field' => 2], $params); | ||
|
|
||
| expect($where)->toBe('`valid` = ?') | ||
| ->and($params)->toBe([1]); | ||
| }); | ||
|
|
||
| test('build_where_from_array rejects field names with backticks', function () { | ||
| $params = []; | ||
| $where = test_build_where_from_array(['id` OR 1=1 --' => 1], $params); | ||
|
|
||
| expect($where)->toBe('') | ||
| ->and($params)->toBe([]); | ||
| }); | ||
|
|
||
| test('build_where_from_array rejects field names with spaces', function () { | ||
| $params = []; | ||
| $where = test_build_where_from_array(['field name' => 1], $params); | ||
|
|
||
| expect($where)->toBe('') | ||
| ->and($params)->toBe([]); | ||
| }); | ||
|
|
||
| test('build_where_from_array accepts underscored field names', function () { | ||
| $params = []; | ||
| $where = test_build_where_from_array(['data_template_rrd_id' => 42], $params); | ||
|
|
||
| expect($where)->toBe('`data_template_rrd_id` = ?') | ||
| ->and($params)->toBe([42]); | ||
| }); | ||
TheWitness marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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.