From 1d92b91fc6bca35974eaa3ab98f53b527b420405 Mon Sep 17 00:00:00 2001 From: paulwer Date: Sat, 20 Jan 2024 08:53:47 +0100 Subject: [PATCH] merge cleanups --- app/Http/Controllers/MailgunController.php | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/MailgunController.php b/app/Http/Controllers/MailgunController.php index 2998a3595337..62c9062da222 100644 --- a/app/Http/Controllers/MailgunController.php +++ b/app/Http/Controllers/MailgunController.php @@ -62,13 +62,16 @@ class MailgunController extends BaseController */ public function webhook(Request $request) { - if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('services.mailgun.token')) { + + $input = $request->all(); + + if (\abs(\time() - $request['signature']['timestamp']) > 15) + return response()->json(['message' => 'Success'], 200); + + if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) ProcessMailgunWebhook::dispatch($request->all())->delay(10); - return response()->json(['message' => 'Success'], 200); - } - - return response()->json(['message' => 'Unauthorized'], 403); + return response()->json(['message' => 'Success.'], 200); } /** @@ -105,17 +108,14 @@ class MailgunController extends BaseController * ), * ) */ - public function webhook(Request $request) + public function inboundWebhook(Request $request) { + if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('services.mailgun.token')) { + ProcessMailgunInboundWebhook::dispatch($request->all())->delay(10); - $input = $request->all(); - - if (\abs(\time() - $request['signature']['timestamp']) > 15) return response()->json(['message' => 'Success'], 200); + } - if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) - ProcessMailgunWebhook::dispatch($request->all())->delay(10); - - return response()->json(['message' => 'Success.'], 200); + return response()->json(['message' => 'Unauthorized'], 403); } }