mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-30 00:26:50 +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>
224 lines
6.8 KiB
PHP
Executable File
224 lines
6.8 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
require(__DIR__ . '/../include/cli_check.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_data_source.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_graph.php');
|
|
|
|
// switch to main database for cli's
|
|
if (POLLER_ID > 1) {
|
|
db_switch_remote_to_main();
|
|
}
|
|
|
|
// process calling arguments
|
|
$parms = $_SERVER['argv'];
|
|
array_shift($parms);
|
|
|
|
global $debug;
|
|
|
|
$debug = false;
|
|
$report = false;
|
|
$remove = false;
|
|
$columns = 80;
|
|
|
|
if (CACTI_SERVER_OS == 'unix' && stream_isatty(STDIN)) {
|
|
$stty = shell_exec('stty size');
|
|
$sizes = explode(' ', (string) $stty);
|
|
|
|
if (!empty($sizes[1])) {
|
|
$columns = $sizes[1];
|
|
}
|
|
}
|
|
|
|
if (cacti_sizeof($parms)) {
|
|
foreach ($parms as $parameter) {
|
|
if (str_contains($parameter, '=')) {
|
|
[$arg, $value] = explode('=', $parameter, 2);
|
|
} else {
|
|
$arg = $parameter;
|
|
$value = '';
|
|
}
|
|
|
|
switch ($arg) {
|
|
case '--debug':
|
|
$debug = true;
|
|
|
|
break;
|
|
case '--report':
|
|
$report = true;
|
|
|
|
break;
|
|
case '--remove':
|
|
$remove = true;
|
|
|
|
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 . "\n\n";
|
|
display_help();
|
|
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
if ($report && $remove) {
|
|
print 'ERROR: The options --report and --remove are mutually exclusive' . PHP_EOL;
|
|
display_help();
|
|
|
|
exit(1);
|
|
}
|
|
|
|
if (!$report && !$remove) {
|
|
$report = true;
|
|
}
|
|
|
|
print 'Running Query to find Broken Graphs. This Query may run for some time depending the number of Graph in your System' . PHP_EOL;
|
|
|
|
$sql = "SELECT name, graph_template_id, graphs, local_graph_ids
|
|
FROM (
|
|
SELECT graph_template_id, GROUP_CONCAT(DISTINCT local_graph_id SEPARATOR ', ') AS local_graph_ids, COUNT(DISTINCT local_graph_id) AS graphs
|
|
FROM graph_templates_item
|
|
WHERE local_graph_id > 0
|
|
AND graph_template_id > 0
|
|
AND task_item_id > 0
|
|
AND task_item_id NOT IN (
|
|
SELECT id
|
|
FROM data_template_rrd
|
|
WHERE local_data_id > 0
|
|
)
|
|
GROUP BY graph_template_id
|
|
) AS gti
|
|
INNER JOIN graph_templates AS gt
|
|
ON gt.id = gti.graph_template_id";
|
|
|
|
$entries = db_fetch_assoc($sql);
|
|
|
|
if (cacti_sizeof($entries)) {
|
|
print 'There are ' . cacti_sizeof($entries) . ' Graph Templates with Broken Graphs.' . PHP_EOL;
|
|
} else {
|
|
print 'There are no Graph Templates with Broken Graphs.' . PHP_EOL;
|
|
}
|
|
|
|
if (cacti_sizeof($entries)) {
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
|
|
if ($report) {
|
|
print 'Broken Graph Report' . PHP_EOL;
|
|
} else {
|
|
print 'Broken Graph Report Removal' . PHP_EOL;
|
|
}
|
|
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
|
|
foreach ($entries as $e) {
|
|
if ($report) {
|
|
printf('Graph Template: %s, Contains \'%s\' broken Graphs' . PHP_EOL, $e['name'], $e['graphs']);
|
|
|
|
print 'Graphs:' . PHP_EOL;
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
print wordwrap($e['local_graph_ids'], $columns - 5, PHP_EOL) . PHP_EOL;
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
} else {
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
|
|
$local_graph_ids = explode(', ', $e['local_graph_ids']);
|
|
|
|
printf('Started removing \'%s\' broken Graphs for Graph Template %s' . PHP_EOL, $e['graphs'], $e['name']);
|
|
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
|
|
if (cacti_sizeof($local_graph_ids)) {
|
|
foreach ($local_graph_ids as $local_graph_id) {
|
|
$local_graph_id = intval($local_graph_id);
|
|
|
|
$title = get_graph_title_cache($local_graph_id);
|
|
|
|
printf('Removing Graph %s, "%s"' . PHP_EOL, $title, $local_graph_id);
|
|
|
|
$id = [];
|
|
$id[$local_graph_id] = $local_graph_id;
|
|
|
|
api_delete_graphs($id, 2);
|
|
}
|
|
}
|
|
|
|
print '-------------------------------------------------------------------------------------' . PHP_EOL;
|
|
|
|
printf('Completed removing Graphs for Graph Template %s' . PHP_EOL, $e['name']);
|
|
}
|
|
}
|
|
}
|
|
|
|
function debug(string $message) : void {
|
|
global $debug;
|
|
|
|
if ($debug) {
|
|
print date('H:i:s') . ' DEBUG: ' . trim($message) . PHP_EOL;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* display_version - displays version information
|
|
*
|
|
* @return void
|
|
*/
|
|
function display_version() : void {
|
|
$version = get_cacti_cli_version();
|
|
print "Cacti Remove Broken Graphs Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
|
|
}
|
|
|
|
/**
|
|
* display_help - displays the usage of the function
|
|
*
|
|
* @return void
|
|
*/
|
|
function display_help() : void {
|
|
display_version();
|
|
|
|
print PHP_EOL . 'usage: remove_broken_graphs.php [--report | --remove] [-d|--debug]' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'A utility to remove broken graphs from Cacti. A broken Graph is one that.' . PHP_EOL;
|
|
print 'lacks Data Sources. This can happen from time to time when working with and modifying templates.' . PHP_EOL;
|
|
print 'It\'s important to periodically run this utility especially on larger systems.' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'Optional:' . PHP_EOL;
|
|
print '--report - Display the Graph Templates and Count of Broken Graphs' . PHP_EOL;
|
|
print '--remove - Remove the Broken Graphs as Reported using the --report Option' . PHP_EOL;
|
|
print '--debug - Display verbose output during execution' . PHP_EOL . PHP_EOL;
|
|
}
|