Files
cacti/tests/Unit/RrdGraphSubstitutionSafetyTest.php
Thomas Vincent 964c1fb1f4 Harden RRDtool execution and data handoff (#7615)
* fix(rrdtool): quote RRDfile paths passed to the command line

__rrd_execute() hands the assembled line to shell_exec(), and its docblock
already required callers to quote each variable argument.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(tests): widen bare RRD path sweep

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(rrdtool): quote binary path as one argument

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(rrd): preserve caller logging context

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Make RRD XML mutations transactional

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Harden RRDtool proxy transport handling

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(rrdproxy): reject invalid command argument lists

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(rrdproxy): preserve binary graph payloads

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Keep RRDtool proxy sessions encrypted

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Harden local RRDtool command and output handoff

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Eliminate graph rendering metadata lookups

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Batch DSStats metadata and last-value reads

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Batch interface speed metadata reads

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Update architectural hotspot baseline for RRD execution

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Batch RRD resolution profile lookups

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Batch DSStats summary aggregates

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* Narrow phpseclib key types for the proxy encrypt and decrypt calls

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(rrd): bound the forked proxy peers so a stall cannot hang the suite

The children accepted and read with no deadline while the parent used a 2s
socket timeout, so any mismatch left the child blocked in read and the parent
blocked in a bare pcntl_waitpid(). Note that accept() ignores SO_RCVTIMEO, so
readiness has to be waited on with socket_select() rather than a socket option.
Also corrects the array-command expectation, which still assumed develop's
escape-everything behaviour rather than rrdtool_build_command() leaving the
operation unquoted.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(rrd): seed proxy settings where the real read_config_option looks

UnitStubs only declares its stub when lib/functions.php has not been loaded
yet, so during a full run the real database-backed function is the one in
effect and $unit_config_options was being ignored. The parent then dialled an
address the child was not listening on, which is what stalled the handshake.
Seeding the option cache keeps the settings visible to either implementation.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(rrd): assert the shell-free RRDtool launch instead of the old quoting

__rrd_init now hands proc_open an argv array with bypass_shell, so escaping the
binary path would put the quotes inside the filename. The assertion still
expected the pre-argv line and had been failing unnoticed behind the suite hang.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(dsstats): derive the expected stamps instead of assuming UTC

dsstats_poller_output() formats with date(), so the hardcoded UTC strings only
matched on a UTC runner. The failure was masked by the suite hang.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* fix(rrd): keep RRDtool control codes intact in stdin commands

Escaping the backslash when converting a shell-quoted argument to an RRDtool
token left legends such as "  IO Wait\:" ending in a dangling control code, so
RRDtool refused every graph carrying an escaped colon. Verified against RRDtool
1.7.2 in pipe mode; values with no unambiguous quoted form are now refused
rather than mangled.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test: use Cacti test bootstrap and config

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test: resolve includes through Cacti path constants

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test: match the escaping helpers by token, not by text

lib/rrd.php documents its escaping behaviour in a comment, and the regex
over raw source counted that as a call site.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* ci: refresh sink inventory after develop rebase

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(rrd): prove argv isolation and concurrent pipe draining

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

* test(security): refresh sink inventory baseline after rebase onto develop

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

---------

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
2026-08-31 16:49:44 -04:00

94 lines
3.6 KiB
PHP

<?php
declare(strict_types = 1);
/*
+-------------------------------------------------------------------------+
| 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 |
+-------------------------------------------------------------------------+
*/
require_once dirname(__DIR__) . '/Helpers/UnitStubs.php';
require_once CACTI_PATH_LIBRARY . '/rrd.php';
test('graph text removes credential variables before substitution', function () {
$received = null;
$resolver = static function (string $value, array $graph, array $graphItem) use (&$received) : string {
$received = [$value, $graph, $graphItem];
return str_replace('|host_description|', "edge ' switch\nwest", $value);
};
$result = rrdtool_resolve_graph_text(
'|host_description| |host_snmp_community| |host_snmp_password| |host_snmp_priv_passphrase|',
['host_id' => 7],
['id' => 11],
$resolver
);
expect($received)->toBe([
'|host_description| ',
['host_id' => 7],
['id' => 11]
]);
expect($result)->toBe("edge ' switch\nwest ");
});
test('every credential placeholder is removed case insensitively', function (string $placeholder) {
$result = rrdtool_resolve_graph_text(
$placeholder,
[],
[],
static fn (string $value) : string => $value
);
expect($result)->toBe('');
})->with([
'community' => '|host_snmp_community|',
'username' => '|HOST_SNMP_USERNAME|',
'password' => '|host_snmp_password|',
'privacy secret' => '|host_snmp_priv_passphrase|',
'context' => '|host_snmp_context|',
'engine id' => '|host_snmp_engine_id|'
]);
test('graph options resolve values before their argument escaping', function () {
$source = file_get_contents(CACTI_PATH_LIBRARY . '/rrd.php');
$start = strpos($source, 'function rrd_function_process_graph_options(');
$end = strpos($source, 'function rrdtool_resolve_graph_text(', $start);
$body = substr($source, $start, $end - $start);
$resolverPosition = strpos($body, '$value = rrdtool_resolve_graph_text(');
$escapePosition = strpos($body, 'cacti_escapeshellarg(htmle($value))');
expect($resolverPosition)->not->toBeFalse()
->and($escapePosition)->not->toBeFalse()
->and($resolverPosition)->toBeLessThan($escapePosition)
->and($body)->not->toContain('rrd_substitute_host_query_data($graph_opts');
});
test('RRDtool log context never includes command arguments', function () {
$command = "graph '/tmp/device.rrd' --title 'private device' --secret 'do-not-log'";
$context = rrdtool_command_log_context($command);
expect($context)->toStartWith('command=graph bytes=')
->and($context)->toContain('sha256=' . hash('sha256', $command))
->and($context)->not->toContain('/tmp/device.rrd')
->and($context)->not->toContain('private device')
->and($context)->not->toContain('do-not-log');
});
test('RRDtool log context handles malformed and empty commands safely', function () {
foreach (["\0secret", "\r\nsecret", '', ' '] as $command) {
$context = rrdtool_command_log_context($command);
expect($context)->toStartWith('command=unknown bytes=')
->and($context)->toContain('sha256=' . hash('sha256', $command));
}
});