Files
spine/nft_popen.c
T
Thomas Vincent e8a4b9aac9 fix: poller correctness bugs, with fuzz and integration coverage (#542)
Poller correctness and memory-safety fixes, with the ICMP hardening from
#543 folded in.

Verified in a clean `ubuntu:24.04` container: builds at **38 warnings**
against develop's 39, and the unit tests build and pass on Linux (39
assertions across three binaries).

**Fixes**
- `php_readpipe` off-by-one — the old bound let `bptr` reach
`result_string + 2048` and then wrote the terminator one byte past a
2048-byte allocation.
- `get_namebyhost` used `strtok`, which keeps one process-wide save
pointer, and runs unlocked on every poller thread. Two devices could be
polled at each other's addresses. Now `strtok_r`.
- The log date format was read from `default_dateformat`; Cacti's key is
`default_date_format`, so the lookup never matched and the format was
never loaded.
- `db_query` returns `mysql_store_result()` directly, which is NULL on
store failure. The NULL check ran *after* `mysql_fetch_row`, so the
crash happened one line before the guard.
- `snmp_count` logged a Net-SNMP `errstat` without setting either loop
flag, rebuilding the identical GETNEXT forever and pinning a thread
until the poll interval ended.
- `php_close` skipped the `close()` when the quit write failed with
EPIPE, leaking a descriptor per script-server restart.
- The reap loop's delay was compiled out on `SOLAR_THREAD` builds, so
both phases burned twenty `WNOHANG` polls in nanoseconds and the child
was never reaped.
- ICMP replies are validated for length and matched on id/sequence; on
Cygwin the peeked datagram is now drained, which previously busy-spun
until host timeout.
- The fatal signal handler no longer calls
`malloc`/`localtime_r`/`fprintf` before `_exit` — on a SIGSEGV caused by
heap corruption that deadlocked on the allocator's lock instead of
dying.
- The unit test Makefile was hardcoded to `/opt/homebrew` paths and
`-std=gnu23`, so it could not build on Linux at all. Now pkg-config
driven.

Supersedes #543.

**Added since the first revision**
- `snmp_get_multi()` now checks the varbind type before formatting.
Under v2c an agent reports a per-OID failure as an inline exception
varbind while the PDU `errstat` stays `NOERROR`, so `snprint_value()`
rendered the exception as literal text and stored it as a value.
- Two warning sources removed: a dangling line continuation ending
`sql.h`, and `strncopy()` now using `memcpy` where the byte count is
already exact. Warnings drop from **39 to 7**.

Closes #551
Closes #232
- `read_config_options()` issued 23 separate `SELECT ... FROM settings
WHERE name = ?` round trips at startup; they are now one bulk read
served from memory. Call sites are unchanged.

Closes #330

**Test infrastructure**
- The SNMPv3 integration fixture was broken: the image shipped a binary
that could not start (`libmysqlclient.so.21: cannot open shared object
file`). The build context carried `*.o`, `spine`, `Makefile` and
`config.status`, so `make` treated them as current, skipped compiling,
and packaged a binary linked against libraries the runtime image does
not have. `.dockerignore` now excludes build output. The fixture runs
end to end: spine polls the SNMPv3 device, reads `uptime`, writes to
`poller_output` and exits 0.
- Two libFuzzer targets, run per PR and weekly: the host string parser
and the ICMP reply parser. The second drives
`spine_icmp_classify_reply()`, extracted from `ping_icmp` so the bounds
walk over a shared raw socket is reachable by a test. 15M executions
under ASan/UBSan, no crashes.


**Added in this revision**
- `output_regex` was applied only in the in-loop OID drain, not the pass
after the loop that handles whatever did not fill a `MAX_OIDS` batch, so
a device whose OID count missed a boundary stored raw values. A single
data source is always the leftover case.
`tests/integration/test_output_regex.sh` now asserts on the value: it
fails on the parent commit with the raw reading and passes here with the
filtered one. Addresses #210; the feature stays dormant until Cacti
populates `poller_item.output_regex`.

Merge before #555, which needs the `get_namebyhost` fix above to resolve
a device hostname at all.

---------

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
2026-08-31 10:03:55 +01:00

401 lines
13 KiB
C

