From 15e48bf0c229a68a28df1519a3826e67d57fe426 Mon Sep 17 00:00:00 2001 From: Ismail Aatif Date: Fri, 10 Jan 2025 21:16:45 +0100 Subject: [PATCH 1/5] adds option to disable ssl verification Adds an extra option for disabling cURL SSL verification for UploadSaver --- src/Saver/UploadSaver.php | 6 +++++- src/SaverFactory.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Saver/UploadSaver.php b/src/Saver/UploadSaver.php index c236646..a22bd1a 100644 --- a/src/Saver/UploadSaver.php +++ b/src/Saver/UploadSaver.php @@ -10,8 +10,10 @@ final class UploadSaver implements SaverInterface private $url; /** @var int */ private $timeout; + /** @var bool */ + private $verify; - public function __construct($url, $token, $timeout) + public function __construct($url, $token, $timeout, $verify) { $this->url = $url; if ($token) { @@ -19,6 +21,7 @@ public function __construct($url, $token, $timeout) } $this->timeout = $timeout; + $this->verify = $verify; } public function isSupported() @@ -64,6 +67,7 @@ private function submit($url, $payload) CURLOPT_FOLLOWLOCATION => 1, CURLOPT_HTTPHEADER => $headers, CURLOPT_TIMEOUT => $this->timeout, + CURLOPT_SSL_VERIFYPEER => $this->verify, )); if (!$res) { $error = curl_errno($ch) ? curl_error($ch) : ''; diff --git a/src/SaverFactory.php b/src/SaverFactory.php index f8cd688..b6cc29e 100644 --- a/src/SaverFactory.php +++ b/src/SaverFactory.php @@ -35,6 +35,7 @@ public static function create($saveHandler, Config $config) 'url' => null, 'token' => null, 'timeout' => 3, + 'verify' => true, ); $userConfig = isset($config['save.handler.upload']) && is_array($config['save.handler.upload']) ? $config['save.handler.upload'] : array(); $saverConfig = array_merge($defaultConfig, $userConfig); From e457492956087e787e6caf927f873ae7857cbbbe Mon Sep 17 00:00:00 2001 From: Ismail Aatif Date: Sun, 12 Jan 2025 12:15:09 +0100 Subject: [PATCH 2/5] adds option to disable ssl verification Adds an extra option for disabling cURL SSL verification for UploadSaver --- src/Saver/UploadSaver.php | 2 +- src/SaverFactory.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Saver/UploadSaver.php b/src/Saver/UploadSaver.php index a22bd1a..f1f1523 100644 --- a/src/Saver/UploadSaver.php +++ b/src/Saver/UploadSaver.php @@ -21,7 +21,7 @@ public function __construct($url, $token, $timeout, $verify) } $this->timeout = $timeout; - $this->verify = $verify; + $this->verify = is_bool($verify) ? $verify : true; } public function isSupported() diff --git a/src/SaverFactory.php b/src/SaverFactory.php index b6cc29e..71fbf30 100644 --- a/src/SaverFactory.php +++ b/src/SaverFactory.php @@ -39,7 +39,12 @@ public static function create($saveHandler, Config $config) ); $userConfig = isset($config['save.handler.upload']) && is_array($config['save.handler.upload']) ? $config['save.handler.upload'] : array(); $saverConfig = array_merge($defaultConfig, $userConfig); - $saver = new Saver\UploadSaver($saverConfig['url'] ?: $saverConfig['uri'], $saverConfig['token'], $saverConfig['timeout']); + $saver = new Saver\UploadSaver( + $saverConfig['url'] ?: $saverConfig['uri'], + $saverConfig['token'], + $saverConfig['timeout'], + $saverConfig['verify'] + ); break; case Profiler::SAVER_STACK: From cafc897ca669b761fb46a89fe9fd5fede22aead0 Mon Sep 17 00:00:00 2001 From: Ismail Aatif Date: Sun, 12 Jan 2025 12:31:43 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 69284a1..a8cdfa6 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,8 @@ Example config: 'timeout' => 3, // the token must match 'upload.token' config in XHGui 'token' => 'token', + // verify option to disable ssl verification, defaults to true if unspecified. + 'verify' => false, ), ``` From 99e7d9f4c0a51376d9b0ee1b123733ed1d1d39f9 Mon Sep 17 00:00:00 2001 From: Ismail Aatif Date: Wed, 22 Jan 2025 19:13:07 +0100 Subject: [PATCH 4/5] Remove unnecessary check --- src/Saver/UploadSaver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Saver/UploadSaver.php b/src/Saver/UploadSaver.php index f1f1523..a22bd1a 100644 --- a/src/Saver/UploadSaver.php +++ b/src/Saver/UploadSaver.php @@ -21,7 +21,7 @@ public function __construct($url, $token, $timeout, $verify) } $this->timeout = $timeout; - $this->verify = is_bool($verify) ? $verify : true; + $this->verify = $verify; } public function isSupported() From 17d846d933063c23ed274d4fa8ee0fb0c6c51b07 Mon Sep 17 00:00:00 2001 From: Ismail Aatif Date: Wed, 22 Jan 2025 19:13:15 +0100 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a8cdfa6..669642b 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,7 @@ Example config: // the token must match 'upload.token' config in XHGui 'token' => 'token', // verify option to disable ssl verification, defaults to true if unspecified. - 'verify' => false, + 'verify' => true, ), ```