mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-10-24 12:06:50 +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>
335 lines
11 KiB
PHP
335 lines
11 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_expand_string() resolves the |pipe| tokens, which come from the data
|
|
* query cache rather than from the threshold row.
|
|
*
|
|
* These values are device-supplied, which is why trigger commands expand them
|
|
* before the <TAG> escaping rather than after.
|
|
*/
|
|
final class TholdExpandStringTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
}
|
|
|
|
/**
|
|
* Outside the per-graph SNMP substitution below (no graph found for this
|
|
* threshold), a |host_management_ip| token is still resolved against
|
|
* whatever device the current request is for. Real Cacti's
|
|
* lib/variables.php sets $device_id as a side effect of the include()
|
|
* inside thold_expand_string(), so this points library_path at a
|
|
* one-off fixture that does the same, rather than the shared
|
|
* tests/Fixtures/cacti-lib one every other test here uses - which
|
|
* every other test in this file has typically already include_once()'d
|
|
* by the time this runs, so reusing it would silently no-op.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeEscapesTheTopLevelHostTokenForTheRequestDevice(): void {
|
|
$malicious = "10.0.0.1'; touch /tmp/pwned; echo '";
|
|
|
|
$fixtureDir = sys_get_temp_dir() . '/thold-variables-' . uniqid();
|
|
mkdir($fixtureDir, 0777, true);
|
|
file_put_contents($fixtureDir . '/variables.php', "<?php\n\$device_id = 5;\n");
|
|
|
|
$originalLibraryPath = $GLOBALS['config']['library_path'];
|
|
$GLOBALS['config']['library_path'] = $fixtureDir;
|
|
|
|
// No graph found for this threshold: db_fetch_row_prepared's first
|
|
// call is the graph_local lookup, its second is thold_substitute_host_data()'s
|
|
// own host lookup.
|
|
CactiStubs::willReturn('db_fetch_row_prepared', []);
|
|
CactiStubs::willReturn('db_fetch_row_prepared', ['hostname' => $malicious]);
|
|
|
|
try {
|
|
$result = thold_expand_string($this->thresholdData(), 'alert |host_management_ip|', true);
|
|
} finally {
|
|
$GLOBALS['config']['library_path'] = $originalLibraryPath;
|
|
unlink($fixtureDir . '/variables.php');
|
|
rmdir($fixtureDir);
|
|
}
|
|
|
|
$this->assertSame('alert ' . escapeshellarg($malicious), $result);
|
|
}
|
|
|
|
/**
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function thresholdData(array $overrides = []) {
|
|
return $overrides + [
|
|
'local_graph_id' => 7,
|
|
'local_data_id' => 4,
|
|
'data_source_name' => 'traffic_in',
|
|
'thold_template_id' => 0,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
private function graphExists() {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', [
|
|
'id' => 7,
|
|
'host_id' => 2,
|
|
'snmp_query_id' => 3,
|
|
'snmp_index' => '1',
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testGraphTitleTokenIsResolved(): void {
|
|
$this->graphExists();
|
|
|
|
$this->assertSame('Traffic - eth0', thold_expand_string($this->thresholdData(), '|graph_title|'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testDataSourceNameTokenIsResolved(): void {
|
|
$this->graphExists();
|
|
|
|
$this->assertSame('traffic_in', thold_expand_string($this->thresholdData(), '|data_source_name|'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testDataSourceDescriptionTokenIsResolvedFromTheDatabase(): void {
|
|
$this->graphExists();
|
|
CactiStubs::willReturn('db_fetch_cell_prepared', 'Router - Traffic');
|
|
|
|
$this->assertSame('Router - Traffic', thold_expand_string($this->thresholdData(), '|data_source_description|'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTextIsPassedThroughExpandTitleForDataQueryTokens(): void {
|
|
$this->graphExists();
|
|
CactiStubs::willReturn('expand_title', 'alert eth0');
|
|
|
|
$this->assertSame('alert eth0', thold_expand_string($this->thresholdData(), 'alert |query_ifName|'));
|
|
$this->assertNotEmpty(CactiStubs::callsTo('expand_title'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testInterfaceSpeedFallsBackToTheConfiguredDefaultWhenUnknown(): void {
|
|
$this->graphExists();
|
|
CactiStubs::$configOptions['thold_empty_if_speed_default'] = '1000000000';
|
|
CactiStubs::willReturn('db_fetch_cell_prepared', '');
|
|
|
|
$result = thold_expand_string($this->thresholdData(), '|query_ifHighSpeed|');
|
|
|
|
$this->assertStringNotContainsString('|query_ifHighSpeed|', $result);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testUnthrottledInterfaceSpeedFallsBackToTheConfiguredDefaultWhenUnknown(): void {
|
|
$this->graphExists();
|
|
CactiStubs::$configOptions['thold_empty_if_speed_default'] = '1000000000';
|
|
CactiStubs::willReturn('db_fetch_cell_prepared', '');
|
|
|
|
$result = thold_expand_string($this->thresholdData(), '|query_ifSpeed|');
|
|
|
|
$this->assertStringNotContainsString('|query_ifSpeed|', $result);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTextIsReturnedUnchangedWhenTheGraphIsMissing(): void {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', []);
|
|
|
|
$this->assertSame('static text', thold_expand_string($this->thresholdData(), 'static text'));
|
|
}
|
|
|
|
/**
|
|
* An empty template falls back to the threshold template's suggested name,
|
|
* which is itself a token string and gets expanded in turn.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testEmptyStringFallsBackToTheExpandedTemplateSuggestedName(): void {
|
|
$this->graphExists();
|
|
CactiStubs::willReturn('db_fetch_cell_prepared', 'Suggested |data_source_name|');
|
|
|
|
$result = thold_expand_string($this->thresholdData(['thold_template_id' => 5]), '');
|
|
|
|
$this->assertSame('Suggested traffic_in', $result);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testSurroundingWhitespaceIsTrimmed(): void {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', []);
|
|
|
|
$this->assertSame('alert', thold_expand_string($this->thresholdData(), ' alert '));
|
|
}
|
|
|
|
/**
|
|
* In $shell mode (used when building a trigger command line), host and
|
|
* data-query token values come from the polled device and must be shell-
|
|
* escaped rather than substituted raw, or a malicious sysDescr/community/
|
|
* custom field could inject shell syntax into the command.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeEscapesHostTokenValues(): void {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', [
|
|
'id' => 7,
|
|
'host_id' => 2,
|
|
'snmp_query_id' => '0',
|
|
'snmp_index' => '',
|
|
]);
|
|
|
|
$malicious = "evil'; touch /tmp/pwned; echo '";
|
|
CactiStubs::willReturn('substitute_host_data', $malicious);
|
|
|
|
$result = thold_expand_string($this->thresholdData(), 'alert |host_description|', true);
|
|
|
|
$this->assertSame('alert ' . escapeshellarg($malicious), $result);
|
|
}
|
|
|
|
/**
|
|
* When the graph has an SNMP data query attached, host/query tokens are
|
|
* resolved through substitute_snmp_query_data() (so query-indexed fields
|
|
* work too) rather than through substitute_host_data() alone - and the
|
|
* result is still escaped before landing in the command.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeResolvesHostTokensThroughSnmpQueryDataWhenAGraphQueryIsAttached(): void {
|
|
$this->graphExists();
|
|
|
|
$malicious = "evil'; touch /tmp/pwned; echo '";
|
|
CactiStubs::willReturn('substitute_snmp_query_data', $malicious);
|
|
|
|
$result = thold_expand_string($this->thresholdData(), 'alert |host_description|', true);
|
|
|
|
$this->assertSame('alert ' . escapeshellarg($malicious), $result);
|
|
$this->assertNotEmpty(CactiStubs::callsTo('substitute_snmp_query_data'));
|
|
}
|
|
|
|
/**
|
|
* Non-shell callers (email/HTML rendering) must not be affected by the
|
|
* shell-escaping added for the trigger-command path.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNonShellModeLeavesHostTokenValuesUnescaped(): void {
|
|
$this->graphExists();
|
|
CactiStubs::willReturn('expand_title', 'alert eth0');
|
|
|
|
$this->assertSame('alert eth0', thold_expand_string($this->thresholdData(), 'alert |query_ifName|', false));
|
|
}
|
|
|
|
/**
|
|
* A single strtr() pass replaces host/query tokens against the original
|
|
* string only and never re-scans inserted values, so one token's
|
|
* resolved value containing another token's literal text can't be
|
|
* substituted a second time outside of its own quoting.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeDoesNotReSubstituteAHostTokenLiteralInsideAnotherValue(): void {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', [
|
|
'id' => 7,
|
|
'host_id' => 2,
|
|
'snmp_query_id' => '0',
|
|
'snmp_index' => '',
|
|
]);
|
|
|
|
$malicious = "'; touch /tmp/pwned; echo '";
|
|
CactiStubs::willReturn('substitute_host_data', '|host_bar|');
|
|
CactiStubs::willReturn('substitute_host_data', $malicious);
|
|
|
|
$result = thold_expand_string($this->thresholdData(), 'cmd |host_foo| |host_bar|', true);
|
|
|
|
$this->assertSame(
|
|
'cmd ' . escapeshellarg('|host_bar|') . ' ' . escapeshellarg($malicious),
|
|
$result
|
|
);
|
|
}
|
|
|
|
/**
|
|
* A single strtr() pass also protects |graph_title|,
|
|
* |data_source_description|, and |data_source_name|: a resolved value
|
|
* containing another one of these tokens' literal text can't be
|
|
* substituted a second time outside of its own quoting.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeDoesNotReSubstituteADirectTokenLiteralInsideAnotherValue(): void {
|
|
$this->graphExists();
|
|
|
|
$malicious = "'; touch /tmp/pwned; echo '";
|
|
CactiStubs::willReturn('get_graph_title', '|data_source_name|');
|
|
CactiStubs::willReturn('db_fetch_cell_prepared', $malicious);
|
|
|
|
$result = thold_expand_string(
|
|
$this->thresholdData(['data_source_name' => $malicious]),
|
|
'cmd |graph_title| |data_source_description|',
|
|
true
|
|
);
|
|
|
|
$this->assertSame(
|
|
'cmd ' . escapeshellarg('|data_source_name|') . ' ' . escapeshellarg($malicious),
|
|
$result
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Every phase (host/query tokens, custom data, direct tokens) defers its
|
|
* quoted value behind an opaque placeholder and only reveals it in one
|
|
* final pass, so an earlier phase's resolved value containing a later
|
|
* phase's literal token text can't be re-substituted by that later
|
|
* phase and have its quoting broken.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testShellModeDoesNotReSubstituteAcrossPhases(): void {
|
|
CactiStubs::willReturn('db_fetch_row_prepared', [
|
|
'id' => 7,
|
|
'host_id' => 2,
|
|
'snmp_query_id' => '0',
|
|
'snmp_index' => '',
|
|
]);
|
|
|
|
$malicious = "'; touch /tmp/pwned; echo '";
|
|
CactiStubs::willReturn('substitute_host_data', '|data_source_name|');
|
|
|
|
$result = thold_expand_string(
|
|
$this->thresholdData(['data_source_name' => $malicious]),
|
|
'cmd |host_description|',
|
|
true
|
|
);
|
|
|
|
$this->assertSame('cmd ' . escapeshellarg('|data_source_name|'), $result);
|
|
}
|
|
}
|