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

Fix #1872

This commit is contained in:
garnier-quentin 2020-02-27 17:17:27 +01:00
parent e4f691d32e
commit fb5d3c6505
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
centreon/plugins/backend/ssh/plink.pm
View File

@ -64,23 +64,30 @@ sub check_options {
sub execute {
my ($self, %options) = @_;
push @{$self->{ssh_option}}, '-T' if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1);
my ($content, $exit_code) = centreon::plugins::misc::execute(
output => $self->{output},
sudo => $options{sudo},
command => $options{command},
command_path => $options{command_path},
command_options => $options{command_options},
ssh_pipe => $options{ssh_pipe},
options => {
remote => 1,
ssh_address => $options{hostname},
ssh_command => $self->{ssh_command},
ssh_path => $self->{ssh_path},
ssh_option => $self->{ssh_option},
ssh_pipe => $options{ssh_pipe},
timeout => $options{timeout}
}
);
if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1) {
# Using username "root".
$content =~ s/^Using username ".*?"\.\n//msg;
}
# plink exit code is 0 even connection is abandoned
if ($content =~ /server.*?key fingerprint.*connection abandoned/msi) {
$self->{output}->add_option_msg(short_msg => 'please connect with plink command to your host and accept the server host key');

12
centreon/plugins/backend/ssh/sshcli.pm
View File

@ -57,7 +57,7 @@ sub check_options {
$self->{output}->option_exit();
}
push @{$self->{ssh_option}}, '-o=BatchMode yes';
push @{$self->{ssh_option}}, '-o="BatchMode yes"';
push @{$self->{ssh_option}}, '-l=' . $self->{ssh_username} if (defined($self->{ssh_username}) && $self->{ssh_username} ne '');
push @{$self->{ssh_option}}, '-p=' . $self->{ssh_port} if (defined($self->{ssh_port}) && $self->{ssh_port} ne '');
push @{$self->{ssh_option}}, '-i=' . $self->{ssh_priv_key} if (defined($self->{ssh_priv_key}) && $self->{ssh_priv_key} ne '');
@ -66,23 +66,31 @@ sub check_options {
sub execute {
my ($self, %options) = @_;
push @{$self->{ssh_option}}, '-T' if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1);
my ($content, $exit_code) = centreon::plugins::misc::execute(
output => $self->{output},
sudo => $options{sudo},
command => $options{command},
command_path => $options{command_path},
command_options => $options{command_options},
ssh_pipe => $options{ssh_pipe},
options => {
remote => 1,
ssh_address => $options{hostname},
ssh_command => $self->{ssh_command},
ssh_path => $self->{ssh_path},
ssh_option => $self->{ssh_option},
ssh_pipe => $options{ssh_pipe},
timeout => $options{timeout}
}
);
if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1) {
# Last failed login: Tue Feb 25 09:30:20 EST 2020 from 10.40.1.160 on ssh:notty
# There was 1 failed login attempt since the last successful login.
$content =~ s/^(?:Last failed login:|There was.*?failed login).*?\n//msg;
}
return ($content, $exit_code);
}