mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-10-23 03:27:05 +09:00
* INFO: set compat to 1.2.32 * docs: update Copilot instructions Cacti baseline to 1.2.32 (matches INFO compat) * INFO: back off compat to 1.2.29 * Add manifest.json + upgrade-time file pruning * Prune phpunit.xml on upgrade and ignore markdown-lint configs phpunit.xml ships in the repo for CI but is a dev-only test artifact, so it is removed from manifest.json 'expected', pruned from installs on upgrade (like tests/), and excluded from the manifest drift check. The retired markdown-lint configs (.mdlrc, .md_style.rb) are deleted, and .md* is now ignored like .git*: protected from pruning and excluded from drift if it reappears. * Move thold_functions.php and thold_webapi.php into includes/; flatten css The main threshold library becomes includes/functions.php and the web API helper becomes includes/webapi.php; every caller (setup.php, includes/*, the CLI/poller/notify entry points and the test suite) loads them from includes/. Each per-theme stylesheet css/<theme>/main.css becomes css/<theme>.css so users can drop their own css/<theme>.css into the css base, and the page_head hook looks there. Old paths are tombstoned so existing installs drop the stale copies on upgrade. * Regenerate cacti.pot for the includes/ file relocations Moving the plugin's library files into includes/ changed the source-reference lines in the translation template; regenerate it so the 'Verify translation template' CI check passes. * Harden the hook-include test and make RPN integer ops explicit The HookFunctionsIncludeTest invokes real hooks with placeholder input purely to execute their relocated include_once lines; it now swallows engine notices/warnings/deprecations during those calls (and restores the error handler and config afterward) so it cannot trip the suite's failOnDeprecation or leak state into other tests. The RPN % and ^ operators now cast their operands to int explicitly, matching their long-standing integer-truncation behaviour while silencing the implicit float-to-int conversion deprecation. * Harden prune against tampered-manifest path traversal The upgrade-time prune now rejects any tombstone containing '.'/'..' segments (which could escape the plugin directory or resolve to its root) and treats ancestors of whitelist entries as protected, so a tombstone on a parent directory can no longer delete a whitelisted file beneath it. * docs: update and align the Project Structure block Point the structure tree at the relocated files (libraries now under includes/, data files under docs/, stylesheets under css/) and align the trailing '# ...' comments to a single column so they no longer drift right. * docs/tests: standardize test header and correct manifest-contract notes - Use the full license header (from the plugin's own setup.php) in tests/Unit/PruneFilesTest.php instead of the abbreviated copyright banner. - Document that the manifest drift check and the upgrade-time prune also handle phpunit.xml and .md* files, matching the implemented behavior. * refactor: rename prune helpers to the plugin-slug function prefix The repository naming contract reserves the plugin_<name>_ prefix for plugin lifecycle / hook-registration functions; all other functions use the plain <name>_ prefix. Rename the internal upgrade helpers accordingly: plugin_<name>_prune_files() -> <name>_prune_files() plugin_<name>_rmtree() -> <name>_rmtree() The call site, unit tests, and the copilot-instructions.md references are updated to match. No behavioral change. * chore: set the Cacti compatibility floor to 1.2.29 Align the compat metadata (and the contributor-guide references) with the team decision to standardize the minimum supported Cacti version at 1.2.29; the previously proposed 1.2.32 floor was not adopted. --------- Co-authored-by: Copilot <copilot@users.noreply.github.com>
190 lines
5.2 KiB
PHP
190 lines
5.2 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
// let PHP run just as long as it has to
|
|
ini_set('max_execution_time', '0');
|
|
|
|
error_reporting(E_ALL);
|
|
|
|
include(__DIR__ . '/../../include/cli_check.php');
|
|
include_once($config['base_path'] . '/lib/xml.php');
|
|
include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
|
|
|
|
// set the defaults
|
|
$force = false;
|
|
$debug = false;
|
|
$filename = false;
|
|
$errors = 0;
|
|
|
|
// process calling arguments
|
|
$parms = $_SERVER['argv'];
|
|
array_shift($parms);
|
|
|
|
if (sizeof($parms)) {
|
|
foreach ($parms as $parameter) {
|
|
if (strpos($parameter, '=')) {
|
|
[$arg, $value] = explode('=', $parameter);
|
|
} else {
|
|
$arg = $parameter;
|
|
$value = '';
|
|
}
|
|
|
|
switch ($arg) {
|
|
case '--debug':
|
|
case '-d':
|
|
$debug = true;
|
|
|
|
break;
|
|
case '--filename':
|
|
case '-f':
|
|
$filename = $value;
|
|
|
|
break;
|
|
case '--version':
|
|
case '-V':
|
|
case '-v':
|
|
display_version();
|
|
exit;
|
|
case '--help':
|
|
case '-H':
|
|
case '-h':
|
|
display_help();
|
|
exit;
|
|
default:
|
|
print 'ERROR: Invalid Parameter ' . $parameter . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
exit(-1);
|
|
}
|
|
}
|
|
}
|
|
|
|
// validate filename set
|
|
if ($filename === false) {
|
|
print 'ERROR: You must specify a filename using either the --filename of -f options.' . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
exit(-1);
|
|
}
|
|
|
|
// validate exists
|
|
if (!file_exists($filename)) {
|
|
print 'ERROR: The filename \'' . $filename . '\' does not exist.' . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
exit(-1);
|
|
}
|
|
|
|
// validate readable
|
|
if (!is_readable($filename)) {
|
|
print 'ERROR: The filename \'' . $filename . '\' is not readable.' . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
exit(-1);
|
|
}
|
|
|
|
// validate good xml
|
|
$data = file_get_contents($filename);
|
|
|
|
$xml = xml2array($data);
|
|
|
|
if (!is_array($xml) || !cacti_sizeof($xml)) {
|
|
print 'ERROR: The filename \'' . $filename . '\' is not a valid thold XML file.' . PHP_EOL . PHP_EOL;
|
|
display_help();
|
|
exit(-1);
|
|
}
|
|
|
|
$return_data = thold_template_import($data);
|
|
|
|
if (sizeof($return_data) && isset($return_data['success'])) {
|
|
foreach ($return_data['success'] as $message) {
|
|
print 'NOTE: ' . $message . PHP_EOL;
|
|
}
|
|
}
|
|
|
|
if (isset($return_data['errors'])) {
|
|
foreach ($return_data['errors'] as $error) {
|
|
print 'ERROR: ' . $error . PHP_EOL;
|
|
}
|
|
}
|
|
|
|
if (isset($return_data['failure'])) {
|
|
foreach ($return_data['failure'] as $error) {
|
|
print 'ERROR: ' . $error . PHP_EOL;
|
|
}
|
|
|
|
$errors++;
|
|
}
|
|
|
|
if ($errors == 0) {
|
|
$message = 'NOTE: Import of Threshold Template file \'' . $filename . '\' succeeded.';
|
|
|
|
cacti_log($message, false, 'THOLD');
|
|
|
|
print $message . PHP_EOL;
|
|
|
|
exit(0);
|
|
} else {
|
|
$message = 'ERROR: Import of Threshold Template file \'' . $filename . '\' failed. There were \'' . $errors . '\' encountered.';
|
|
|
|
cacti_log($message, false, 'THOLD');
|
|
|
|
print $message . PHP_EOL;
|
|
|
|
exit(1);
|
|
}
|
|
|
|
/**
|
|
* Prints this script's name, version, and copyright banner to stdout.
|
|
*
|
|
* @return void
|
|
*
|
|
* @global array $config Cacti global configuration array; used to
|
|
* locate setup.php when plugin_thold_version()
|
|
* isn't already loaded.
|
|
*/
|
|
function display_version() {
|
|
global $config;
|
|
|
|
if (!function_exists('plugin_thold_version')) {
|
|
include_once($config['base_path'] . '/plugins/thold/setup.php');
|
|
}
|
|
|
|
$info = plugin_thold_version();
|
|
print 'Threshold Template Import Utility, Version ' . $info['version'] . ', ' . COPYRIGHT_YEARS . PHP_EOL;
|
|
}
|
|
|
|
/**
|
|
* Prints this script's version banner followed by its command-line
|
|
* usage instructions to stdout.
|
|
*
|
|
* @return void
|
|
*/
|
|
function display_help() {
|
|
display_version();
|
|
|
|
print PHP_EOL;
|
|
|
|
print 'usage: cli_import.php --filename=N' . PHP_EOL . PHP_EOL;
|
|
|
|
print 'Simple CLI command to import a threshold template.' . PHP_EOL . PHP_EOL;
|
|
print '--filename=N - A valid threshold template exported using the thold plugin.' . PHP_EOL . PHP_EOL;
|
|
}
|