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>
110 lines
2.8 KiB
PHP
110 lines
2.8 KiB
PHP
<?php
|
|
|
|
/**
|
|
* Original Template by ApacheStats 0.8.2 by RCK - http://forums.cacti.net/about25227.html
|
|
* Tested and packaged for Cacti 1.2.x by Sean Mancini - bmfmancini - www.seanmancini.com
|
|
*/
|
|
|
|
if (!isset($called_by_script_server)) {
|
|
include_once(__DIR__ . '/../include/cli_check.php');
|
|
include_once(__DIR__ . '/../lib/snmp.php');
|
|
|
|
array_shift($_SERVER['argv']);
|
|
|
|
print call_user_func_array('ss_apache_stats', $_SERVER['argv']);
|
|
}
|
|
|
|
function ss_apache_stats(string $host = '', string $section = 'all') : mixed {
|
|
// perform initial error checking
|
|
if (empty($host)) {
|
|
cacti_log('ERROR: ApacheStats08 - Host parameter missing, can not continue');
|
|
}
|
|
|
|
$variables = ['apache_total_hits', 'apache_total_kbytes', 'apache_busy_workers', 'apache_idle_workers', 'apache_cpuload'];
|
|
$threads = ['_W' => 0, 'S' => 0, 'R'=>0, 'W'=>0, 'K'=>0, 'D'=>0, 'C'=>0, 'L'=>0, 'G'=>0, 'I'=>0, '_O'=>0];
|
|
/* ***Types of Threads***
|
|
_W --- waiting
|
|
S --- starting up
|
|
R --- reading request
|
|
W --- sending reply
|
|
K --- keepalive
|
|
D --- DNS lookup
|
|
C --- closing connection
|
|
L --- logging
|
|
G --- graceful finishing
|
|
I --- idle cleanup
|
|
_O --- open slot
|
|
*/
|
|
$url = "http://$host/server-status?auto";
|
|
$result = file_get_contents($url);
|
|
$array_result = [];
|
|
$array_result = explode("\n",(string) $result);
|
|
$i = 0;
|
|
$output = '';
|
|
$line = [];
|
|
|
|
foreach ($array_result as $newline) {
|
|
$line = explode(':', $newline);
|
|
|
|
switch ($line[0]) {
|
|
case 'Total Accesses':
|
|
if (($section == 'hits') || ($section == 'all')) {
|
|
$output .= $variables[0] . ':' . trim($line[1]) . ' ';
|
|
}
|
|
|
|
break;
|
|
case 'Total kBytes':
|
|
if (($section == 'kbytes') || ($section == 'all')) {
|
|
$output .= $variables[1] . ':' . trim($line[1]) . ' ';
|
|
}
|
|
|
|
break;
|
|
case 'BusyServers':
|
|
case 'BusyWorkers':
|
|
if (($section == 'workers') || ($section == 'all')) {
|
|
$output .= $variables[2] . ':' . trim($line[1]) . ' ';
|
|
}
|
|
|
|
break;
|
|
case 'IdleServers':
|
|
case 'IdleWorkers':
|
|
if (($section == 'workers') || ($section == 'all')) {
|
|
$output .= $variables[3] . ':' . trim($line[1]) . ' ';
|
|
}
|
|
|
|
break;
|
|
case 'CPULoad':
|
|
if (($section == 'cpuload') || ($section == 'all')) {
|
|
$output .= $variables[4] . ':' . trim($line[1]) . ' ';
|
|
}
|
|
|
|
break;
|
|
case 'Scoreboard':
|
|
$string = trim($line[1]);
|
|
$length = strlen($string);
|
|
|
|
for ($j = 0; $j < $length; $j++) {
|
|
$char = $string[$j];
|
|
|
|
if ($char == '_') {
|
|
$threads['_W']++;
|
|
} elseif ($char == '.') {
|
|
$threads['_O']++;
|
|
} else {
|
|
$threads[$char]++;
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (($section == 'threads') || ($section == 'all')) {
|
|
foreach ($threads as $type => $num_threads) {
|
|
$output .= 'thread' . $type . ':' . $num_threads . ' ';
|
|
}
|
|
}
|
|
|
|
return trim(str_replace(["\r", "\n"],'', $output));
|
|
}
|