tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 09:14:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

RestApiClient: fix auth headers for curl

Browse Source
This commit is contained in:
Thomas Gelf 2015-12-23 17:28:17 +01:00
parent 0e651c845e
commit 998402e4f4
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Director/Core/RestApiClient.php
View File

@ -47,18 +47,10 @@ class RestApiClient
protected function request($method, $url, $body = null, $raw = false) protected function request($method, $url, $body = null, $raw = false)
{ {
/*
// TODO: Re-enabled once problems with 5.4 are fixed:
if (function_exists('curl_version')) { if (function_exists('curl_version')) {
return $this->curlRequest($method, $url, $body, $raw); return $this->curlRequest($method, $url, $body, $raw);
} elseif (version_compare(PHP_VERSION, '5.4.0') >= 0) { } elseif (version_compare(PHP_VERSION, '5.4.0') >= 0) {
return $this->phpRequest($method, $url, $body, $raw); return $this->phpRequest($method, $url, $body, $raw);
*/
if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
return $this->phpRequest($method, $url, $body, $raw);
} elseif (function_exists('curl_version')) {
return $this->curlRequest($method, $url, $body, $raw);
} else { } else {
throw new Exception('No CURL extension detected, this is required for PHP < 5.4'); throw new Exception('No CURL extension detected, this is required for PHP < 5.4');
} }
@ -119,7 +111,6 @@ class RestApiClient
$auth = sprintf('%s:%s', $this->user, $this->pass); $auth = sprintf('%s:%s', $this->user, $this->pass);
$headers = array( $headers = array(
'Host: ' . $this->getPeerIdentity(), 'Host: ' . $this->getPeerIdentity(),
'Authorization: Basic ' . $auth,
'Connection: close' 'Connection: close'
); );
@ -137,7 +128,7 @@ class RestApiClient
$opts = array( $opts = array(
CURLOPT_URL => $this->url($url), CURLOPT_URL => $this->url($url),
CURLOPT_HTTPHEADER => $headers, CURLOPT_HTTPHEADER => $headers,
CURLOPT_USERPWD => base64_decode($auth), CURLOPT_USERPWD => $auth,
CURLOPT_CUSTOMREQUEST => strtoupper($method), CURLOPT_CUSTOMREQUEST => strtoupper($method),
CURLOPT_RETURNTRANSFER => true, CURLOPT_RETURNTRANSFER => true,
@ -157,10 +148,7 @@ class RestApiClient
if ($res === false) { if ($res === false) {
throw new Exception('CURL ERROR: ' . curl_error($curl)); throw new Exception('CURL ERROR: ' . curl_error($curl));
} }
if ($code == 200) {
$response = json_decode($response, true);
print_r($response);
}
Benchmark::measure('Rest Api, got response'); Benchmark::measure('Rest Api, got response');
if ($raw) { if ($raw) {
return $res; return $res;