mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-11-02 18:17:24 +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>
216 lines
6.5 KiB
PHP
216 lines
6.5 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. |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
| http://www.cacti.net/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* thold_set_environ() exports the threshold context that a trigger command
|
|
* reads from its environment.
|
|
*
|
|
* With the notification queue on, thold_putenv() accumulates the pairs and
|
|
* returns them instead of calling putenv(), which is what makes the function
|
|
* observable here.
|
|
*/
|
|
final class TholdSetEnvironTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
protected function setUp(): void {
|
|
parent::setUp();
|
|
|
|
CactiStubs::$configOptions['thold_notification_queue'] = 'on';
|
|
CactiStubs::$configOptions['base_url'] = 'http://cacti.example.org';
|
|
}
|
|
|
|
/**
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function threshold(array $overrides = []) {
|
|
return $overrides + [
|
|
'id' => 3,
|
|
'local_data_id' => 4,
|
|
'local_graph_id' => 7,
|
|
'name_cache' => 'CPU',
|
|
'notes' => '',
|
|
'dnotes' => 'device note',
|
|
'external_id' => '',
|
|
'thold_type' => 0,
|
|
'thold_hi' => 90,
|
|
'thold_low' => 10,
|
|
'thold_fail_trigger' => 3,
|
|
'time_hi' => 80,
|
|
'time_low' => 20,
|
|
'time_fail_trigger' => 2,
|
|
'time_fail_length' => 300,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function device(array $overrides = []) {
|
|
return $overrides + [
|
|
'description' => 'router1',
|
|
'hostname' => '10.0.0.1',
|
|
'location' => 'rack 4',
|
|
'site_id' => 1,
|
|
'status' => 3,
|
|
'status_fail_date' => '2026-01-01 00:00:00',
|
|
'status_rec_date' => '2026-01-02 00:00:00',
|
|
'status_last_error' => '',
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Collect the exported environment as a name => value map.
|
|
*
|
|
* @param array<string, mixed> $thold
|
|
* @param array<string, mixed> $device
|
|
*
|
|
* @return array<string, string>
|
|
*/
|
|
private function environment(array $thold, array $device) {
|
|
$pairs = thold_set_environ('', $thold, $device, 42, 7, 'traffic_in');
|
|
$map = [];
|
|
|
|
foreach ($pairs as $pair) {
|
|
[$name, $value] = explode('=', $pair, 2);
|
|
|
|
$map[$name] = $value;
|
|
}
|
|
|
|
return $map;
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testThresholdAndDeviceContextIsExported(): void {
|
|
$env = $this->environment($this->threshold(), $this->device());
|
|
|
|
$this->assertSame('3', $env['THOLD_ID']);
|
|
$this->assertSame('router1', $env['THOLD_DESCRIPTION']);
|
|
$this->assertSame('10.0.0.1', $env['THOLD_HOSTNAME']);
|
|
$this->assertSame('42', $env['THOLD_CURRENTVALUE']);
|
|
$this->assertSame('traffic_in', $env['THOLD_DSNAME']);
|
|
$this->assertSame('device note', $env['THOLD_DEVICENOTE']);
|
|
}
|
|
|
|
/**
|
|
* The queue accumulates across calls, so the first pair has to reset it or
|
|
* a later command inherits the previous threshold's context.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testEachCallStartsFromAnEmptyEnvironment(): void {
|
|
$this->environment($this->threshold(), $this->device());
|
|
$env = $this->environment($this->threshold(['id' => 9]), $this->device());
|
|
|
|
$this->assertSame('9', $env['THOLD_ID']);
|
|
$this->assertCount(1, array_keys(array_filter(array_keys($env), function ($name) {
|
|
return $name === 'THOLD_ID';
|
|
})));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testStaticThresholdExportsItsBoundsAndNoDuration(): void {
|
|
$env = $this->environment($this->threshold(), $this->device());
|
|
|
|
$this->assertSame('90', $env['THOLD_HI']);
|
|
$this->assertSame('10', $env['THOLD_LOW']);
|
|
$this->assertSame('3', $env['THOLD_TRIGGER']);
|
|
$this->assertSame('', $env['THOLD_DURATION']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTimeBasedThresholdExportsTheTimeBoundsAndADuration(): void {
|
|
$env = $this->environment($this->threshold(['thold_type' => 2]), $this->device());
|
|
|
|
$this->assertSame('80', $env['THOLD_HI']);
|
|
$this->assertSame('20', $env['THOLD_LOW']);
|
|
$this->assertSame('2', $env['THOLD_TRIGGER']);
|
|
$this->assertNotSame('', $env['THOLD_DURATION']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testBaselineThresholdExportsEmptyBounds(): void {
|
|
$env = $this->environment($this->threshold(['thold_type' => 1]), $this->device());
|
|
|
|
$this->assertSame('', $env['THOLD_HI']);
|
|
$this->assertSame('', $env['THOLD_LOW']);
|
|
$this->assertSame('', $env['THOLD_TRIGGER']);
|
|
$this->assertSame('', $env['THOLD_DURATION']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testNotesAreTagExpandedWhenPresent(): void {
|
|
$env = $this->environment($this->threshold(['notes' => 'see <HOSTNAME>']), $this->device());
|
|
|
|
$this->assertSame('see 10.0.0.1', $env['THOLD_NOTES']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testNotesAreEmptyWhenTheThresholdHasNone(): void {
|
|
$env = $this->environment($this->threshold(), $this->device());
|
|
|
|
$this->assertSame('', $env['THOLD_NOTES']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testExternalIdIsExportedOnlyWhenSet(): void {
|
|
$env = $this->environment($this->threshold(), $this->device());
|
|
$this->assertArrayNotHasKey('THOLD_EXTERNAL_ID', $env);
|
|
|
|
$env = $this->environment($this->threshold(['external_id' => 'INC-42']), $this->device());
|
|
$this->assertSame('INC-42', $env['THOLD_EXTERNAL_ID']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testUnknownThresholdTypeExportsAnEmptyTypeName(): void {
|
|
$env = $this->environment($this->threshold(['thold_type' => 99]), $this->device());
|
|
|
|
$this->assertSame('', $env['THOLD_THOLDTYPE']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testGraphUrlIsExported(): void {
|
|
$env = $this->environment($this->threshold(), $this->device());
|
|
|
|
$this->assertSame('http://cacti.example.org/graph.php?local_graph_id=7', $env['THOLD_URL']);
|
|
}
|
|
}
|