kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Update message to include IP

Browse Source
This commit is contained in:
James Cole
2025-06-03 20:00:13 +02:00
parent 35e0791a9f
commit d0c658e79a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Notifications/Security/UserFailedLoginAttempt.php
View File

@@ -67,9 +67,10 @@ class UserFailedLoginAttempt extends Notification
{ {
$settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable); $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
$message = new Message(); $message = new Message();
$ip = Request::ip();
$message->topic($settings['ntfy_topic']); $message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.failed_login_subject')); $message->title((string) trans('email.failed_login_subject'));
$message->body((string) trans('email.failed_login_message', ['email' => $this->user->email])); $message->body((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]));
return $message; return $message;
} }
@@ -79,7 +80,8 @@ class UserFailedLoginAttempt extends Notification
*/ */
public function toPushover(User $notifiable): PushoverMessage public function toPushover(User $notifiable): PushoverMessage
{ {
return PushoverMessage::create((string) trans('email.failed_login_message', ['email' => $this->user->email])) $ip = Request::ip();
return PushoverMessage::create((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]))
->title((string) trans('email.failed_login_subject')) ->title((string) trans('email.failed_login_subject'))
; ;
} }
@@ -89,7 +91,8 @@ class UserFailedLoginAttempt extends Notification
*/ */
public function toSlack(User $notifiable): SlackMessage public function toSlack(User $notifiable): SlackMessage
{ {
$message = (string) trans('email.failed_login_message', ['email' => $this->user->email]); $ip = Request::ip();
$message = (string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]);
return new SlackMessage()->content($message); return new SlackMessage()->content($message);
} }

2
resources/lang/en_US/email.php
View File

@@ -70,7 +70,7 @@ return [
// known user login attempt // known user login attempt
'failed_login_subject' => 'Firefly III detected a failed login attempt', 'failed_login_subject' => 'Firefly III detected a failed login attempt',
'failed_login_body' => 'Firefly III detected that somebody (you?) failed to login with your account ":email". Please verify that this was you.', 'failed_login_body' => 'Firefly III detected that somebody (you?) failed to login with your account ":email". Please verify that this was you.',
'failed_login_message' => 'A failed login attempt on your Firefly III account ":email" was detected.', 'failed_login_message' => 'A failed login attempt (:ip) on your Firefly III account ":email" was detected.',
'failed_login_warning' => 'If you recognize this IP address or the login attempt, you can ignore this message. If you didn\'t try to login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!', 'failed_login_warning' => 'If you recognize this IP address or the login attempt, you can ignore this message. If you didn\'t try to login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
// registered // registered