espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-06-11 13:04:08 +03:00
parent 3c6b485321
commit d29e2f3994
3 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Webhook/Sender.php
+11 -8
View File
@@ -40,9 +40,9 @@ use Espo\Core\{
*/
class Sender
{
const CONNECT_TIMEOUT = 5;
private const CONNECT_TIMEOUT = 5;
const TIMEOUT = 10;
private const TIMEOUT = 10;
private $config;
@@ -99,10 +99,13 @@ class Sender
$code = intval($code);
}
if ($errorNumber = curl_errno($handler)) {
if (in_array($errorNumber, [\CURLE_OPERATION_TIMEDOUT, \CURLE_OPERATION_TIMEOUTED])) {
$code = 408;
}
$errorNumber = curl_errno($handler);
if (
$errorNumber &&
in_array($errorNumber, [\CURLE_OPERATION_TIMEDOUT, \CURLE_OPERATION_TIMEOUTED])
) {
$code = 408;
}
curl_close($handler);
@@ -110,8 +113,8 @@ class Sender
return $code;
}
protected function buildSignature(Webhook $webhook, string $payload, string $secretKey): string
private function buildSignature(Webhook $webhook, string $payload, string $secretKey): string
{
return base64_encode($webhook->id . ':' . hash_hmac('sha256', $payload, $secretKey, true));
return base64_encode($webhook->getId() . ':' . hash_hmac('sha256', $payload, $secretKey, true));
}
}