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

Merge pull request #1964 from UrBnW/3cx 

3CX, new version compat
This commit is contained in:
qgarnier 2020-04-24 15:21:32 +02:00 committed by GitHub
parent 093b0bcafb b7e43b69d9
commit 0a73134d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/voip/3cx/restapi/custom/api.pm
View File

@ -136,9 +136,11 @@ sub settings {
$self->build_options_for_httplib(); $self->build_options_for_httplib();
$self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8'); $self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8');
if (defined($self->{cookie}) && defined($self->{xsrf})) { if (defined($self->{cookie})) {
$self->{http}->add_header(key => 'Cookie', value => '.AspNetCore.Cookies=' . $self->{cookie}); $self->{http}->add_header(key => 'Cookie', value => '.AspNetCore.Cookies=' . $self->{cookie});
$self->{http}->add_header(key => 'X-XSRF-TOKEN', value => $self->{xsrf}); if (defined($self->{xsrf})) {
$self->{http}->add_header(key => 'X-XSRF-TOKEN', value => $self->{xsrf});
}
} }
$self->{http}->set_options(%{$self->{option_results}}); $self->{http}->set_options(%{$self->{option_results}});
} }
@ -171,12 +173,9 @@ sub authenticate {
$self->{output}->add_option_msg(short_msg => "Error retrieving cookie"); $self->{output}->add_option_msg(short_msg => "Error retrieving cookie");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
# 3CX 16.0.5.611 does not use XSRF-TOKEN anymore
if (defined ($header) && $header =~ /(?:^| )XSRF-TOKEN=([^;]+);.*/) { if (defined ($header) && $header =~ /(?:^| )XSRF-TOKEN=([^;]+);.*/) {
$xsrf = $1; $xsrf = $1;
} else {
$self->{output}->output_add(long_msg => $content, debug => 1);
$self->{output}->add_option_msg(short_msg => "Error retrieving xsrf-token");
$self->{output}->option_exit();
} }
my $datas = { last_timestamp => time(), cookie => $cookie, xsrf => $xsrf, expires_on => time() + (3600 * 24) }; my $datas = { last_timestamp => time(), cookie => $cookie, xsrf => $xsrf, expires_on => time() + (3600 * 24) };