mirror of
https://github.com/Cacti/spine.git
synced 2026-10-23 03:27:10 +09:00
Thomas Vincent
e8a4b9aac9
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>
98 lines
4.0 KiB
C
98 lines
4.0 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef SPINE_NFT_POPEN_H
|
|
#define SPINE_NFT_POPEN_H
|
|
/******************************************************************************
|
|
ex: set tabstop=4 shiftwidth=4 autoindent:
|
|
*
|
|
* (C) Copyright 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.
|
|
*
|
|
* 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.h
|
|
*
|
|
* PURPOSE
|
|
*
|
|
* Thread-safe substitute for popen() that doesn't use stdio streams.
|
|
*
|
|
******************************************************************************
|
|
*/
|
|
|
|
/*!
|
|
* 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 returns the file descriptor,
|
|
* instead of a stdio stream created by fdopen(). The file descriptor can be
|
|
* used with select() or poll(), or the caller can use fdopen() if a stdio
|
|
* FILE* is preferable.
|
|
*
|
|
* 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.
|
|
*/
|
|
extern int nft_popen(const char * command, const char * mode);
|
|
|
|
/*!
|
|
* 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.
|
|
*/
|
|
extern int nft_pchild(int fd);
|
|
|
|
/*!
|
|
* 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 waitpid() failed.
|
|
*/
|
|
extern int nft_pclose(int fd);
|
|
|
|
#endif /* SPINE_NFT_POPEN_H */
|