mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-29 08:06:58 +09:00
* refactor(tests): reorganize unit tests into domain category folders - Consolidate per-advisory GHSA regression tests into Security/ subfolders by vuln class - Group all 186 test files into domain folders: DataCollection/, Ui/, Core/, Database/, Installer/, Scripts/, Security/, Plugin/ - Strip GitHub issue/GHSA numbers from filenames; keep IDs in test descriptions - Fix all __DIR__ relative paths to match new folder nesting depth - Update CI workflow path triggers and phpunit XML configs for new file locations - Update .github/copilot-instructions.md with unit test organization guidelines - Add tests/vendor/ to .gitignore * add gaurds * fix up guard for unit tests * fix redeclaration of cacti_log in tests * fix updates to unit tests * fix test patjhs * fix: update test __DIR__ paths for reorganized test structure * fix: conditionally define read_user_setting to prevent redeclaration in tests * fix: conditionally define functions to prevent redeclaration in tests - Wrap clean_up_lines, raise_message, cacti_debug_backtrace, and get_debug_prefix with function_exists() checks to prevent conflicts when test stubs are loaded before lib/functions.php in the same PHP process * fix: add unit test bootstrap to prevent function redeclaration errors - Create tests/bootstrap-unit.php to load core libraries before tests - Ensures lib/functions.php loads before test stubs define stub functions - Test stubs use function_exists() checks, so they detect pre-loaded functions - Update phpunit.xml to use bootstrap-unit.php for Unit testsuite - Fixes 'Cannot redeclare read_user_setting()' errors when tests run in same process * fix: load test stubs before global.php in unit test bootstrap - Reorder bootstrap to load CactiStubs.php and UnitStubs.php first - Ensures stub functions like __() are available when global.php loads - global.php calls get_cacti_version_text() which needs __() for translations - Fixes 'Call to undefined function __()' error during bootstrap * fix: remove function conflicts from test stubs - Remove stub definitions for functions already in lib/functions.php: cacti_sizeof, cacti_log, cacti_strtolower, read_config_option, read_user_setting, cacti_count - Keep translation function stubs (__(), __esc()) needed by global.php - Update bootstrap to load lib/functions.php after stubs - This prevents function redeclaration errors while maintaining test isolation * fix: prevent constant and variable redeclaration in bootstrap - Remove explicit PHP_TESTING and CACTI_TEST_BOOTSTRAP defines from bootstrap (CactiStubs.php now handles this with guards) - Add guards to CactiStubs.php to prevent redefinition of PHP_TESTING - Only set CACTI_TEST_BOOTSTRAP env vars if not already set - Fixes PHP warnings about 'Constant X already defined' * fix: remove redundant lib/functions.php load from bootstrap include/global.php already loads lib/functions.php at lines 287-288. The bootstrap was trying to load it again after global.php, but global.php needs format_cacti_version() to be available on lines 293-294 to define CACTI_VERSION and CACTI_VERSION_FULL constants. Solution: Let global.php handle loading lib/functions.php itself, and don't load it separately in the bootstrap. * fix: remove more conflicting function stubs from test helpers - Remove stubs for functions also defined in lib/functions.php: raise_message, clean_up_lines, cacti_debug_backtrace, get_debug_prefix - Remove POLLER_ID constant stub (defined unconditionally by global.php) - Keep only translation functions and test-specific helpers - This prevents function/constant redeclaration errors * fix: minimize test stubs to only translation functions Remove ALL helper functions and constants from UnitStubs.php that are: - Defined in lib/functions.php (raise_message, clean_up_lines, etc.) - Defined in lib/html_utility.php (srv, set_request_var) - Defined in global_constants.php (POLLER_VERBOSITY_*, MESSAGE_LEVEL_*) - Defined in global.php (POLLER_ID) Keep ONLY translation functions (__(), __esc()) that are: - Called by global.php during initialization - Not defined elsewhere - Required for proper bootstrap sequence This eliminates all constant and function redeclaration errors. * fix: remove __esc stub - already defined in global_languages.php Keep only __() translation function stub, which is needed by global.php and not defined elsewhere in Cacti core. * fix: handle no-arg case in __() translation stub The __() function may be called with just a string and no format arguments. Previously, vsprintf() would fail with 'arguments array must contain 2 items'. Now, if no args are provided, return the text as-is.
122 lines
5.0 KiB
PHP
122 lines
5.0 KiB
PHP
<?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 |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/*
|
|
* Integration coverage for the get_allowed_graphs() dsstats ORDER BY path
|
|
* (lib/auth.php). tests/Unit/Security/SqlInjection/DsstatsOrderStringTest.php already covers
|
|
* get_dsstats_order_string() in isolation; this test drives it together
|
|
* with the other real functions get_allowed_graphs() calls on the same
|
|
* code path (dsstats_get_best_partition() from lib/dsstats.php and
|
|
* db_qstr() from lib/database.php), reproducing the exact JOIN + ORDER BY
|
|
* fragment that gets concatenated into the graph list query, so a
|
|
* regression that reintroduces unescaped concatenation anywhere along
|
|
* that path (not just inside get_dsstats_order_string() itself) is
|
|
* caught. Calling get_allowed_graphs() itself would require a live DB
|
|
* connection (auth_valid_user(), read_config_option(), db_fetch_assoc()),
|
|
* which this test suite does not provision.
|
|
*/
|
|
|
|
require_once dirname(__DIR__, 2) . '/lib/database.php';
|
|
require_once dirname(__DIR__, 2) . '/lib/dsstats.php';
|
|
require_once dirname(__DIR__, 2) . '/lib/html_utility.php';
|
|
|
|
/*
|
|
* Rebuilds the $sql_order_join / $sql_order fragment exactly as
|
|
* get_allowed_graphs() does for the is_array($sql_order) branch
|
|
* (lib/auth.php), so the test exercises the real call sequence rather
|
|
* than a paraphrase of it.
|
|
*/
|
|
function build_dsstats_order_fragment(array $sql_order) : array {
|
|
$table = dsstats_get_best_partition($sql_order['start_time'], $sql_order['end_time']);
|
|
|
|
$cf = $sql_order['cf'] == 'max' ? 1 : 0;
|
|
|
|
$sql_order_join = "INNER JOIN
|
|
(
|
|
SELECT DISTINCT gti.local_graph_id, ot.*
|
|
FROM graph_templates_item AS gti
|
|
INNER JOIN data_template_rrd AS dtr
|
|
ON gti.task_item_id = dtr.id
|
|
INNER JOIN $table AS ot
|
|
ON dtr.local_data_id = ot.local_data_id
|
|
WHERE ot.rrd_name = " . db_qstr($sql_order['data_source']) . "
|
|
AND ot.cf = $cf
|
|
) AS rs
|
|
ON gl.id = rs.local_graph_id";
|
|
|
|
return [$sql_order_join, get_dsstats_order_string($sql_order)];
|
|
}
|
|
|
|
test('malicious data_source is escaped, not concatenated, in the dsstats JOIN clause', function () {
|
|
[$join] = build_dsstats_order_fragment([
|
|
'start_time' => time(),
|
|
'end_time' => time(),
|
|
'data_source' => "traffic_in' AND 1=(SELECT password FROM user_auth LIMIT 1)-- ",
|
|
'cf' => 'avg',
|
|
'measure' => 'average',
|
|
'order' => 'asc',
|
|
]);
|
|
|
|
// db_qstr() must have backslash-escaped the embedded quote so the
|
|
// payload stays inside the string literal instead of closing it.
|
|
expect($join)->toContain("\\'")
|
|
->and($join)->not->toContain("rrd_name = 'traffic_in' AND");
|
|
});
|
|
|
|
test('malicious measure/order survive the full order-fragment build as a safe clause', function () {
|
|
[, $order] = build_dsstats_order_fragment([
|
|
'start_time' => time(),
|
|
'end_time' => time(),
|
|
'data_source' => 'traffic_in',
|
|
'cf' => 'avg',
|
|
'measure' => '1) UNION SELECT password FROM user_auth-- ',
|
|
'order' => 'asc; DROP TABLE user_auth-- ',
|
|
]);
|
|
|
|
expect($order)->toBe('ORDER BY rs.average ASC')
|
|
->and($order)->not->toContain('UNION')
|
|
->and($order)->not->toContain('DROP')
|
|
->and($order)->not->toContain(';');
|
|
});
|
|
|
|
test('a quote-breakout data_source combined with a statement-terminator measure stays inert in both halves of the fragment', function () {
|
|
[$join, $order] = build_dsstats_order_fragment([
|
|
'start_time' => time(),
|
|
'end_time' => time(),
|
|
'data_source' => "x'; DROP TABLE user_auth; -- ",
|
|
'cf' => 'max',
|
|
'measure' => 'p95n; DROP TABLE user_auth-- ',
|
|
'order' => 'desc',
|
|
]);
|
|
|
|
// db_qstr() escapes the embedded quote, so "DROP TABLE" stays inert
|
|
// string data inside 'x\'; DROP TABLE user_auth; -- ' rather than
|
|
// breaking out into executable SQL. What must NOT happen is an
|
|
// *unescaped* quote reaching the JOIN, or the measure's payload
|
|
// reaching the ORDER BY at all.
|
|
expect($join)->toContain("x\\'; DROP TABLE user_auth; -- ")
|
|
->and($join)->not->toContain("rrd_name = 'x';");
|
|
|
|
expect($order)->toBe('ORDER BY rs.average DESC')
|
|
->and($order)->not->toContain('DROP')
|
|
->and($order)->not->toContain(';');
|
|
});
|
|
|
|
test('lib/auth.php builds the dsstats ORDER BY via get_dsstats_order_string(), not raw concatenation', function () {
|
|
$contents = file_get_contents(dirname(__DIR__, 2) . '/lib/auth.php');
|
|
|
|
expect($contents)->toContain('get_dsstats_order_string($sql_order)')
|
|
->and($contents)->not->toContain("'ORDER BY rs.' . \$sql_order['measure']");
|
|
});
|