mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-28 15:47:39 +09:00
* PHPStan Level 8 - Phase 1 Conversion
Reduces the real (no-baseline) PHPStan level 8 error count from ~2,724 to 425
and regenerates phpstan-baseline.neon accordingly (8,941 -> 1,921 lines).
Core type-safety changes
- lib/database.php: narrow db_fetch_row()/db_fetch_row_prepared() to return
array (was bool|array) and db_fetch_assoc()/db_fetch_assoc_prepared() to
return array (was mixed); the _prepared workers coerce the connection-failure
path to an empty array so the declared type is honest. empty()/cacti_sizeof()
checks are unaffected.
- lib/database.php: narrow $db_conn guards from is_object() to instanceof PDO in
the transaction/quote/insert-id helpers so the PDO calls resolve.
- lib/mib_cache.php: the fluent MibCache methods mib()/object()/table()/row()
now return self instead of a bare object so chained calls type-check.
Type-safety casts and guards (mechanical, behaviour-preserving)
- Cast string|false/|null builtin results feeding string parameters
(json_decode, base64_encode, trim, htmle, preg_replace, explode, etc.).
- Cast int|string / int|false values feeding int id/pid parameters.
- Guard resource|false fopen()/popen() handles before fwrite/fclose/fread, and
wrap foreach over array|false/list|false results with `?: []`.
Genuine bugs found and fixed
- cli/add_tree.php / lib/api_tree.php: site tree nodes could not be created via
the CLI - the --site-id option was never parsed, $nodeTypes had no 'site'
entry (passing null to api_tree_item_save(int $type) -> TypeError), and
api_tree_item_save() never persisted site_id. All three fixed.
- tree.php: leaves_exist() is typed : int but returned db_fetch_assoc_prepared()
(an array of rows) for a SELECT COUNT(*); now uses db_fetch_cell_prepared()
and returns the scalar count.
- lib/mib_cache.php: $entries_per_object was a float (division / ceil) used as
an array key (PHP 8.1 implicit float-to-int key deprecation); now cast to int.
Config
- .phpstan.neon: add notIdentical.alwaysTrue and booleanAnd.alwaysFalse to the
existing always-true/false ignore family (same "PHPStan gets confused"
dynamic-constant cause already covered by identical.alwaysTrue,
notEqual.alwaysTrue, booleanAnd.leftAlwaysTrue, etc.).
- phpstan-baseline.neon: regenerated; the remaining 425 entries are the
untouched long tail for Phase 2.
* Remove redundant @phpstan-ignore comments
Follow-up cleanup for the level 8 Phase 1 work. Removes 14 inline
@phpstan-ignore comments that no longer suppress any reported error:
- cli/repair_database.php: `@phpstan-ignore booleanAnd.alwaysFalse` is now
covered by the global booleanAnd.alwaysFalse ignore added to .phpstan.neon.
- 13 others (host.php, include/global.php, include/session.php,
lib/api_automation.php x2, lib/functions.php x2, lib/html_utility.php x2,
lib/installer.php, lib/package.php, lib/reports.php, lib/rrd.php) no longer
match any reported error after the type-safety fixes (e.g. the
db_fetch_row_prepared() return-type narrowing removed the offset-assign
errors the api_automation ignores were suppressing).
Verified with reportUnmatchedIgnoredErrors enabled: 0 unmatched ignores
remain and the full level 8 run still reports 0 errors.
* ci: satisfy validator ratchet and refresh security sink baselines
- lib/api_tree.php: give the new tree-item site_id a real numeric
constraint ('^[-0-9]+$', matching html_reports.php) instead of an
empty regex, so the validator constraint ratchet passes without
bumping its baseline.
- tests/security/baselines: refresh the three sink/hotspot signatures
whose code text changed from the (string) casts added in this branch
(lib/poller.php setsid, cli/rrdresize.php json_encode, lib/import.php
simplexml_load_string).
* ci(js): allow DOMPurify 3.4.16 and update sync_js pin test
The dependabot bump (#8134) moved package.json/package-lock.json to
DOMPurify 3.4.16 on develop but left tests/js/sync_js.test.mjs pinned to
3.4.15, so the PR merge commit fails the 'DOMPurify is pinned' contract.
Bring package.json/package-lock.json to 3.4.16 (matching develop) and
update the pin test to expect 3.4.16.
* test: update sql.php null-handling assertion for the (string) cast
This branch changed scripts/sql.php from trim(\ ?? '') to
trim((string) \) (the phpstan-safe form that coerces both null and
false from shell_exec()). Update SqlScriptsTest's null-return assertion
to match the new cast instead of the removed '?? ''.
* fix: address Copilot review - ownership IDs, fopen guards, mib_cache bound
- chown()/chgrp(): pass integer UID/GID from fileowner()/filegroup()
(guarding the false lookup) instead of string-casting them, which made
them resolve account/group names like '1001' and fail. Covers
lib/api_device.php, lib/boost.php and poller_maintenance.php (x2).
- fopen() failure now short-circuits instead of reporting success:
lib/package.php returns false, lib/clog_webapi.php and utilities.php
render an error, and snmpagent_mibcachechild.php skips the cache write
and sentinel unlink so a concurrent writer's lock is preserved.
- lib/mib_cache.php: keep the float quotient as the loop bound and cast
only the array offset, so a non-even entries/columns split no longer
truncates the loop and drops a cached row.
* revert: keep db_fetch_* returning false on error; baseline Level 8 instead
Per review, restoring the intentional fail-safe: db_fetch_row[_prepared]()
return bool|array and db_fetch_assoc[_prepared]() return mixed again, so a
genuine SQL error (not just a missing connection) is signalled as false and
the === false checks in cdef_is_in_use(), boost_process_* and aggregate.php
work as before. Dropped the is_array() ? : [] coercion.
Level 8 stays green by regenerating phpstan-baseline.neon to capture the
re-introduced bool|array/mixed call-site errors (the ~1,850 the narrowing
had eliminated). Tightening those callers to drop them from the baseline is
Phase 2 work.
---------
Co-authored-by: TheWitness <copilot@users.noreply.github.com>
297 lines
8.3 KiB
PHP
Executable File
297 lines
8.3 KiB
PHP
Executable File
#!/usr/bin/env 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. |
|
|
| |
|
|
| This program is distributed in the hope that it will be useful, |
|
|
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
| GNU General Public License for more details. |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
| This code is designed, written, and maintained by the Cacti Group. See |
|
|
| about.php and/or the AUTHORS file for specific developer information. |
|
|
+-------------------------------------------------------------------------+
|
|
| http://www.cacti.net/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
if (function_exists('pcntl_async_signals')) {
|
|
pcntl_async_signals(true);
|
|
} else {
|
|
declare(ticks = 100);
|
|
}
|
|
|
|
ini_set('output_buffering', 'Off');
|
|
|
|
require(__DIR__ . '/include/cli_check.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/poller.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/rrd.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/rrdcheck.php');
|
|
|
|
// process calling arguments
|
|
$parms = $_SERVER['argv'];
|
|
array_shift($parms);
|
|
|
|
$debug = false;
|
|
$forcerun = false;
|
|
$type = 'pmaster';
|
|
$thread_id = 0;
|
|
|
|
global $rrd_files, $total_system, $total_user, $total_real, $total_dsses;
|
|
global $user_time, $system_time, $real_time;
|
|
|
|
$total_system = 0;
|
|
$total_user = 0;
|
|
$total_real = 0;
|
|
$total_dsses = 0;
|
|
|
|
$system_time = 0;
|
|
$user_time = 0;
|
|
$real_time = 0;
|
|
|
|
$rrd_files = 0;
|
|
|
|
if (cacti_sizeof($parms)) {
|
|
foreach ($parms as $parameter) {
|
|
if (str_contains($parameter, '=')) {
|
|
[$arg, $value] = explode('=', $parameter, 2);
|
|
} else {
|
|
$arg = $parameter;
|
|
$value = '';
|
|
}
|
|
|
|
switch ($arg) {
|
|
case '-d':
|
|
case '--debug':
|
|
$debug = true;
|
|
|
|
break;
|
|
case '-f':
|
|
case '--force':
|
|
$forcerun = true;
|
|
|
|
break;
|
|
case '--type':
|
|
$type = $value;
|
|
|
|
break;
|
|
case '--child':
|
|
$thread_id = $value;
|
|
|
|
break;
|
|
case '--version':
|
|
case '-v':
|
|
case '-V':
|
|
display_version();
|
|
|
|
exit(0);
|
|
case '--help':
|
|
case '-h':
|
|
case '-H':
|
|
display_help();
|
|
|
|
exit(0);
|
|
|
|
default:
|
|
print 'ERROR: Invalid Parameter ' . $parameter . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Types include
|
|
*
|
|
* pmaster - the main process launched from the Cacti main poller and will launch child processes
|
|
* pchild - a child of the master process from the 'master'
|
|
*
|
|
* bmaster - a boost master process, will perform launch bchild processes
|
|
* bchild - a child of the boost master process, will launch boost collection
|
|
*/
|
|
|
|
// install signal handlers for UNIX only
|
|
if (function_exists('pcntl_signal')) {
|
|
pcntl_signal(SIGTERM, 'sig_handler');
|
|
pcntl_signal(SIGINT, 'sig_handler');
|
|
}
|
|
|
|
// take time and log performance data
|
|
$start = microtime(true);
|
|
|
|
$timeout = intval(read_config_option('rrdcheck_timeout'));
|
|
|
|
// let's give this script lot of time to run for ever
|
|
ini_set('max_execution_time', '0');
|
|
|
|
// send a gentle message to the log and stdout
|
|
rrdcheck_debug('Polling Starting');
|
|
|
|
// silently end if the registered process is still running
|
|
if (!$forcerun) {
|
|
if (!register_process_start('rrdcheck', $type, $thread_id, $timeout)) {
|
|
exit(0);
|
|
}
|
|
}
|
|
|
|
// Collect data as determined by the type
|
|
switch ($type) {
|
|
case 'pmaster':
|
|
if (read_config_option('rrdcheck_enable') == 'on' || $forcerun) {
|
|
rrdcheck_master_handler($forcerun);
|
|
}
|
|
|
|
break;
|
|
case 'bmaster': // Launched at the end of boost
|
|
rrdcheck_launch_children($type);
|
|
|
|
// Wait for all processes to continue
|
|
while ($running = rrdcheck_processes_running($type)) {
|
|
rrdcheck_debug(sprintf('%s Processes Running, Sleeping for 2 seconds.', $running));
|
|
sleep(2);
|
|
}
|
|
|
|
break;
|
|
case 'child': // Launched by the master process
|
|
case 'bchild': // Launched by the boost process
|
|
$child_start = microtime(true);
|
|
|
|
do_rrdcheck($thread_id);
|
|
|
|
$total_time = microtime(true) - $child_start;
|
|
|
|
rrdcheck_log_child_stats($type, $thread_id, $total_time);
|
|
|
|
break;
|
|
}
|
|
|
|
rrdcheck_debug('Polling Ending');
|
|
|
|
set_config_option('rrdcheck_last_run_time', time());
|
|
|
|
if (!$forcerun) {
|
|
unregister_process('rrdcheck', $type, (int) $thread_id);
|
|
}
|
|
|
|
exit(0);
|
|
|
|
function rrdcheck_master_handler(bool $forcerun = false) : void {
|
|
global $type;
|
|
|
|
// read some important settings relative to timing from the database
|
|
$run_interval = read_config_option('rrdcheck_interval');
|
|
|
|
$last_run = read_config_option('rrdcheck_last_run_time');
|
|
|
|
// see if boost is active or not
|
|
$boost_active = read_config_option('boost_rrd_update_enable');
|
|
|
|
// next let's see if it's time to update the interval
|
|
$current_time = time();
|
|
|
|
if ($boost_active == 'on') {
|
|
// boost will spawn the collector
|
|
rrdcheck_debug('Skipping Periodic Rollup - Boost will handle the Periodic Roll-up Cycle');
|
|
} else {
|
|
if ($run_interval == 'boost') {
|
|
cacti_log("WARNING: RRDcheck interval set to 'boost' and boost not enabled, resetting to default of 4 hours", false, 'RRDCHECK');
|
|
|
|
set_config_option('rrdcheck_interval', 240);
|
|
|
|
$run_interval = 240;
|
|
}
|
|
|
|
// determine if it's time to determine hourly averages
|
|
if (empty($last_run)) {
|
|
// since the poller has never run before, let's fake it out
|
|
set_config_option('rrdcheck_last_run_time', ($current_time - 86400));
|
|
}
|
|
|
|
// if it's time to check, do so now
|
|
if ((!empty($last_run) && (($last_run + ($run_interval * 60)) < $current_time)) || $forcerun) {
|
|
rrdcheck_launch_children($type);
|
|
|
|
// Wait for all processes to continue
|
|
while ($running = rrdcheck_processes_running($type)) {
|
|
rrdcheck_debug(sprintf('%s Processes Running, Sleeping for 2 seconds.', $running));
|
|
sleep(2);
|
|
}
|
|
|
|
// delete old data
|
|
db_execute('DELETE FROM rrdcheck WHERE test_date < DATE_SUB(NOW(), INTERVAL 7 DAY)');
|
|
|
|
rrdcheck_log_statistics('HOURLY');
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* display_version - displays version information
|
|
*/
|
|
function display_version() : void {
|
|
$version = get_cacti_cli_version();
|
|
print "Cacti RRD Check Poller, Version $version " . COPYRIGHT_YEARS . PHP_EOL;
|
|
}
|
|
|
|
/**
|
|
* display_help - generic help screen for utilities
|
|
*/
|
|
function display_help() : void {
|
|
display_version();
|
|
|
|
print PHP_EOL . 'usage: poller_rrdcheck.php [--force] [--debug]' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'Cacti\'s RRD check poller. This poller will periodically' . PHP_EOL;
|
|
print 'check rrdfiles and saved datasources and works in conjunction' . PHP_EOL;
|
|
print 'with Cacti\'s performance boosting poller as required.' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'System Controlled:' . PHP_EOL;
|
|
print ' --type - The type and subtype of the rrdcheck process' . PHP_EOL;
|
|
print ' --child - The thread id of the child process' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'Optional:' . PHP_EOL;
|
|
print ' --force - Force the execution of a update process' . PHP_EOL;
|
|
print ' --debug - Display verbose output during execution' . PHP_EOL . PHP_EOL;
|
|
}
|
|
|
|
/**
|
|
* sig_handler - provides a generic means to catch exceptions to the Cacti log.
|
|
*
|
|
* @param int $signo - The signal that was thrown by the interface.
|
|
*
|
|
* @return void
|
|
*/
|
|
function sig_handler(int $signo) : void {
|
|
global $type, $thread_id;
|
|
|
|
switch ($signo) {
|
|
case SIGTERM:
|
|
case SIGINT:
|
|
cacti_log('WARNING: rrdcheck Poller terminated by user', false, 'RRDCHECK');
|
|
|
|
// tell the main poller that we are done
|
|
if ($type == 'master') {
|
|
set_config_option('rrdcheck_poller_status', 'terminated - end time:' . date('Y-m-d G:i:s'));
|
|
}
|
|
|
|
if (str_contains($type, 'master')) {
|
|
rrdcheck_kill_running_processes();
|
|
}
|
|
|
|
unregister_process('rrdcheck', $type, $thread_id, (int) getmypid());
|
|
|
|
exit(1);
|
|
default:
|
|
// ignore all other signals
|
|
}
|
|
}
|