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

Revert "Refs #6202 - Add possibility to send a certificate" 

This reverts commit ce6dde2dd4.
This commit is contained in:
Mathieu Cinquin 2015-04-23 18:23:20 +02:00
parent 2dd9f38d50
commit bcbfd1c3cf
2 changed files with 58 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
apps/protocols/http/mode/responsetime.pm
View File

@ -1,36 +1,35 @@
############################################################################### ###############################################################################
# Copyright 2005-2015 CENTREON # Copyright 2005-2013 MERETHIS
# Centreon is developped by : Julien Mathis and Romain Le Merlus under # Centreon is developped by : Julien Mathis and Romain Le Merlus under
# GPL Licence 2.0. # GPL Licence 2.0.
# #
# This program is free software; you can redistribute it and/or modify it under # 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 # the terms of the GNU General Public License as published by the Free Software
# Foundation ; either version 2 of the License. # Foundation ; either version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY # 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 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU General Public License for more details. # PARTICULAR PURPOSE. See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# this program; if not, see <http://www.gnu.org/licenses>. # this program; if not, see <http://www.gnu.org/licenses>.
# #
# Linking this program statically or dynamically with other modules is making a # Linking this program statically or dynamically with other modules is making a
# combined work based on this program. Thus, the terms and conditions of the GNU # combined work based on this program. Thus, the terms and conditions of the GNU
# General Public License cover the whole combination. # General Public License cover the whole combination.
# #
# As a special exception, the copyright holders of this program give CENTREON # As a special exception, the copyright holders of this program give MERETHIS
# permission to link this program with independent modules to produce an timeelapsedutable, # permission to link this program with independent modules to produce an timeelapsedutable,
# regardless of the license terms of these independent modules, and to copy and # regardless of the license terms of these independent modules, and to copy and
# distribute the resulting timeelapsedutable under terms of CENTREON choice, provided that # distribute the resulting timeelapsedutable under terms of MERETHIS choice, provided that
# CENTREON also meet, for each linked independent module, the terms and conditions # MERETHIS also meet, for each linked independent module, the terms and conditions
# of the license of that module. An independent module is a module which is not # of the license of that module. An independent module is a module which is not
# derived from this program. If you modify this program, you may extend this # derived from this program. If you modify this program, you may extend this
# exception to your version of the program, but you are not obliged to do so. If you # exception to your version of the program, but you are not obliged to do so. If you
# do not wish to do so, delete this exception statement from your version. # do not wish to do so, delete this exception statement from your version.
# #
# For more information : contact@centreon.com # For more information : contact@centreon.com
# Authors : Simon BOMM <sbomm@merethis.com> # Author : Simon BOMM <sbomm@merethis.com>
# Mathieu Cinquin <mcinquin@centreon.com>
# #
# Based on De Bodt Lieven plugin # Based on De Bodt Lieven plugin
#################################################################################### ####################################################################################
@ -49,7 +48,7 @@ sub new {
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$self->{version} = '1.1'; $self->{version} = '1.0';
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
@ -65,9 +64,6 @@ sub new {
"critical:s" => { name => 'critical' }, "critical:s" => { name => 'critical' },
"timeout:s" => { name => 'timeout', default => '3' }, "timeout:s" => { name => 'timeout', default => '3' },
"ssl:s" => { name => 'ssl', }, "ssl:s" => { name => 'ssl', },
"cert-file:s" => { name => 'cert_file' },
"cert-pwd:s" => { name => 'cert_pwd' },
"cert-pkcs12" => { name => 'cert_pkcs12' },
}); });
return $self; return $self;
} }
@ -98,10 +94,6 @@ sub check_options {
$self->{output}->add_option_msg(short_msg => "You need to set --username= and --password= options when --credentials is used"); $self->{output}->add_option_msg(short_msg => "You need to set --username= and --password= options when --credentials is used");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
if ((defined($self->{option_results}->{pkcs12})) && (!defined($self->{option_results}->{cert_file}) && !defined($self->{option_results}->{cert_pwd}))) {
$self->{output}->add_option_msg(short_msg => "You need to set --cert-file= and --cert-pwd= options when --pkcs12 is used");
$self->{output}->option_exit();
}
} }
sub run { sub run {
@ -110,15 +102,15 @@ sub run {
if (!defined($self->{option_results}->{port})) { if (!defined($self->{option_results}->{port})) {
$self->{option_results}->{port} = centreon::plugins::httplib::get_port($self); $self->{option_results}->{port} = centreon::plugins::httplib::get_port($self);
} }
my $timing0 = [gettimeofday]; my $timing0 = [gettimeofday];
my $webcontent = centreon::plugins::httplib::connect($self, connection_exit => 'critical'); my $webcontent = centreon::plugins::httplib::connect($self, connection_exit => 'critical');
my $timeelapsed = tv_interval ($timing0, [gettimeofday]); my $timeelapsed = tv_interval ($timing0, [gettimeofday]);
$self->{output}->output_add(long_msg => $webcontent); $self->{output}->output_add(long_msg => $webcontent);
my $exit = $self->{perfdata}->threshold_check(value => $timeelapsed, my $exit = $self->{perfdata}->threshold_check(value => $timeelapsed,
threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(severity => $exit,
@ -194,18 +186,6 @@ Threshold warning in seconds (Webpage response time)
Threshold critical in seconds (Webpage response time) Threshold critical in seconds (Webpage response time)
=item B<--cert-file>
Specify certificate to send to the webserver
=item B<--cert-pwd>
Specify certificate's password
=item B<--cert-pkcs12>
Specify type of certificate (PKCS12)
=back =back
=cut =cut

77
centreon/plugins/httplib.pm
View File

@ -1,36 +1,35 @@
############################################################################### ###############################################################################
# Copyright 2005-2015 CENTREON # Copyright 2005-2013 MERETHIS
# Centreon is developped by : Julien Mathis and Romain Le Merlus under # Centreon is developped by : Julien Mathis and Romain Le Merlus under
# GPL Licence 2.0. # GPL Licence 2.0.
# #
# This program is free software; you can redistribute it and/or modify it under # 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 # the terms of the GNU General Public License as published by the Free Software
# Foundation ; either version 2 of the License. # Foundation ; either version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, but WITHOUT ANY # 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 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU General Public License for more details. # PARTICULAR PURPOSE. See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# this program; if not, see <http://www.gnu.org/licenses>. # this program; if not, see <http://www.gnu.org/licenses>.
# #
# Linking this program statically or dynamically with other modules is making a # Linking this program statically or dynamically with other modules is making a
# combined work based on this program. Thus, the terms and conditions of the GNU # combined work based on this program. Thus, the terms and conditions of the GNU
# General Public License cover the whole combination. # General Public License cover the whole combination.
# #
# As a special exception, the copyright holders of this program give CENTREON # As a special exception, the copyright holders of this program give MERETHIS
# permission to link this program with independent modules to produce an timeelapsedutable, # permission to link this program with independent modules to produce an timeelapsedutable,
# regardless of the license terms of these independent modules, and to copy and # regardless of the license terms of these independent modules, and to copy and
# distribute the resulting timeelapsedutable under terms of CENTREON choice, provided that # distribute the resulting timeelapsedutable under terms of MERETHIS choice, provided that
# CENTREON also meet, for each linked independent module, the terms and conditions # MERETHIS also meet, for each linked independent module, the terms and conditions
# of the license of that module. An independent module is a module which is not # of the license of that module. An independent module is a module which is not
# derived from this program. If you modify this program, you may extend this # derived from this program. If you modify this program, you may extend this
# exception to your version of the program, but you are not obliged to do so. If you # exception to your version of the program, but you are not obliged to do so. If you
# do not wish to do so, delete this exception statement from your version. # do not wish to do so, delete this exception statement from your version.
# #
# For more information : contact@centreon.com # For more information : contact@centreon.com
# Authors : Simon BOMM <sbomm@merethis.com> # Author : Simon BOMM <sbomm@merethis.com>
# Mathieu Cinquin <mcinqui@centreon.com>
# #
# Based on De Bodt Lieven plugin # Based on De Bodt Lieven plugin
#################################################################################### ####################################################################################
@ -39,14 +38,13 @@ package centreon::plugins::httplib;
use strict; use strict;
use warnings; use warnings;
use LWP::UserAgent; use LWP::UserAgent;
use HTTP::Cookies; use HTTP::Cookies;
use URI; use URI;
sub get_port { sub get_port {
my ($self, %options) = @_; my ($self, %options) = @_;
my $cache_port = ''; my $cache_port = '';
if (defined($self->{option_results}->{port}) && $self->{option_results}->{port} ne '') { if (defined($self->{option_results}->{port}) && $self->{option_results}->{port} ne '') {
$cache_port = $self->{option_results}->{port}; $cache_port = $self->{option_results}->{port};
@ -54,7 +52,7 @@ sub get_port {
$cache_port = 80 if ($self->{option_results}->{proto} eq 'http'); $cache_port = 80 if ($self->{option_results}->{proto} eq 'http');
$cache_port = 443 if ($self->{option_results}->{proto} eq 'https'); $cache_port = 443 if ($self->{option_results}->{proto} eq 'https');
} }
return $cache_port; return $cache_port;
} }
@ -62,14 +60,14 @@ sub connect {
my ($self, %options) = @_; my ($self, %options) = @_;
my $method = defined($options{method}) ? $options{method} : 'GET'; my $method = defined($options{method}) ? $options{method} : 'GET';
my $connection_exit = defined($options{connection_exit}) ? $options{connection_exit} : 'unknown'; my $connection_exit = defined($options{connection_exit}) ? $options{connection_exit} : 'unknown';
my $ua = LWP::UserAgent->new(keep_alive => 1, protocols_allowed => ['http', 'https'], timeout => $self->{option_results}->{timeout}, my $ua = LWP::UserAgent->new(keep_alive => 1, protocols_allowed => ['http', 'https'], timeout => $self->{option_results}->{timeout},
requests_redirectable => [ 'GET', 'HEAD', 'POST' ]); requests_redirectable => [ 'GET', 'HEAD', 'POST' ]);
if (defined($options{cookies_file})) { if (defined($options{cookies_file})) {
$ua->cookie_jar(HTTP::Cookies->new(file => $options{cookies_file}, $ua->cookie_jar(HTTP::Cookies->new(file => $options{cookies_file},
autosave => 1)); autosave => 1));
} }
my ($response, $content); my ($response, $content);
my ($req, $url); my ($req, $url);
if (defined($self->{option_results}->{port}) && $self->{option_results}->{port} =~ /^[0-9]+$/) { if (defined($self->{option_results}->{port}) && $self->{option_results}->{port} =~ /^[0-9]+$/) {
@ -94,7 +92,7 @@ sub connect {
} }
} }
} }
if ($method eq 'POST') { if ($method eq 'POST') {
if (defined($content_type_forced)) { if (defined($content_type_forced)) {
$req->content_type($content_type_forced); $req->content_type($content_type_forced);
@ -107,14 +105,14 @@ sub connect {
$req->content_type('application/x-www-form-urlencoded'); $req->content_type('application/x-www-form-urlencoded');
$req->content($uri_post->query); $req->content($uri_post->query);
} }
} }
if (defined($self->{option_results}->{credentials}) && defined($self->{option_results}->{ntlm})) { if (defined($self->{option_results}->{credentials}) && defined($self->{option_results}->{ntlm})) {
$ua->credentials($self->{option_results}->{hostname} . ':' . $self->{option_results}->{port}, '', $self->{option_results}->{username}, $self->{option_results}->{password}); $ua->credentials($self->{option_results}->{hostname} . ':' . $self->{option_results}->{port}, '', $self->{option_results}->{username}, $self->{option_results}->{password});
} elsif (defined($self->{option_results}->{credentials})) { } elsif (defined($self->{option_results}->{credentials})) {
$req->authorization_basic($self->{option_results}->{username}, $self->{option_results}->{password}); $req->authorization_basic($self->{option_results}->{username}, $self->{option_results}->{password});
} }
if (defined($self->{option_results}->{proxyurl})) { if (defined($self->{option_results}->{proxyurl})) {
$ua->proxy(['http', 'https'], $self->{option_results}->{proxyurl}); $ua->proxy(['http', 'https'], $self->{option_results}->{proxyurl});
} }
@ -126,27 +124,16 @@ sub connect {
); );
IO::Socket::SSL::set_default_context($context); IO::Socket::SSL::set_default_context($context);
} }
if (defined($self->{option_results}->{cert_pkcs12}) && $self->{option_results}->{cert_file} ne '' && $self->{option_results}->{cert_pwd} ne '') {
use Net::SSL;
$ENV{HTTPS_PKCS12_FILE} = $self->{option_results}->{cert_file};
$ENV{HTTPS_PKCS12_PASSWORD} = $self->{option_results}->{cert_pwd};
}
if (defined($self->{option_results}->{cert_file}) && !defined($self->{option_results}->{cert_pkcs12})) {
use Net::SSL;
$ENV{HTTPS_CERT_FILE} = $self->{option_results}->{cert_file};
}
$response = $ua->request($req); $response = $ua->request($req);
if ($response->is_success) { if ($response->is_success) {
$content = $response->content; $content = $response->content;
return $content; return $content;
} }
$self->{output}->output_add(severity => $connection_exit, $self->{output}->output_add(severity => $connection_exit,
short_msg => $response->status_line); short_msg => $response->status_line);
$self->{output}->display(); $self->{output}->display();
$self->{output}->exit(); $self->{output}->exit();
} }