mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-30 08:37:01 +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.
120 lines
4.5 KiB
PHP
120 lines
4.5 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 |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/*
|
|
* Tests for the rrdtool_function_graph() file-existence early return.
|
|
*
|
|
* Prior to the fix for issue #6530, the early return when an RRD file
|
|
* did not exist was gated on export_realtime or export_csv mode:
|
|
*
|
|
* if (!rrdtool_file_exists(...) && (isset(...'export_realtime']) || isset(...'export_csv']))) {
|
|
*
|
|
* This meant normal graph rendering would skip the check and fall through
|
|
* to rrdtool execution, which retried 5 times before failing. For new
|
|
* graphs where the poller hasn't run yet, this caused unnecessary delays.
|
|
*
|
|
* The fix simplifies the condition to apply to all rendering modes:
|
|
*
|
|
* if (!rrdtool_file_exists(...)) {
|
|
*
|
|
* These tests verify the fix by scanning the source code of lib/rrd.php.
|
|
*
|
|
* See: https://github.com/Cacti/cacti/issues/6530
|
|
*/
|
|
|
|
// --- source scanning helper ---
|
|
|
|
function getRrdFileExistsBlock(): string {
|
|
$rrdPhp = file_get_contents(__DIR__ . '/../../../../lib/rrd.php');
|
|
expect($rrdPhp)->not->toBeFalse('Failed to read lib/rrd.php');
|
|
|
|
/* extract the rrdtool_function_graph function body */
|
|
$start = strpos($rrdPhp, 'function rrdtool_function_graph(');
|
|
expect($start)->not->toBeFalse('rrdtool_function_graph() must exist in lib/rrd.php');
|
|
|
|
/* grab a region around the file-existence check (lines 1800-1850 area) */
|
|
$region = substr($rrdPhp, $start, 20000);
|
|
|
|
return $region;
|
|
}
|
|
|
|
// --- the condition no longer restricts the check to export_realtime/export_csv ---
|
|
|
|
test('file existence check does not reference export_realtime or export_csv', function () {
|
|
$source = getRrdFileExistsBlock();
|
|
|
|
/*
|
|
* Find the rrdtool_file_exists call and its surrounding if-statement.
|
|
* The old code had: !rrdtool_file_exists(...) && (isset(...export_realtime...
|
|
* The fix removes the && clause entirely.
|
|
*/
|
|
$pattern = '/if\s*\(\s*!rrdtool_file_exists\([^)]+\)\s*&&\s*\(isset\(\$graph_data_array\[.export_realtime.\]\)/';
|
|
|
|
expect(preg_match($pattern, $source))->toBe(0,
|
|
'The export_realtime/export_csv gate should have been removed from the file-existence check'
|
|
);
|
|
});
|
|
|
|
// --- the source contains the simplified condition ---
|
|
|
|
test('file existence check uses simplified unconditional form', function () {
|
|
$source = getRrdFileExistsBlock();
|
|
|
|
/*
|
|
* The fixed code should contain a clean check:
|
|
* if (!rrdtool_file_exists($data_source_path, $rrdtool_pipe)) {
|
|
* return false;
|
|
* }
|
|
* Match the if-line without any && continuation.
|
|
*/
|
|
$pattern = '/if\s*\(\s*!rrdtool_file_exists\(\$data_source_path,\s*\$rrdtool_pipe\)\s*\)\s*\{/';
|
|
|
|
expect(preg_match($pattern, $source))->toBe(1,
|
|
'The file-existence check should be a simple unconditional test'
|
|
);
|
|
});
|
|
|
|
// --- the early return pattern applies to all rendering modes ---
|
|
|
|
test('file existence check block contains an unconditional return false', function () {
|
|
$source = getRrdFileExistsBlock();
|
|
|
|
/*
|
|
* Verify the pattern: the unconditional file-existence check block
|
|
* contains a return false. The block may also contain a log call before
|
|
* the return, so match anything inside the braces up to return false.
|
|
*/
|
|
$pattern = '/if\s*\(\s*!rrdtool_file_exists\(\$data_source_path,\s*\$rrdtool_pipe\)\s*\)\s*\{[\s\S]*?return\s+false;/s';
|
|
|
|
expect(preg_match($pattern, $source))->toBe(1,
|
|
'return false must be present in the file-existence check block'
|
|
);
|
|
});
|
|
|
|
// --- negative: the old gated pattern must not appear anywhere in the function ---
|
|
|
|
test('no rrdtool_file_exists call is gated by export mode checks', function () {
|
|
$source = getRrdFileExistsBlock();
|
|
|
|
/*
|
|
* Broader check: no rrdtool_file_exists usage should be combined
|
|
* with export_realtime or export_csv via && in the same condition.
|
|
*/
|
|
$pattern = '/rrdtool_file_exists\b.*&&.*export_(realtime|csv)/';
|
|
|
|
expect(preg_match($pattern, $source))->toBe(0,
|
|
'No file-existence check should be gated by export mode'
|
|
);
|
|
});
|