From 621c068680bb4710d45c86764c718bb8edb46506 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Mon, 10 Jun 2024 16:26:59 +0200 Subject: [PATCH] fix(webhooks): fix crash when headers is null with header auth method MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/webhooks/lib/BackgroundJobs/WebhookCall.php | 2 +- apps/webhooks/lib/Db/WebhookListener.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/webhooks/lib/BackgroundJobs/WebhookCall.php b/apps/webhooks/lib/BackgroundJobs/WebhookCall.php index 06c3a4cf5d7..1d5eeafdc75 100644 --- a/apps/webhooks/lib/BackgroundJobs/WebhookCall.php +++ b/apps/webhooks/lib/BackgroundJobs/WebhookCall.php @@ -32,7 +32,7 @@ class WebhookCall extends QueuedJob { $client = $this->clientService->newClient(); $options = []; $options['body'] = json_encode($data); - $options['headers'] = $webhookListener->getHeaders(); + $options['headers'] = $webhookListener->getHeaders() ?? []; try { switch ($webhookListener->getAuthMethodEnum()) { case AuthMethod::None: diff --git a/apps/webhooks/lib/Db/WebhookListener.php b/apps/webhooks/lib/Db/WebhookListener.php index fafda909f60..a949d93c9ea 100644 --- a/apps/webhooks/lib/Db/WebhookListener.php +++ b/apps/webhooks/lib/Db/WebhookListener.php @@ -15,6 +15,7 @@ use OCP\Security\ICrypto; /** * @method void setUserId(string $userId) * @method string getUserId() + * @method ?array getHeaders() */ class WebhookListener extends Entity implements \JsonSerializable { /** @var ?string id of the app_api application who added the webhook listener */ -- 2.39.5