Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge cleanups

Browse Source
This commit is contained in:
paulwer 2024-01-20 08:53:47 +01:00
parent 678da384a9
commit 1d92b91fc6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/MailgunController.php
View File

@ -62,13 +62,16 @@ class MailgunController extends BaseController
*/ */
public function webhook(Request $request) 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); ProcessMailgunWebhook::dispatch($request->all())->delay(10);
return response()->json(['message' => 'Success'], 200); return response()->json(['message' => 'Success.'], 200);
}
return response()->json(['message' => 'Unauthorized'], 403);
} }
/** /**
@ -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); 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'])) return response()->json(['message' => 'Unauthorized'], 403);
ProcessMailgunWebhook::dispatch($request->all())->delay(10);
return response()->json(['message' => 'Success.'], 200);
} }
} }