From 9c58b77f014a40f92ed2b6b85c7695a8bac897be Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 18 Mar 2016 11:10:51 +0100 Subject: [PATCH] Error when blocked user logs in --- app/Http/Controllers/Auth/AuthController.php | 22 +++++++++++++++ .../views/emails/blocked-login-html.twig | 27 +++++++++++++++++++ resources/views/emails/blocked-login.twig | 8 ++++++ 3 files changed, 57 insertions(+) create mode 100644 resources/views/emails/blocked-login-html.twig create mode 100644 resources/views/emails/blocked-login.twig diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index b10ce7cdd9..0233cce26a 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -82,6 +82,28 @@ class AuthController extends Controller $code = 'general_blocked'; } $message = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']])); + + // send a message home about the blocked attempt to login. + // perhaps in a later stage, simply log these messages. + // send email. + try { + $email = env('SITE_OWNER', false); + $fields = [ + 'user_id' => $foundUser->id, + 'email' => $credentials['email'], + 'code' => $code, + 'message' => $message, + 'ip' => $request->ip(), + ]; + Mail::send( + ['emails.blocked-login-html', 'emails.blocked-login'], $fields, function (Message $message) use ($email) { + $message->to($email, $email)->subject('Blocked a login attempt.'); + } + ); + } catch (\Swift_TransportException $e) { + Log::error($e->getMessage()); + } + } if ($throttles) { diff --git a/resources/views/emails/blocked-login-html.twig b/resources/views/emails/blocked-login-html.twig new file mode 100644 index 0000000000..052d0508d8 --- /dev/null +++ b/resources/views/emails/blocked-login-html.twig @@ -0,0 +1,27 @@ + + + + + + + + +

+ Hey there, +

+

+ Firefly III has just blocked a login from user #{{ user_id }} ({{ email }}). +

+

+ The blocked code was "{{ code }}" and the subsequent message was: +

+

+"{{ message }}" +

+ +

+ The login attempt came from IP {{ ip }}. +

+ + + diff --git a/resources/views/emails/blocked-login.twig b/resources/views/emails/blocked-login.twig new file mode 100644 index 0000000000..ea4ce0aede --- /dev/null +++ b/resources/views/emails/blocked-login.twig @@ -0,0 +1,8 @@ +Hey there, + +Firefly III has just blocked a login from user #{{ user_id }} ({{ email }}). + +The blocked code was "{{ code }}" and the subsequent message was: +"{{ message }}" + +The login attempt came from IP {{ ip }}