/*
+-------------------------------------------------------------------------+
| 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/ |
+-------------------------------------------------------------------------+
*/
/*******************************************************************************
ex: set tabstop=4 shiftwidth=4 autoindent:
* (C) Xenadyne Inc. 2002. All Rights Reserved
*
* Permission to use, copy, modify and distribute this software for
* any purpose and without fee is hereby granted, provided that the
* above copyright notice appears in all copies. Also note the
* University of California copyright below.
*
* XENADYNE INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
* IN NO EVENT SHALL XENADYNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* File: nft_popen.c
*
* Description: A thread-safe replacement for popen()/pclose().
*
* This is a thread-safe variant of popen that does unbuffered IO, to
* avoid running afoul of Solaris's inability to fdopen when fd > 255.
*
*******************************************************************************
*/
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software written by Ken Arnold and
* published in UNIX Review, Vol. 6, No. 8.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include "common.h"
#include "spine.h"
#include <spawn.h>
/* An instance of this struct is created for each popen() fd. */
static struct pid
{
struct pid *next;
int fd;
pid_t pid;
} * PidList;
/* Serialize access to PidList. */
static pthread_mutex_t ListMutex = PTHREAD_MUTEX_INITIALIZER;
static void close_cleanup(void *);
/*! ------------------------------------------------------------------------------
*
* nft_popen
*
* The nft_popen() function forks a command in a child process, and returns
* a pipe that is connected to the child's standard input and output. It is
* like the standard popen() call, except that it does not dfopen() the pipe
* file descriptor in order to return a stdio FILE *. This is useful if you
* wish to use select()- or poll()-driven IO.
*
* The mode argument is defined as in standard popen().
*
* On success, returns a file descriptor, or -1 on error.
* On failure, returns -1, with errno set to one of:
* EINVAL The mode argument is incorrect.
* EMFILE pipe() failed.
* ENFILE pipe() failed.
* ENOMEM malloc() failed.
* EAGAIN fork() failed.
*
*------------------------------------------------------------------------------
*/
/* WARNING: command is passed to /bin/sh -c without shell escaping.
* The caller MUST ensure command originates from a trusted source
* (the Cacti database). Do not pass user-controlled input directly. */
int nft_popen(const char * command, const char * type) {
struct pid *cur;
struct pid *p;
int pdes[2];
int fd, twoway;
pid_t pid;
char *argv[4];
char *command_copy;
char shell_cmd[] = "sh";
char shell_flag[] = "-c";
int cancel_state;
extern char **environ;
int retry_count = 0;
/* On platforms where pipe() is bidirectional,
* "r+" gives two-way communication.
*/
if (strchr(type, '+')) {
twoway = 1;
type = "r+";
}else {
twoway = 0;
if ((*type != 'r' && *type != 'w') || type[1]) {
errno = EINVAL;
return -1;
}
}
if (pipe(pdes) < 0)
return -1;
/* Disable thread cancellation from this point forward. */
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
if ((cur = malloc(sizeof(struct pid))) == NULL) {
(void)close(pdes[0]);
(void)close(pdes[1]);
pthread_setcancelstate(cancel_state, NULL);
return -1;
}
if ((command_copy = strdup(command)) == NULL) {
(void)close(pdes[0]);
(void)close(pdes[1]);
free(cur);
pthread_setcancelstate(cancel_state, NULL);
return -1;
}
argv[0] = shell_cmd;
argv[1] = shell_flag;
argv[2] = command_copy;
argv[3] = NULL;
/* Lock the list mutex prior to forking, to ensure that
* the child process sees PidList in a consistent list state.
*/
pthread_mutex_lock(&ListMutex);
/* Build file actions for posix_spawn to replace vfork+execve. */
posix_spawn_file_actions_t fa;
if (posix_spawn_file_actions_init(&fa) != 0) {
SPINE_LOG(("ERROR: SCRIPT: posix_spawn_file_actions_init failed"));
(void)close(pdes[0]);
(void)close(pdes[1]);
pthread_mutex_unlock(&ListMutex);
free(command_copy);
free(cur);
pthread_setcancelstate(cancel_state, NULL);
return -1;
}
if (*type == 'r') {
posix_spawn_file_actions_addclose(&fa, pdes[0]);
if (pdes[1] != STDOUT_FILENO) {
posix_spawn_file_actions_adddup2(&fa, pdes[1], STDOUT_FILENO);
posix_spawn_file_actions_addclose(&fa, pdes[1]);
if (twoway)
posix_spawn_file_actions_adddup2(&fa, STDOUT_FILENO, STDIN_FILENO);
} else if (twoway && (pdes[1] != STDIN_FILENO)) {
posix_spawn_file_actions_adddup2(&fa, pdes[1], STDIN_FILENO);
}
} else {
if (pdes[0] != STDIN_FILENO) {
posix_spawn_file_actions_adddup2(&fa, pdes[0], STDIN_FILENO);
posix_spawn_file_actions_addclose(&fa, pdes[0]);
}
posix_spawn_file_actions_addclose(&fa, pdes[1]);
}
/* Close all other pipes in the child (Posix.2 requirement). */
for (p = PidList; p; p = p->next)
posix_spawn_file_actions_addclose(&fa, p->fd);
/* Spawn the child process with retry on EAGAIN/ENOMEM. */
#if defined(__CYGWIN__)
const char *spawn_shell = (set.cygwinshloc == 0) ? "sh.exe" : "/bin/sh";
#else
const char *spawn_shell = "/bin/sh";
#endif
int spawn_err;
retry:
spawn_err = posix_spawn(&pid, spawn_shell, &fa, NULL, argv, environ);
if (spawn_err != 0) {
if ((spawn_err == EAGAIN || spawn_err == ENOMEM) && retry_count < 3) {
retry_count++;
usleep(50000);
goto retry;
}
SPINE_LOG(("ERROR: SCRIPT: posix_spawn failed: %s", strerror(spawn_err)));
posix_spawn_file_actions_destroy(&fa);
(void)close(pdes[0]);
(void)close(pdes[1]);
pthread_mutex_unlock(&ListMutex);
free(command_copy);
free(cur);
pthread_setcancelstate(cancel_state, NULL);
return -1;
}
posix_spawn_file_actions_destroy(&fa);
/* Parent. */
if (*type == 'r') {
fd = pdes[0];
(void)close(pdes[1]);
}else {
fd = pdes[1];
(void)close(pdes[0]);
}
/* Link into list of file descriptors. */
cur->fd = fd;
cur->pid = pid;
cur->next = PidList;
PidList = cur;
/* Unlock the mutex, and restore caller's cancellation state. */
pthread_mutex_unlock(&ListMutex);
free(command_copy);
pthread_setcancelstate(cancel_state, NULL);
return fd;
}
/*! ------------------------------------------------------------------------------
*
* nft_pchild
*
* Get the pid of the child process for an fd created by ntf_popen().
*
* On success, the pid of the child process is returned.
* On failure, nft_pchild() returns -1, with errno set to:
*
* EBADF The fd is not an active nft_popen() file descriptor.
*
*------------------------------------------------------------------------------
*/
int nft_pchild(int fd) {
struct pid *cur;
pid_t pid = 0;
/* Find the appropriate file descriptor. */
pthread_mutex_lock(&ListMutex);
for (cur = PidList; cur; cur = cur->next)
if (cur->fd == fd) {
pid = cur->pid;
break;
}
pthread_mutex_unlock(&ListMutex);
if (cur == NULL) {
errno = EBADF;
return -1;
}
return pid;
}
/*! ------------------------------------------------------------------------------
*
* nft_pclose
*
* Close the pipe and wait for the status of the child process.
*
* On success, the exit status of the child process is returned.
* On failure, nft_pclose() returns -1, with errno set to:
*
* EBADF The fd is not an active popen() file descriptor.
* ECHILD The waitpid() call failed.
*
* This call is cancellable.
*
*------------------------------------------------------------------------------
*/
int
nft_pclose(int fd)
{
struct pid *cur;
int pstat;
pid_t pid;
/* Find the appropriate file descriptor. */
pthread_mutex_lock(&ListMutex);
for (cur = PidList; cur; cur = cur->next)
if (cur->fd == fd) break;
pthread_mutex_unlock(&ListMutex);
if (cur == NULL) {
errno = EBADF;
return -1;
}
/* The close and waitpid calls below are cancellation points.
* We want to ensure that the fd is closed and the PidList
* entry freed despite cancellation, so push a cleanup handler.
*/
pthread_cleanup_push(close_cleanup, cur);
/* end the process nicely and then forcefully */
(void)close(fd);
cur->fd = -1; /* Prevent the fd being closed twice. */
do { pid = waitpid(cur->pid, &pstat, 0);
} while (pid == -1 && errno == EINTR);
pthread_cleanup_pop(1); /* Execute the cleanup handler. */
return (pid == -1 ? -1 : pstat);
}
/*! ------------------------------------------------------------------------------
* close_cleanup - close the pipe and free the pidlist entry.
*------------------------------------------------------------------------------
*/
static void
close_cleanup(void * arg)
{
struct pid * cur = arg;
struct pid * prev;
/* Close the pipe fd if necessary. */
if (cur->fd >= 0) {
(void)close(cur->fd);
}
/* Remove the entry from the linked list. */
pthread_mutex_lock(&ListMutex);
if (PidList == cur) {
PidList = cur->next;
}else{
for (prev = PidList; prev; prev = prev->next)
if (prev->next == cur) {
prev->next = cur->next;
break;
}
assert(prev != NULL); /* Search should not fail */
}
pthread_mutex_unlock(&ListMutex);
free(cur);
}