From e888cde7dd1face0b40ca633c3635cb5c80d4f53 Mon Sep 17 00:00:00 2001 From: paulwer Date: Sun, 24 Mar 2024 13:32:52 +0100 Subject: [PATCH] removing webhook soft-failes in favor for system logging --- app/Http/Controllers/BrevoController.php | 5 ----- app/Http/Controllers/MailgunController.php | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/app/Http/Controllers/BrevoController.php b/app/Http/Controllers/BrevoController.php index a81d1320e5c5..bd4f1ad59480 100644 --- a/app/Http/Controllers/BrevoController.php +++ b/app/Http/Controllers/BrevoController.php @@ -201,11 +201,6 @@ class BrevoController extends BaseController return response()->json(['message' => 'Failed. Invalid Parameters. At least one item was invalid.'], 400); } - if (!array_key_exists('Attachments', $item) || count($item['Attachments']) == 0) { - Log::info('Brevo: InboundParsing: SoftFail: Message ignored because of missing attachments. No Actions would have been taken...'); - continue; - } - ProcessBrevoInboundWebhook::dispatch($item)->delay(10); } diff --git a/app/Http/Controllers/MailgunController.php b/app/Http/Controllers/MailgunController.php index 36875eb8d624..8554f96b6feb 100644 --- a/app/Http/Controllers/MailgunController.php +++ b/app/Http/Controllers/MailgunController.php @@ -120,16 +120,6 @@ class MailgunController extends BaseController return response()->json(['message' => 'Failed. Missing Parameters. Use store and notify!'], 400); } - if (!array_key_exists('attachments', $input) || count(json_decode($input['attachments'])) == 0) { - Log::info('Message ignored because of missing attachments. No Actions would have been taken...'); - return response()->json(['message' => 'Sucess. Soft Fail. Missing Attachments.'], 200); - } - - if (\abs(\time() - (int) $input['timestamp']) > 150) { - Log::info('Message ignored because of request body is too old.'); - return response()->json(['message' => 'Success. Soft Fail. Message too old.'], 200); - } - // @turbo124 TODO: how to check for services.mailgun.webhook_signing_key on company level, when custom credentials are defined // TODO: validation for client mail credentials by recipient if (\hash_equals(\hash_hmac('sha256', $input['timestamp'] . $input['token'], config('services.mailgun.webhook_signing_key')), $input['signature'])) {