mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-23 03:27:02 +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>
68 lines
2.5 KiB
PHP
68 lines
2.5 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
global $config;
|
|
|
|
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_aruba_instant_ap', $_SERVER['argv']);
|
|
} else {
|
|
include_once(__DIR__ . '/../lib/snmp.php');
|
|
}
|
|
|
|
function ss_aruba_instant_ap(int $host_id = 0) : mixed {
|
|
global $environ, $poller_id, $config;
|
|
|
|
if ($host_id <= 0) {
|
|
return 'count:0' . PHP_EOL;
|
|
}
|
|
|
|
$host = db_fetch_row_prepared('SELECT *
|
|
FROM host
|
|
WHERE id = ?',
|
|
[$host_id]);
|
|
|
|
$aps = cacti_snmp_walk($host['hostname'],
|
|
$host['snmp_community'],
|
|
'.1.3.6.1.4.1.14823.2.3.3.1.2.1.1.3',
|
|
$host['snmp_version'],
|
|
$host['snmp_username'],
|
|
$host['snmp_password'],
|
|
$host['snmp_auth_protocol'],
|
|
$host['snmp_priv_passphrase'],
|
|
$host['snmp_priv_protocol'],
|
|
$host['snmp_context'],
|
|
$host['snmp_port'],
|
|
$host['snmp_timeout'],
|
|
$host['snmp_retries'],
|
|
SNMP_POLLER,
|
|
$host['snmp_engine_id']);
|
|
|
|
return ('count:' . count($aps) . PHP_EOL);
|
|
}
|