mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-23 19:47:06 +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>
295 lines
7.9 KiB
PHP
Executable File
295 lines
7.9 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
use Symfony\Component\Finder\Exception\DirectoryNotFoundException;
|
|
|
|
require(__DIR__ . '/../include/cli_check.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/CactiFilesystem.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/CactiMd5FileFinder.php');
|
|
|
|
// process calling arguments
|
|
$parms = $_SERVER['argv'];
|
|
array_shift($parms);
|
|
|
|
// setup defaults
|
|
$confirm = false;
|
|
$create = false;
|
|
$quiet = false;
|
|
$debug = false;
|
|
$md5_file = '';
|
|
$show_hash = false;
|
|
$base_dir = __DIR__ . '/../';
|
|
|
|
if (cacti_sizeof($parms)) {
|
|
foreach ($parms as $parameter) {
|
|
if (str_contains($parameter, '=')) {
|
|
[$arg, $value] = explode('=', $parameter, 2);
|
|
} else {
|
|
$arg = $parameter;
|
|
$value = '';
|
|
}
|
|
|
|
switch ($arg) {
|
|
case '-b':
|
|
case '--basedir':
|
|
$base_dir = trim($value);
|
|
|
|
break;
|
|
case '-c':
|
|
case '--create':
|
|
$create = true;
|
|
|
|
break;
|
|
case '--confirm':
|
|
$confirm = true;
|
|
|
|
break;
|
|
case '-d':
|
|
case '--debug':
|
|
display_version();
|
|
$debug = true;
|
|
|
|
break;
|
|
case '-q':
|
|
case '--quiet':
|
|
$quiet = true;
|
|
|
|
break;
|
|
case '-s':
|
|
case '--show':
|
|
case '--show-hash':
|
|
$show_hash = true;
|
|
|
|
break;
|
|
case '--version':
|
|
case '-V':
|
|
case '-v':
|
|
display_version();
|
|
|
|
exit(0);
|
|
case '--help':
|
|
case '-H':
|
|
case '-h':
|
|
display_help();
|
|
exit(0);
|
|
default:
|
|
if (strlen($md5_file)) {
|
|
printf('ERROR: Invalid Argument: (%s)' . PHP_EOL . PHP_EOL, $arg);
|
|
exit(1);
|
|
}
|
|
|
|
$md5_file = strlen($value) ? "$arg=$value" : "$arg";
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (substr($base_dir, -1) == '/') {
|
|
$base_dir = substr($base_dir, 0, -1);
|
|
}
|
|
$base_dir = realpath($base_dir);
|
|
|
|
if (!file_exists($base_dir . '/include/config.php.dist')) {
|
|
printf('ERROR: Path \'%s\' is not a Cacti root folder' . PHP_EOL, $base_dir);
|
|
exit(2);
|
|
}
|
|
|
|
if (!strlen($md5_file)) {
|
|
$md5_file = $base_dir . '/.md5sum';
|
|
}
|
|
|
|
$ignore_files = [
|
|
// Ignore . and .. folders
|
|
'\/\.$',
|
|
'\/\.\.$',
|
|
|
|
// Ignore .md5sum since it always changes
|
|
'/.md5sum$',
|
|
|
|
// Ignore temporary files
|
|
'\.tmp$',
|
|
'\.swp$',
|
|
'\.log$',
|
|
|
|
// Ignore .git folder since that is source control and might not exist
|
|
'.git$',
|
|
|
|
// Ignore .htaccess as web admins may modify
|
|
'.htaccess$',
|
|
|
|
// Ignore cache, log, plugins and rra since they are dynamic directories
|
|
'/cache$',
|
|
'/log$',
|
|
'/plugins$',
|
|
'/rra$'
|
|
];
|
|
|
|
$ignore_regex = '';
|
|
|
|
foreach ($ignore_files as $ignore) {
|
|
$ignore_regex .= (strlen($ignore_regex) ? '|' : '') . '(' . $ignore . ')';
|
|
}
|
|
$ignore_regex = "~($ignore_regex)~";
|
|
|
|
$excluded_directories = ['.git', 'cache', 'log', 'plugins', 'rra'];
|
|
$file_finder = new CactiMd5FileFinder();
|
|
$debug_callback = null;
|
|
|
|
if (!$quiet && $debug) {
|
|
print PHP_EOL . "Searching '$base_dir' ..." . PHP_EOL;
|
|
$debug_callback = static function (string $message) : void {
|
|
print $message . PHP_EOL;
|
|
};
|
|
}
|
|
|
|
try {
|
|
$file_array = $file_finder->findHashes((string) $base_dir, $ignore_regex, $excluded_directories, $debug_callback);
|
|
} catch (DirectoryNotFoundException | InvalidArgumentException $e) {
|
|
printf('ERROR: %s' . PHP_EOL, $e->getMessage());
|
|
exit(6);
|
|
}
|
|
|
|
if ($create) {
|
|
$output = '';
|
|
|
|
foreach ($file_array as $filename => $md5) {
|
|
$output .= "$md5 $filename" . PHP_EOL;
|
|
}
|
|
|
|
if (!$quiet) {
|
|
print 'Writing ' . cacti_sizeof($file_array) . " entries to $md5_file" . PHP_EOL;
|
|
}
|
|
|
|
if (!$confirm && file_exists($md5_file)) {
|
|
printf('ERROR: MD5 file \'%s\' exists, but not --confirm to overwrite', $md5_file);
|
|
exit(3);
|
|
}
|
|
|
|
try {
|
|
$filesystem = new CactiFilesystem();
|
|
$filesystem->writeFile($md5_file, $output);
|
|
} catch (Symfony\Component\Filesystem\Exception\IOExceptionInterface) {
|
|
printf('ERROR: Failed to write to MD5 file \'%s\'' . PHP_EOL, $md5_file);
|
|
exit(4);
|
|
}
|
|
} else {
|
|
if (!file_exists($md5_file)) {
|
|
printf('ERROR: MD5 file \'%s\' is missing, cannot verify' . PHP_EOL, $md5_file);
|
|
exit(5);
|
|
}
|
|
|
|
$contents = file_get_contents($md5_file, false);
|
|
|
|
if ($contents === false) {
|
|
printf('ERROR: Failed to read from MD5 file \'%s\'' . PHP_EOL, $md5_file);
|
|
exit(6);
|
|
}
|
|
|
|
$contents = explode("\n",$contents);
|
|
$line = 0;
|
|
$verify_array = [];
|
|
|
|
foreach ($contents as $md5) {
|
|
$line++;
|
|
|
|
if (strlen($md5)) {
|
|
if ($md5[32] != ' ') {
|
|
printf('ERROR: Failed to parse line %d:' . PHP_EOL . ' %s' . PHP_EOL, $line, $md5);
|
|
exit(7);
|
|
}
|
|
|
|
$filename = trim(substr($md5,33));
|
|
$verify_array[$filename] = substr($md5,0,32);
|
|
}
|
|
}
|
|
|
|
$all_keys = array_unique(array_merge(array_keys($file_array),array_keys($verify_array)));
|
|
|
|
foreach ($all_keys as $filename) {
|
|
$hash_read = sprintf('%32s','Missing');
|
|
|
|
if (array_key_exists($filename, $file_array)) {
|
|
$hash_read = $file_array[$filename];
|
|
}
|
|
|
|
$hash_file = sprintf('%32s','Missing');
|
|
|
|
if (array_key_exists($filename, $verify_array)) {
|
|
$hash_file = $verify_array[$filename];
|
|
}
|
|
|
|
if ($hash_read != $hash_file) {
|
|
if ($quiet) {
|
|
exit(8);
|
|
}
|
|
|
|
print "$filename: FAILED" . PHP_EOL;
|
|
|
|
if ($debug || $show_hash) {
|
|
print " Read: [$hash_read]" . PHP_EOL;
|
|
print " File: [$hash_file]" . PHP_EOL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* display_version - displays version information
|
|
*
|
|
* @return void
|
|
*/
|
|
function display_version() : void {
|
|
$version = get_cacti_cli_version();
|
|
print "Cacti md5sum Utility, Version $version, " . COPYRIGHT_YEARS . PHP_EOL;
|
|
}
|
|
|
|
/**
|
|
* display_version - displays help information
|
|
*
|
|
* @return void
|
|
*/
|
|
function display_help() : void {
|
|
display_version();
|
|
|
|
print PHP_EOL;
|
|
print 'usage: md5sum.php [option] [filename]' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'Options:' . PHP_EOL;
|
|
print '--create When specified used creates a file containing the md5 hash' . PHP_EOL;
|
|
print ' followed by the name. Otherwise, the file is verified' . PHP_EOL;
|
|
print '--debug logs additional output to the screen to aid in diagnosing' . PHP_EOL;
|
|
print ' potential issues' . PHP_EOL . PHP_EOL;
|
|
print '--basedir When specified, sets the base directory to search from. If' . PHP_EOL;
|
|
print ' not specified, defaults to the directory above this script' . PHP_EOL;
|
|
print '--quiet When specified, quiet mode only returns an exit value that' . PHP_EOL;
|
|
print ' corresponds to the point of exit. Suppresses debug option' . PHP_EOL;
|
|
print '--show When specified, adds extra output to the verify mode which' . PHP_EOL;
|
|
print ' shows both the stored and computed hash value that failed' . PHP_EOL;
|
|
print ' to match' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'When no filename is passed, .md5sum is assumed. Only one filename allowed' . PHP_EOL;
|
|
}
|