kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-09 22:26:04 +00:00
Code Issues Projects Releases Wiki Activity

Extend warning with IP + host etc.

Browse Source
This commit is contained in:
James Cole
2024-12-22 06:33:37 +01:00
parent 2e993857e8
commit bffa0088b4
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Notifications/Admin/UnknownUserLoginAttempt.php
View File

@@ -27,10 +27,12 @@ namespace FireflyIII\Notifications\Admin;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Notifications\ReturnsSettings;
use FireflyIII\Support\Facades\Steam;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Request;
use NotificationChannels\Pushover\PushoverMessage;
use Ntfy\Message;
@@ -59,10 +61,14 @@ class UnknownUserLoginAttempt extends Notification
*/
public function toMail(OwnerNotifiable $notifiable): MailMessage
{
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();
$time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js'));
return new MailMessage()
->markdown('emails.owner.unknown-user', ['address' => $this->address])
->subject((string) trans('email.unknown_user_subject'))
;
->markdown('emails.owner.unknown-user', ['address' => $this->address, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])
->subject((string) trans('email.unknown_user_subject'));
}
/**
@@ -85,8 +91,7 @@ class UnknownUserLoginAttempt extends Notification
public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
->title((string) trans('email.unknown_user_subject'))
;
->title((string) trans('email.unknown_user_subject'));
}
/**