From d7121910124f9cfec8d8e679b7dcb4ed42b545ab Mon Sep 17 00:00:00 2001 From: paulwer Date: Sun, 24 Mar 2024 13:10:45 +0100 Subject: [PATCH] minor changes --- app/Http/Controllers/BrevoController.php | 6 +++--- app/Http/Controllers/MailgunController.php | 1 + app/Services/IngresEmail/IngresEmailEngine.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BrevoController.php b/app/Http/Controllers/BrevoController.php index c87b4ff0f285..a81d1320e5c5 100644 --- a/app/Http/Controllers/BrevoController.php +++ b/app/Http/Controllers/BrevoController.php @@ -185,9 +185,9 @@ class BrevoController extends BaseController { $input = $request->all(); - // TODO: validation for client credentials by recipient - // if (!($request->has('token') && $request->get('token') == config('services.brevo.secret'))) - // return response()->json(['message' => 'Unauthorized'], 403); + // TODO: validation for client mail credentials by recipient + if (!($request->has('token') && $request->get('token') == config('services.brevo.secret'))) + return response()->json(['message' => 'Unauthorized'], 403); if (!array_key_exists('items', $input)) { Log::info('Failed: Message could not be parsed, because required parameters are missing.'); diff --git a/app/Http/Controllers/MailgunController.php b/app/Http/Controllers/MailgunController.php index b26952598005..36875eb8d624 100644 --- a/app/Http/Controllers/MailgunController.php +++ b/app/Http/Controllers/MailgunController.php @@ -131,6 +131,7 @@ class MailgunController extends BaseController } // @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'])) { ProcessMailgunInboundWebhook::dispatch($input["recipient"] . "|" . $input["message-url"])->delay(10); diff --git a/app/Services/IngresEmail/IngresEmailEngine.php b/app/Services/IngresEmail/IngresEmailEngine.php index e218a8d3256c..b8a5013a5421 100644 --- a/app/Services/IngresEmail/IngresEmailEngine.php +++ b/app/Services/IngresEmail/IngresEmailEngine.php @@ -156,7 +156,7 @@ class IngresEmailEngine { // Skipping executions: will not result in not saving Metadata to prevent usage of these conditions, to spam if (!$this->validateExpenseShouldProcess()) { - $this->log('email parsing not active for this company. from: ' . $this->email->from); + $this->log('mailbox not active for this company. from: ' . $this->email->from); return; } if (!$this->validateExpenseSender()) {