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

enhance http lib to handle hidden basic authent (#974)

This commit is contained in:
cgagnaire 2018-04-30 16:09:37 +00:00 committed by Simon Bomm
parent 18f5566a00
commit 289ea7ccfb
5 changed files with 82 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/protocols/http/mode/expectedcontent.pm
View File

@ -42,7 +42,8 @@ sub new {
"proto:s" => { name => 'proto' },
"urlpath:s" => { name => 'url_path' },
"credentials" => { name => 'credentials' },
"ntlm" => { name => 'ntlm' },
"basic" => { name => 'basic' },
"ntlm" => { name => 'ntlm' }, # Deprecated
"ntlmv2" => { name => 'ntlmv2' },
"username:s" => { name => 'username' },
"password:s" => { name => 'password' },
@ -196,20 +197,28 @@ Set path to get Webpage (Default: '/')
=item B<--credentials>
Specify this option if you access webpage over basic authentication
Specify this option if you access webpage with authentication
=item B<--username>
Specify username for authentication (Mandatory if --credentials is specified)
=item B<--password>
Specify password for authentication (Mandatory if --credentials is specified)
=item B<--basic>
Specify this option if you access webpage over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
Specify this option if you access webpage over hidden basic authentication or you'll get a '404 NOT FOUND' error.
(Use with --credentials)
=item B<--ntlmv2>
Specify this option if you access webpage over ntlmv2 authentication (Use with --credentials and --port options)
=item B<--username>
Specify username for basic authentication (Mandatory if --credentials is specidied)
=item B<--password>
Specify password for basic authentication (Mandatory if --credentials is specidied)
=item B<--timeout>
Threshold for HTTP timeout (Default: 5)

29
apps/protocols/http/mode/jsoncontent.pm
View File

@ -46,7 +46,8 @@ sub new {
"proto:s" => { name => 'proto' },
"urlpath:s" => { name => 'url_path' },
"credentials" => { name => 'credentials' },
"ntlm" => { name => 'ntlm' },
"basic" => { name => 'basic' },
"ntlm" => { name => 'ntlm' }, # Deprecated
"ntlmv2" => { name => 'ntlmv2' },
"username:s" => { name => 'username' },
"password:s" => { name => 'password' },
@ -393,20 +394,28 @@ Set path to get Webpage (Default: '/')
=item B<--credentials>
Specify this option if you access webpage over basic authentication
Specify this option if you access webpage with authentication
=item B<--username>
Specify username for authentication (Mandatory if --credentials is specified)
=item B<--password>
Specify password for authentication (Mandatory if --credentials is specified)
=item B<--basic>
Specify this option if you access webpage over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
Specify this option if you access webpage over hidden basic authentication or you'll get a '404 NOT FOUND' error.
(Use with --credentials)
=item B<--ntlmv2>
Specify this option if you access webpage over ntlmv2 authentication (Use with --credentials and --port options)
=item B<--username>
Specify username for basic authentication (Mandatory if --credentials is specidied)
=item B<--password>
Specify password for basic authentication (Mandatory if --credentials is specidied)
=item B<--timeout>
Threshold for HTTP timeout (Default: 10)

29
apps/protocols/http/mode/response.pm
View File

@ -42,7 +42,8 @@ sub new {
"proto:s" => { name => 'proto' },
"urlpath:s" => { name => 'url_path' },
"credentials" => { name => 'credentials' },
"ntlm" => { name => 'ntlm' },
"basic" => { name => 'basic' },
"ntlm" => { name => 'ntlm' }, # Deprecated
"ntlmv2" => { name => 'ntlmv2' },
"username:s" => { name => 'username' },
"password:s" => { name => 'password' },
@ -174,20 +175,28 @@ Set path to get webpage (Default: '/')
=item B<--credentials>
Specify this option if you access webpage over basic authentication
Specify this option if you access webpage with authentication
=item B<--username>
Specify username for authentication (Mandatory if --credentials is specified)
=item B<--password>
Specify password for authentication (Mandatory if --credentials is specified)
=item B<--basic>
Specify this option if you access webpage over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
Specify this option if you access webpage over hidden basic authentication or you'll get a '404 NOT FOUND' error.
(Use with --credentials)
=item B<--ntlmv2>
Specify this option if you access webpage over ntlmv2 authentication (Use with --credentials and --port options)
=item B<--username>
Specify username for basic authentication (Mandatory if --credentials is specidied)
=item B<--password>
Specify password for basic authentication (Mandatory if --credentials is specidied)
=item B<--proxyurl>
Proxy URL

30
apps/protocols/http/mode/soapcontent.pm
View File

@ -46,7 +46,8 @@ sub new {
"proto:s" => { name => 'proto' },
"urlpath:s" => { name => 'url_path' },
"credentials" => { name => 'credentials' },
"ntlm" => { name => 'ntlm' },
"basic" => { name => 'basic' },
"ntlm" => { name => 'ntlm' }, # Deprecated
"ntlmv2" => { name => 'ntlmv2' },
"username:s" => { name => 'username' },
"password:s" => { name => 'password' },
@ -64,7 +65,6 @@ sub new {
"unknown-status:s" => { name => 'unknown_status' },
"warning-status:s" => { name => 'warning_status' },
"critical-status:s" => { name => 'critical_status' },
"warning-numeric:s" => { name => 'warning_numeric' },
"critical-numeric:s" => { name => 'critical_numeric' },
"warning-string:s" => { name => 'warning_string' },
@ -420,20 +420,28 @@ Set path to get Webpage (Default: '/')
=item B<--credentials>
Specify this option if you access webpage over basic authentication
Specify this option if you access webpage with authentication
=item B<--username>
Specify username for authentication (Mandatory if --credentials is specified)
=item B<--password>
Specify password for authentication (Mandatory if --credentials is specified)
=item B<--basic>
Specify this option if you access webpage over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
Specify this option if you access webpage over hidden basic authentication or you'll get a '404 NOT FOUND' error.
(Use with --credentials)
=item B<--ntlmv2>
Specify this option if you access webpage over ntlmv2 authentication (Use with --credentials and --port options)
=item B<--username>
Specify username for basic authentication (Mandatory if --credentials is specidied)
=item B<--password>
Specify password for basic authentication (Mandatory if --credentials is specidied)
=item B<--timeout>
Threshold for HTTP timeout (Default: 10)

8
centreon/plugins/http.pm
View File

@ -265,13 +265,17 @@ sub request {
$req->content($uri_post->query);
}
}
if (defined($request_options->{credentials}) && defined($request_options->{ntlmv2})) {
centreon::plugins::misc::mymodule_load(output => $self->{output}, module => 'Authen::NTLM',
error_msg => "Cannot load module 'Authen::NTLM'.");
Authen::NTLM::ntlmv2(1);
}
if (defined($request_options->{credentials}) && defined($request_options->{basic})) {
$req->authorization_basic($request_options->{username}, $request_options->{password});
}
$self->set_proxy(request => $request_options, url => $url);
if (defined($request_options->{cert_pkcs12}) && $request_options->{cert_file} ne '' && $request_options->{cert_pwd} ne '') {
@ -315,7 +319,7 @@ sub request {
my $short_msg = $response->status_line;
if ($short_msg =~ /^401/) {
my ($authenticate) = $response->www_authenticate =~ /(\S+)/;
$short_msg .= ' (' . $authenticate . ' authentification expected)';
$short_msg .= ' (' . $authenticate . ' authentication expected)';
}
$self->{output}->output_add(long_msg => $response->content, debug => 1);