Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify webhook signature

This commit is contained in:
osaajani 2021-01-30 11:24:14 +01:00
parent 1c0ffc246a
commit 8843df9f46
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/internals/Webhook.php
View File

@ -125,12 +125,18 @@ class Webhook extends StandardController
foreach ($webhooks as $webhook) foreach ($webhooks as $webhook)
{ {
$timestamp = time(); $timestamp = time();
$webhook_random_id = $timestamp . '-' . bin2hex(openssl_random_pseudo_bytes(16));
//signature is hexa string representing hmac sha256 of webhook_random_id
$webhook_signature = hash_hmac(self::HMAC_ALGO, $webhook_random_id, $user['api_key']);
$message = [ $message = [
'url' => $webhook['url'], 'url' => $webhook['url'],
'data' => [ 'data' => [
'webhook_timestamp' => $timestamp, 'webhook_timestamp' => $timestamp,
'webhook_type' => $webhook['type'], 'webhook_type' => $webhook['type'],
'webhook_random_id' => $timestamp . '-' . bin2hex(openssl_random_pseudo_bytes(8)), 'webhook_random_id' => $webhook_random_id,
'webhook_signature' => $webhook_signature,
'id' => $sms['id'], 'id' => $sms['id'],
'at' => $sms['at'], 'at' => $sms['at'],
'text' => $sms['text'], 'text' => $sms['text'],
@ -139,10 +145,6 @@ class Webhook extends StandardController
], ],
]; ];
//signature is hexa string representing hmac sha256 of user_api_key::webhook_timestamp::webhook_random_id
$signature_clear = $user['api_key'] . '.' . $message['data']['webhook_timestamp'] . '.' . $message['data']['webhook_random_id'];
$message['data']['webhook_signature'] = hash_hmac(self::HMAC_ALGO, $signature_clear, $user['api_key']);
$error_code = null; $error_code = null;
$queue = msg_get_queue(QUEUE_ID_WEBHOOK); $queue = msg_get_queue(QUEUE_ID_WEBHOOK);
$success = msg_send($queue, QUEUE_TYPE_WEBHOOK, $message, true, true, $error_code); $success = msg_send($queue, QUEUE_TYPE_WEBHOOK, $message, true, true, $error_code);