mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-23 03:27:02 +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>
245 lines
7.0 KiB
PHP
245 lines
7.0 KiB
PHP
#!/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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
// let's report all errors
|
|
error_reporting(E_ALL);
|
|
|
|
require(__DIR__ . '/include/cli_check.php');
|
|
|
|
// allow the script to hang around waiting for connections.
|
|
set_time_limit(0);
|
|
chdir(__DIR__);
|
|
|
|
// translate well-known textual conventions and SNMP base types to net-snmp
|
|
$smi_base_datatypes = [
|
|
'integer' => 'INTEGER',
|
|
'integer32' => 'Integer32',
|
|
'unsigned32' => 'Unsigned32',
|
|
'gauge' => 'Gauge',
|
|
'gauge32' => 'Gauge32',
|
|
'counter' => 'Counter',
|
|
'counter32' => 'Counter32',
|
|
'counter64' => 'Counter64',
|
|
'timeticks' => 'TimeTicks',
|
|
'octet string' => 'OCTET STRING',
|
|
'opaque' => 'Opaque',
|
|
'object identifier' => 'OBJECT IDENTIFIER',
|
|
'ipaddress' => 'IpAddress',
|
|
'networkaddress' => 'IpAddress',
|
|
'bits' => 'OCTET STRING',
|
|
'displaystring' => 'STRING',
|
|
'physaddress' => 'OCTET STRING',
|
|
'macaddress' => 'OCTET STRING',
|
|
'truthvalue' => 'INTEGER',
|
|
'testandincr' => 'Integer32',
|
|
'autonomoustype' => 'OBJECT IDENTIFIER',
|
|
'variablepointer' => 'OBJECT IDENTIFIER',
|
|
'rowpointer' => 'OBJECT IDENTIFIER',
|
|
'rowstatus' => 'INTEGER',
|
|
'timestamp' => 'TimeTicks',
|
|
'timeinterval' => 'Integer32',
|
|
'dateandtime' => 'STRING',
|
|
'storagetype' => 'INTEGER',
|
|
'tdomain' => 'OBJECT IDENTIFIER',
|
|
'taddress' => 'OCTET STRING'
|
|
];
|
|
|
|
$data = false;
|
|
$eol = "\n";
|
|
$cache = [];
|
|
$cache_last_refresh = false;
|
|
|
|
// process command line options
|
|
get_options();
|
|
|
|
// start background caching process if not running
|
|
$php = cacti_escapeshellcmd((string) read_config_option('path_php_binary'));
|
|
$extra_args = '-q ' . cacti_escapeshellarg('./snmpagent_mibcache.php');
|
|
|
|
if (cacti_strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
|
|
// windows part missing
|
|
pclose(popen('start "CactiSNMPCache" /I /B ' . $php . ' ' . $extra_args, 'r'));
|
|
} else {
|
|
exec('ps -ef | grep -v grep | grep -v "sh -c" | grep snmpagent_mibcache.php', $output);
|
|
|
|
if (!cacti_sizeof($output)) {
|
|
exec($php . ' ' . $extra_args . ' > /dev/null &');
|
|
}
|
|
}
|
|
|
|
// activate circular reference collector
|
|
gc_enable();
|
|
|
|
while (true) {
|
|
$input = trim((string) fgets(STDIN));
|
|
|
|
switch($input) {
|
|
case '':
|
|
exit(0);
|
|
case 'PING':
|
|
fwrite(STDOUT, 'PONG' . $eol);
|
|
cache_refresh();
|
|
|
|
break;
|
|
case 'get':
|
|
$oid = trim((string) fgets(STDIN));
|
|
|
|
if ($data = cache_read($oid)) {
|
|
fwrite(STDOUT, $oid . $eol . (isset($smi_base_datatypes[$data['type']]) ? $smi_base_datatypes[$data['type']] : 'INTEGER') . $eol . $data['value'] . $eol);
|
|
} else {
|
|
fwrite(STDOUT, 'NONE' . $eol);
|
|
}
|
|
|
|
break;
|
|
case 'getnext':
|
|
$oid = trim((string) fgets(STDIN));
|
|
|
|
if ($next_oid = cache_get_next($oid)) {
|
|
if ($data = cache_read($next_oid)) {
|
|
fwrite(STDOUT, $next_oid . $eol . (isset($smi_base_datatypes[$data['type']]) ? $smi_base_datatypes[$data['type']] : 'INTEGER') . $eol . $data['value'] . $eol);
|
|
} else {
|
|
fwrite(STDOUT, 'NONE' . $eol);
|
|
}
|
|
} else {
|
|
fwrite(STDOUT, 'NONE' . $eol);
|
|
}
|
|
|
|
break;
|
|
case 'debug':
|
|
fwrite(STDOUT, print_r($cache, true));
|
|
|
|
break;
|
|
case 'shutdown':
|
|
fwrite(STDOUT, 'BYE' . $eol);
|
|
|
|
exit(0);
|
|
}
|
|
}
|
|
|
|
function cache_read(string $oid) : mixed {
|
|
global $cache;
|
|
|
|
return (isset($cache[$oid]) && $cache[$oid]) ? $cache[$oid] : false;
|
|
}
|
|
|
|
function cache_get_next(string $oid) : mixed {
|
|
global $cache;
|
|
|
|
return (isset($cache[$oid]['next'])) ? $cache[$oid]['next'] : false;
|
|
}
|
|
|
|
function cache_refresh() : void {
|
|
global $cache, $cache_last_refresh;
|
|
|
|
$path_mibcache = CACTI_PATH_CACHE . '/mibcache/mibcache.tmp';
|
|
$path_mibcache_lock = CACTI_PATH_CACHE . '/mibcache/mibcache.lock';
|
|
|
|
// check temporary cache file
|
|
clearstatcache();
|
|
$cache_refresh_time = @filemtime($path_mibcache);
|
|
|
|
if ($cache_refresh_time !== false) {
|
|
// initial phase
|
|
if ($cache_last_refresh === false || $cache_refresh_time > $cache_last_refresh) {
|
|
while (is_file($path_mibcache_lock) !== false) {
|
|
sleep(1);
|
|
clearstatcache();
|
|
}
|
|
|
|
$cache = null;
|
|
|
|
gc_collect_cycles();
|
|
|
|
$cache_last_refresh = $cache_refresh_time;
|
|
|
|
require($path_mibcache);
|
|
}
|
|
}
|
|
}
|
|
|
|
function get_options() : array {
|
|
$parms = $_SERVER['argv'];
|
|
array_shift($parms);
|
|
|
|
$options = [];
|
|
|
|
if (sizeof($parms)) {
|
|
$shortopts = 'VvHh';
|
|
|
|
$longopts = [
|
|
'foreground',
|
|
'debug',
|
|
'version',
|
|
'help'
|
|
];
|
|
|
|
$options = getopt($shortopts, $longopts);
|
|
|
|
foreach ($options as $arg => $value) {
|
|
switch($arg) {
|
|
case 'foreground':
|
|
case 'debug':
|
|
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 Argument: ($arg)" . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
return $options;
|
|
}
|
|
|
|
function display_version() : void {
|
|
$version = get_cacti_cli_version();
|
|
print 'The Cacti SNMP Agent Daemon, Version ' . $version . ', ' . COPYRIGHT_YEARS . PHP_EOL;
|
|
}
|
|
|
|
// display_help - displays the usage of the function
|
|
function display_help() : void {
|
|
display_version();
|
|
|
|
print PHP_EOL . 'usage: snmpagenet_persist.php' . PHP_EOL . PHP_EOL;
|
|
print 'Daemon for the Cacti SNMP Agent. Launch this daemon using' . PHP_EOL;
|
|
print 'systemctl to allow Cacti to respond to SNMP requests from' . PHP_EOL;
|
|
print 'upstream montiring systems. This is a persistent daemon,' . PHP_EOL;
|
|
print 'so care must be taken in systemd to define it as such.' . PHP_EOL . PHP_EOL;
|
|
}
|