mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-10-26 04:56:48 +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>
194 lines
5.5 KiB
PHP
194 lines
5.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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* Delivery of one notification to one recipient list.
|
|
*
|
|
* This was the block repeated at every send site in thold_check_threshold(),
|
|
* so the rules it carries -- when a mail is skipped, which body is built --
|
|
* could only be reached by driving a whole poll.
|
|
*/
|
|
final class TholdMailNotificationTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
}
|
|
|
|
/**
|
|
* @param array<string, mixed> $overrides
|
|
*
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function threshold(array $overrides = []) {
|
|
return $overrides + [
|
|
'id' => 1,
|
|
'name_cache' => 'CPU',
|
|
'data_source_name' => 'traffic_in',
|
|
'lastread' => 95,
|
|
'local_graph_id' => 7,
|
|
'acknowledgment' => '',
|
|
'notes' => '',
|
|
'dnotes' => '',
|
|
'external_id' => '',
|
|
'thold_type' => 0,
|
|
'thold_hi' => 90,
|
|
'thold_low' => 10,
|
|
'thold_fail_trigger' => 3,
|
|
'email_body' => '',
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function device() {
|
|
return [
|
|
'id' => 2,
|
|
'description' => 'core-switch-1',
|
|
'hostname' => '10.0.0.1',
|
|
'location' => 'rack 4',
|
|
'site_id' => 1,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param string $recipients
|
|
* @param array<string, mixed> $overrides
|
|
* @param string $type
|
|
*
|
|
* @return string
|
|
*/
|
|
private function deliver($recipients, array $overrides = [], $type = 'alert') {
|
|
$thold = $this->threshold($overrides);
|
|
$device = $this->device();
|
|
|
|
return thold_mail_notification($recipients, 'bcc@example.org', 'ALERT: CPU', $type, 4, [], $thold, $device);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testRecipientsReceiveTheNotification(): void {
|
|
$this->deliver('ops@example.org');
|
|
|
|
$this->assertCount(1, CactiStubs::$mail);
|
|
$this->assertSame('ops@example.org', CactiStubs::$mail[0]['to']);
|
|
$this->assertSame('bcc@example.org', CactiStubs::$mail[0]['bcc']);
|
|
$this->assertSame('ALERT: CPU', CactiStubs::$mail[0]['subject']);
|
|
}
|
|
|
|
/**
|
|
* @return array<string, array{0: string}>
|
|
*/
|
|
public static function emptyRecipientProvider() {
|
|
return [
|
|
'empty string' => [''],
|
|
'whitespace' => [' '],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider emptyRecipientProvider
|
|
*
|
|
* @param string $recipients
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNothingIsSentWithoutRecipients($recipients): void {
|
|
$this->assertSame('', $this->deliver($recipients));
|
|
$this->assertSame([], CactiStubs::$mail);
|
|
}
|
|
|
|
/**
|
|
* An acknowledged threshold has already been seen by an operator, so it
|
|
* stops mailing even while it keeps breaching.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testAcknowledgedThresholdIsNotMailed(): void {
|
|
$this->assertSame('', $this->deliver('ops@example.org', ['acknowledgment' => 'on']));
|
|
$this->assertSame([], CactiStubs::$mail);
|
|
}
|
|
|
|
/**
|
|
* Building the body queries, so an empty recipient list must not pay for a
|
|
* message nobody receives.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNoMessageIsBuiltWhenThereIsNoOneToMail(): void {
|
|
$this->deliver('');
|
|
|
|
// Composing a body resolves the device's site; skipping it must not.
|
|
$site_lookups = array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'FROM sites') !== false;
|
|
});
|
|
|
|
$this->assertSame([], array_values($site_lookups));
|
|
}
|
|
|
|
/**
|
|
* @return array<string, array{0: string, 1: string}>
|
|
*/
|
|
public static function textTypeProvider() {
|
|
return [
|
|
'alert' => ['alert', 'thold_alert_text'],
|
|
'warning' => ['warning', 'thold_warning_text'],
|
|
'restoral' => ['restoral', 'thold_restoral_text'],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Each class of notification takes its body from its own setting.
|
|
*
|
|
* @dataProvider textTypeProvider
|
|
*
|
|
* @param string $type
|
|
* @param string $option
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testEachNotificationClassUsesItsOwnBody($type, $option): void {
|
|
CactiStubs::$configOptions[$option] = 'body for ' . $type;
|
|
|
|
$this->assertSame('body for ' . $type, $this->deliver('ops@example.org', [], $type));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTheSentMessageIsReturnedForReuse(): void {
|
|
CactiStubs::$configOptions['thold_alert_text'] = 'the body';
|
|
|
|
$this->assertSame('the body', $this->deliver('ops@example.org'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTheListFormatIsResolvedEvenWhenNothingIsSent(): void {
|
|
$this->deliver('');
|
|
|
|
$format_lookups = array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'format_file') !== false;
|
|
});
|
|
|
|
$this->assertNotEmpty($format_lookups);
|
|
}
|
|
}
|