clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 02:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fping bulk (#16085)

Browse Source 
* Fix Fping bulk
When an ICMP unreachable message was returned (stderr), the output processing would save it as if it were a partial line, breaking parsing.
Only save a line if it is the last line of the output (not ending in a new line)

* Add test case

* safer logic
This commit is contained in:
Tony Murray 2024-06-03 21:29:29 -05:00 committed by GitHub
parent b8e20bf615
commit 8bf40c5eef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
LibreNMS/Data/Source/Fping.php
View File

@ -117,7 +117,8 @@ class Fping
$process->run(function ($type, $output) use ($callback, &$partial) {
// stdout contains individual ping responses, stderr contains summaries
if ($type == Process::ERR) {
foreach (explode(PHP_EOL, $output) as $line) {
$lines = explode(PHP_EOL, $output);
foreach ($lines as $index => $line) {
if ($line) {
Log::debug("Fping OUTPUT|$line PARTIAL|$partial");
try {
@ -125,8 +126,8 @@ class Fping
call_user_func($callback, $response);
$partial = '';
} catch (FpingUnparsableLine $e) {
// handle possible partial line
$partial = $e->unparsedLine;
// handle possible partial line (only save it if it is the last line of output)
$partial = $index === array_key_last($lines) ? $e->unparsedLine : '';
}
}
}

1
tests/FpingTest.php
View File

@ -154,6 +154,7 @@ OUT;
$process->shouldReceive('getCommandLine');
$process->shouldReceive('run')->withArgs(function ($callback) {
// simulate incremental output (not always one full line per callback)
call_user_func($callback, Process::ERR, "ICMP unreachable\n"); // this line should be ignored
call_user_func($callback, Process::ERR, "192.168.1.4 : xmt/rcv/%loss = 3/3/0%, min/avg/max = 0.62/0.71/0.93\nhostname : xmt/rcv/%loss = 3/0/100%");
call_user_func($callback, Process::ERR, "invalid:characters!: Name or service not known\n\n1.1.1.1 : xmt/rcv/%loss = 3/2/33%");
call_user_func($callback, Process::ERR, ", min/avg/max = 0.024/0.037/0.054\n");