mirror of
https://github.com/Cacti/cacti.git
synced 2026-11-09 05:26:50 +09:00
Thomas VincentandCopilot
78e4644f9f
* cleanup: remove unreachable defensive error logs in aggregate graph item validation * fix: harden data collection scripts with correct SNMP retry parameter Replace $host['ping_retries'] with $host['snmp_retries'] across all SNMP data collection scripts. Add column allow-lists for MikroTik scripts to prevent SQL injection via column name interpolation. Add Pest tests verifying column allow-lists reject injection attempts and all scripts reference snmp_retries instead of ping_retries. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com> * fix: consolidate disk device detection with preg_match Replace 8 str_starts_with() calls with a single preg_match() in ss_net_snmp_disk_io.php for readability. Align ss_net_snmp_disk_bytes.php with the same device prefixes (xvd, vd, hd, md, dm-) and improved nvme-aware partition filter. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com> * chore: drop unrelated lib/api_aggregate changes Keep PR scope focused on the issue for this branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Thomas Vincent <thomasvincent@gmail.com> --------- Signed-off-by: Thomas Vincent <thomasvincent@gmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
87 lines
2.8 KiB
PHP
Executable File
87 lines
2.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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
error_reporting(0);
|
|
|
|
if (!isset($called_by_script_server)) {
|
|
include_once(__DIR__ . '/../include/cli_check.php');
|
|
|
|
array_shift($_SERVER['argv']);
|
|
|
|
print call_user_func_array('ss_hstats', $_SERVER['argv']);
|
|
}
|
|
|
|
/**
|
|
* Map stat type to database column name.
|
|
*
|
|
* @param string $stat Stat type to map
|
|
*
|
|
* @return string|null Column name or null if invalid stat
|
|
*/
|
|
function ss_hstats_map_stat_to_column(string $stat) : ?string {
|
|
switch ($stat) {
|
|
case 'polling_time':
|
|
case 'min_time':
|
|
case 'max_time':
|
|
case 'cur_time':
|
|
case 'avg_time':
|
|
case 'failed_polls':
|
|
case 'availability':
|
|
case 'current_errors':
|
|
return $stat;
|
|
case 'uptime':
|
|
return 'snmp_sysUpTimeInstance';
|
|
default:
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function ss_hstats(int $host_id = 0, string $stat = '') : string {
|
|
$column = ss_hstats_map_stat_to_column($stat);
|
|
|
|
if ($column === null) {
|
|
return '0';
|
|
}
|
|
|
|
$allowed = ['polling_time', 'min_time', 'max_time', 'cur_time', 'avg_time', 'snmp_sysUpTimeInstance', 'failed_polls', 'availability', 'current_errors'];
|
|
|
|
if (!in_array($column, $allowed, true)) {
|
|
return '0';
|
|
}
|
|
|
|
if ($host_id > 0) {
|
|
$value = db_fetch_cell_prepared(
|
|
"SELECT $column
|
|
FROM host
|
|
WHERE id = ?",
|
|
[$host_id]
|
|
);
|
|
|
|
return ($value == '' ? 'U' : $value);
|
|
}
|
|
|
|
return '0';
|
|
}
|