MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9551 from Benni0/2.4 

fix: CurlClient doesn't use correct Proxy settings
pull/9553/head
Alexandre Dulaunoy 2024-02-07 10:51:26 +01:00 committed by GitHub
parent 88f83ea295 45f264de49
commit 90126dc1dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Lib/Tools/CurlClient.php
View File

@ -30,9 +30,6 @@ class CurlClient extends HttpSocketExtended
/** @var array */ /** @var array */
private $proxy = []; private $proxy = [];
/** @var array */
private $defaultOptions;
/** /**
* @param array $params * @param array $params
* @noinspection PhpMissingParentConstructorInspection * @noinspection PhpMissingParentConstructorInspection
@ -60,7 +57,6 @@ class CurlClient extends HttpSocketExtended
if (isset($params['ssl_verify_peer'])) { if (isset($params['ssl_verify_peer'])) {
$this->verifyPeer = $params['ssl_verify_peer']; $this->verifyPeer = $params['ssl_verify_peer'];
} }
$this->defaultOptions = $this->generateDefaultOptions();
} }
/** /**
@ -198,7 +194,7 @@ class CurlClient extends HttpSocketExtended
$url .= '?' . http_build_query($query, '', '&', PHP_QUERY_RFC3986); $url .= '?' . http_build_query($query, '', '&', PHP_QUERY_RFC3986);
} }
$options = $this->defaultOptions; $options = $this->generateOptions();
$options[CURLOPT_URL] = $url; $options[CURLOPT_URL] = $url;
$options[CURLOPT_CUSTOMREQUEST] = $method; $options[CURLOPT_CUSTOMREQUEST] = $method;
@ -312,7 +308,7 @@ class CurlClient extends HttpSocketExtended
/** /**
* @return array * @return array
*/ */
private function generateDefaultOptions() private function generateOptions()
{ {
$options = [ $options = [
CURLOPT_FOLLOWLOCATION => true, // Allows to follow redirect CURLOPT_FOLLOWLOCATION => true, // Allows to follow redirect