mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-24 12:07:31 +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>
160 lines
6.6 KiB
PHP
160 lines
6.6 KiB
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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
error_reporting(E_ALL);
|
|
|
|
define('IN_CACTI_INSTALL', 1);
|
|
|
|
include_once('../include/auth.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_automation_tools.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_automation.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_data_source.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_graph.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_device.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/api_tree.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/data_query.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/import.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/poller.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/snmp.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/sort.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/template.php');
|
|
require_once(CACTI_PATH_LIBRARY . '/utility.php');
|
|
include_once('./functions.php');
|
|
|
|
set_default_action();
|
|
|
|
prime_default_settings();
|
|
|
|
// SAFETY CHECKS FOR OLDER OR SECURED SYSTEMS
|
|
$hasShellExec = is_function_enabled('shell_exec');
|
|
$hasExec = is_function_enabled('exec');
|
|
$hasJson = interface_exists('JsonSerializable');
|
|
$hasEverything = $hasJson && $hasShellExec && $hasExec;
|
|
|
|
global $config;
|
|
|
|
if ($hasEverything) {
|
|
include_once('../lib/installer.php');
|
|
}
|
|
|
|
$help = '';
|
|
|
|
if (CACTI_SERVER_OS == 'unix') {
|
|
if ($config['cacti_db_version'] == 'new_install') {
|
|
if (isset($_SERVER['SERVER_SOFTWARE']) && str_contains($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
|
|
$help = 'Install-Under-CentOS_LAMP.html';
|
|
} elseif (file_exists('/etc/redhat-release')) {
|
|
$help = 'Install-Under-CentOS_LAMP.html';
|
|
} elseif (file_exists('/etc/os-release')) {
|
|
$contents = file_get_contents('/etc/os-release');
|
|
|
|
if (stripos((string) $contents, 'debian') !== false || stripos((string) $contents, 'ubuntu')) {
|
|
$help = 'Installing-Under-Ubuntu-Debian.html';
|
|
}
|
|
}
|
|
} else {
|
|
if (isset($_SERVER['SERVER_SOFTWARE'])) {
|
|
$help = 'Upgrading-Cacti.html';
|
|
} else {
|
|
$help = 'Upgrading-Cacti.html';
|
|
}
|
|
}
|
|
} else {
|
|
if ($config['cacti_db_version'] == 'new_install') {
|
|
$help = 'Installing-Under-Windows.html';
|
|
} else {
|
|
$help = 'Upgrading-Cacti-Under-Windows.html';
|
|
}
|
|
}
|
|
|
|
$help_anchor = '';
|
|
|
|
if ($help != '') {
|
|
$help_anchor = '<a style="padding:2px" href="#" data-page="' . $help . '" title="' . __esc('Cacti Install Help') . '" class="helpPage menu_parent"><i class="ti ti-help textHeaderDark"></i></a>';
|
|
}
|
|
|
|
?>
|
|
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<?php
|
|
|
|
html_common_header(__('Cacti Server v%s - Maintenance', format_cacti_version_text(CACTI_VERSION)));
|
|
|
|
if ($hasEverything) {
|
|
print get_md5_include_js('install/install.js');
|
|
}
|
|
|
|
print get_md5_include_css('install/install.css');
|
|
|
|
?>
|
|
</head>
|
|
<body>
|
|
<div class='cactiInstallTable'>
|
|
<div class='cactiTableTitleRow cactiBorderWall'>
|
|
<div class='textHeaderDark'><?php print __esc('Cacti Server v%s - Installation Wizard', CACTI_VERSION_BRIEF_FULL); ?><span style="float:right"><?php print $help_anchor; ?><a class="menu_parent" id="installRefresh" href="#" title="<?php print __esc('Refresh current page'); ?>" style="padding:2px"><i class="ti ti-reload textHeaderDark"></i></a></span></div>
|
|
</div>
|
|
<div class='cactiInstallArea cactiBorderWall'>
|
|
<div class='cactiInstallAreaContent' id='installContent'>
|
|
<?php
|
|
if ($hasEverything) {
|
|
print Installer::sectionTitle(__('Initializing'));
|
|
print Installer::sectionNormal(__('Please wait while the installation system for Cacti Version %s initializes. You must have JavaScript enabled for this to work.', CACTI_VERSION_BRIEF_FULL));
|
|
} else {
|
|
print '<div class="installErrorImage"><img src=\'../images/cacti_logo.svg\'></div>';
|
|
print '<div class="installErrorText">';
|
|
print '<p>' . __('FATAL: We are unable to continue with this installation. In order to install Cacti, PHP must be at version 7.4 or later.') . '</p>';
|
|
print '<ul>';
|
|
|
|
if (!$hasJson) {
|
|
print '<li>' . __('The php-json module must also be installed.') . '<br>' . __('See the PHP Manual: <a href="http://php.net/manual/en/book.json.php">JavaScript Object Notation</a>.') . '</li>';
|
|
print '<br>';
|
|
}
|
|
|
|
if (!($hasExec && $hasShellExec)) {
|
|
print '<li>' . __('The shell_exec() and/or exec() functions are currently blocked.') . '<br>' . __('See the PHP Manual: <a href="http://php.net/manual/en/ini.core.php#ini.disable-functions">Disable Functions</a>.') . '</li>';
|
|
}
|
|
print '</ul></div>';
|
|
}
|
|
?>
|
|
</div>
|
|
<div class='cactiInstallLoader' id='installLoader'>
|
|
<div class='cactiInstallLoaderLogo'><img src='../images/cacti_logo.svg' /></div>
|
|
<div class='cactiInstallLoaderSpinnerTheme cactiInstallLoaderSpinner'></div>
|
|
</div>
|
|
</div>
|
|
<div class='cactiInstallButtonArea saveRow'>
|
|
<button class='installButton' id='buttonPrevious' type='button' style='display: none'><?php print __esc('Previous'); ?></button>
|
|
<button class='installButton' id='buttonNext' type='button' style='display: none'><?php print __esc('Next'); ?></button>
|
|
<button class='installButton' id='buttonTest' type='button' style='display:none'><?php print __esc('Test'); ?></button>
|
|
<input id='installData' type='hidden'>
|
|
</div>
|
|
<div id='installDebug'></div>
|
|
<div class='cactiInstallCopyrightArea textHeaderDark'><?php print COPYRIGHT_YEARS; ?></div>
|
|
</div>
|
|
<?php
|
|
include_once(__DIR__ . '/../include/global_session.php');
|
|
?>
|
|
</body>
|
|
</html>
|