From 8ccdf9ea837da114d3f352e570cade549b33e2e9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 28 Dec 2016 10:00:58 +0100 Subject: [PATCH] Removed deprecated event and handlers. --- app/Events/BlockedBadLogin.php | 42 ------------------- app/Exceptions/Handler.php | 3 +- app/Handlers/Events/UserEventHandler.php | 38 ++--------------- app/Http/Controllers/Auth/LoginController.php | 6 --- app/Providers/EventServiceProvider.php | 5 --- .../views/emails/blocked-bad-creds-html.twig | 5 --- .../views/emails/blocked-bad-creds-text.twig | 3 -- 7 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 app/Events/BlockedBadLogin.php delete mode 100644 resources/views/emails/blocked-bad-creds-html.twig delete mode 100644 resources/views/emails/blocked-bad-creds-text.twig diff --git a/app/Events/BlockedBadLogin.php b/app/Events/BlockedBadLogin.php deleted file mode 100644 index f3e2ad3ad8..0000000000 --- a/app/Events/BlockedBadLogin.php +++ /dev/null @@ -1,42 +0,0 @@ -email = $email; - $this->ipAddress = $ipAddress; - } -} diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 2d1a846044..1ee5cc1c74 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -19,6 +19,7 @@ use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Auth\AuthenticationException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Request; use Illuminate\Session\TokenMismatchException; use Illuminate\Validation\ValidationException as ValException; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -99,7 +100,7 @@ class Handler extends ExceptionHandler ]; // create job that will mail. - $ipAddress = $_SERVER['REMOTE_ADDR'] ?? '0.0.0.0'; + $ipAddress = Request::ip() ?? '0.0.0.0'; $job = new MailError($userData, env('SITE_OWNER', ''), $ipAddress, $data); dispatch($job); } diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 316be2e682..774d23dc29 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -15,7 +15,6 @@ namespace FireflyIII\Handlers\Events; use Exception; use FireflyConfig; -use FireflyIII\Events\BlockedBadLogin; use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\BlockedUserLogin; @@ -42,6 +41,7 @@ use Swift_TransportException; * * The method name reflects what is being done. This is in the present tense. * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) // some of these methods will disappear soon. * * @package FireflyIII\Handlers\Events */ @@ -82,40 +82,6 @@ class UserEventHandler return true; } - /** - * @param BlockedBadLogin $event - * - * @deprecated - * @return bool - */ - public function reportBadLogin(BlockedBadLogin $event) - { - $email = $event->email; - $owner = env('SITE_OWNER'); - $ipAddress = $event->ipAddress; - /** @var Configuration $sendmail */ - $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login')); - Log::debug(sprintf('Now in reportBadLogin for email address %s', $email)); - Log::error(sprintf('User %s tried to login with bad credentials.', $email)); - if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) { - - return true; - } - - try { - Mail::send( - ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress], - function (Message $message) use ($owner) { - $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials'); - } - ); - } catch (Swift_TransportException $e) { - Log::error($e->getMessage()); - } - - return true; - } - /** * @param BlockedUserLogin $event * @@ -385,6 +351,7 @@ class UserEventHandler * from the user yet stored conveniently. * * @param ConfirmedUser $event + * * @deprecated * * @return bool @@ -401,6 +368,7 @@ class UserEventHandler * fashion as the previous method. * * @param RegisteredUser $event + * * @deprecated * * @return bool diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 4eb2782162..a2944b98e4 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -14,7 +14,6 @@ namespace FireflyIII\Http\Controllers\Auth; use Config; use FireflyConfig; -use FireflyIII\Events\BlockedBadLogin; use FireflyIII\Events\BlockedUserLogin; use FireflyIII\Events\LockedOutUser; use FireflyIII\Http\Controllers\Controller; @@ -87,11 +86,6 @@ class LoginController extends Controller event(new BlockedUserLogin($foundUser, $request->ip())); } - // simply a bad login. - if (is_null($foundUser)) { - event(new BlockedBadLogin($credentials['email'], $request->ip())); - } - // If the login attempt was unsuccessful we will increment the number of attempts // to login and redirect the user back to the login form. Of course, when this // user surpasses their maximum number of attempts they will get locked out. diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index e9c971f2b2..f26e8266ac 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -64,11 +64,6 @@ class EventServiceProvider extends ServiceProvider [ 'FireflyIII\Handlers\Events\UserEventHandler@reportUseBlockedDomain', ], - - 'FireflyIII\Events\BlockedBadLogin' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@reportBadLogin', - ], 'FireflyIII\Events\RegisteredUser' => // is a User related event. [ 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail', diff --git a/resources/views/emails/blocked-bad-creds-html.twig b/resources/views/emails/blocked-bad-creds-html.twig deleted file mode 100644 index 4485093a9b..0000000000 --- a/resources/views/emails/blocked-bad-creds-html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III has just blocked a login from user with email "{{ email }}" because they supplied bad credentials. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/emails/blocked-bad-creds-text.twig b/resources/views/emails/blocked-bad-creds-text.twig deleted file mode 100644 index e0de014cff..0000000000 --- a/resources/views/emails/blocked-bad-creds-text.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III has just blocked a login from user with email "{{ email }}" because they supplied bad credentials. -{% include 'emails.footer-text' %}