tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the Omnishell timeout implementation.

This commit is contained in:
Ramon Novoa 2022-10-19 19:09:49 +02:00
parent 164ccb0631
commit 478fcddd32
2 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_agents/win32/bin/util/omnishell_client.exe
View File

Binary file not shown.

60
pandora_server/lib/PandoraFMS/Omnishell.pm
View File

@ -459,65 +459,13 @@ sub execute_command_timeout {
|| $timeout <= 0
) {
`$cmd`;
return $?>>8;
}
my $remaining_timeout = $timeout;
my $RET;
my $output;
my $pid = open ($RET, "-|");
if (!defined($pid)) {
# Failed to fork.
$self->set_last_error('[command] Failed to fork.');
return undef;
}
if ($pid == 0) {
# Child.
my $ret;
eval {
local $SIG{ALRM} = sub { die "timeout\n" };
alarm $timeout;
`$cmd`;
alarm 0;
};
my $result = ($?>>8);
return $result;
# Exit child.
# Child finishes.
exit;
} elsif ($^O eq 'MSWin32') {
`pandora_agent_exec.exe $timeout $cmd`;
} else {
# Parent waiting.
while( --$remaining_timeout > 0 ){
if (wait == -1) {
last;
}
# Wait child up to timeout seconds.
sleep 1;
}
`pandora_agent_exec $timeout $cmd`;
}
if ($remaining_timeout > 0) {
# Retrieve output from child.
$output = do {
no warnings;
local $/;
<$RET>
};
$output = $output>>8 if looks_like_number($output);
}
else {
# Timeout expired.
return 124;
}
close($RET);
return $output;
return $?>>8;
}
################################################################################