kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-10 06:32:05 +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'));
}
/**

24
app/Notifications/User/UserLogin.php
View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Notifications\User;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Notifications\ReturnsSettings;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
@@ -63,7 +64,7 @@ class UserLogin extends Notification
$time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js'));
return (new MailMessage())
->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => $this->getHost()])
->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => Steam::getHostName($this->ip)])
->subject((string) trans('email.login_from_new_ip'))
;
}
@@ -74,7 +75,7 @@ class UserLogin extends Notification
$message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.login_from_new_ip'));
$message->body((string) trans('email.slack_login_from_new_ip', ['host' => $this->getHost(), 'ip' => $this->ip]));
$message->body((string) trans('email.slack_login_from_new_ip', ['host' => Steam::getHostName($this->ip), 'ip' => $this->ip]));
return $message;
}
@@ -84,7 +85,7 @@ class UserLogin extends Notification
*/
public function toPushover(User $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['host' => $this->getHost(), 'ip' => $this->ip]))
return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['host' => Steam::getHostName($this->ip), 'ip' => $this->ip]))
->title((string) trans('email.login_from_new_ip'))
;
}
@@ -94,7 +95,7 @@ class UserLogin extends Notification
*/
public function toSlack(User $notifiable)
{
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['host' => $this->getHost(), 'ip' => $this->ip]));
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['host' => Steam::getHostName($this->ip), 'ip' => $this->ip]));
}
/**
@@ -105,20 +106,5 @@ class UserLogin extends Notification
return ReturnsAvailableChannels::returnChannels('user', $notifiable);
}
private function getHost(): string
{
$host = '';
try {
$hostName = app('steam')->getHostName($this->ip);
} catch (FireflyException $e) {
app('log')->error($e->getMessage());
$hostName = $this->ip;
}
if ($hostName !== $this->ip) {
$host = $hostName;
}
return $host;
}
}

13
app/Support/Steam.php
View File

@@ -770,13 +770,20 @@ class Steam
*/
public function getHostName(string $ipAddress): string
{
$host = '';
try {
$hostName = gethostbyaddr($ipAddress);
} catch (\Exception $e) { // intentional generic exception
throw new FireflyException($e->getMessage(), 0, $e);
} catch (\Exception $e) {
app('log')->error($e->getMessage());
$hostName = $ipAddress;
}
return (string) $hostName;
if ('' !== (string) $hostName && $hostName !== $ipAddress) {
$host = $hostName;
}
return (string) $host;
}
public function getLastActivities(array $accounts): array

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

@@ -54,6 +54,7 @@ return [
'ip_address' => 'IP address',
'host_name' => 'Host',
'date_time' => 'Date + time',
'user_agent' => 'Browser',
// access token created
'access_token_created_subject' => 'A new access token was created',

8
resources/views/emails/owner/unknown-user.blade.php
View File

@@ -1,3 +1,9 @@
@component('mail::message')
{{ trans('email.unknown_user_body', ['address' => $address]) }}
{{ trans('email.unknown_user_body', ['address' => $address]) }}
- {{ trans('email.date_time') }}: {{ $time }}
- {{ trans('email.ip_address') }}: {{ $ip }}
- {{ trans('email.host_name') }}: {{ $host }}
- {{ trans('email.user_agent') }}: {{ $userAgent }}
@endcomponent