Fix be745efc2668d4129244e5f4f79ac5189b774288 - Fixes #396

This commit is contained in:
Bubka 2024-10-12 20:07:23 +02:00
parent c45fb2f658
commit 70cd730a49
5 changed files with 19 additions and 9 deletions

View File

@ -45,7 +45,9 @@ class FailedLoginListener extends AbstractAccessListener
* @var \App\Models\User
*/
$user = $event->user;
$ip = $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip());
$ip = config('2fauth.proxy_headers.forIp')
? $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip())
: $this->request->ip();
$log = $user->authentications()->create([
'ip_address' => $ip,

View File

@ -44,7 +44,9 @@ class LoginListener extends AbstractAccessListener
* @var \App\Models\User
*/
$user = $event->user;
$ip = $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip());
$ip = config('2fauth.proxy_headers.forIp')
? $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip())
: $this->request->ip();
$userAgent = $this->request->userAgent();
$known = $user->authentications()
->whereIpAddress($ip)

View File

@ -43,7 +43,9 @@ class LogoutListener extends AbstractAccessListener
* @var \App\Models\User
*/
$user = $event->user;
$ip = $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip());
$ip = config('2fauth.proxy_headers.forIp')
? $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip())
: $this->request->ip();
$userAgent = $this->request->userAgent();
$log = $user->authentications()
->whereIpAddress($ip)

View File

@ -49,7 +49,9 @@ class OtherDeviceLogoutListener extends AbstractAccessListener
* @var \App\Models\User
*/
$user = $event->user;
$ip = $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip());
$ip = config('2fauth.proxy_headers.forIp')
? $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip())
: $this->request->ip();
$userAgent = $this->request->userAgent();
$authLog = $user->authentications()
->whereIpAddress($ip)

View File

@ -24,7 +24,9 @@ class VisitedByProxyUserListener extends AbstractAccessListener
* @var \App\Models\User
*/
$user = $event->user;
$ip = $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip());
$ip = config('2fauth.proxy_headers.forIp')
? $this->request->header(config('2fauth.proxy_headers.forIp'), $this->request->ip())
: $this->request->ip();
$userAgent = $this->request->userAgent();
$guard = config('auth.defaults.guard');
$known = $user->authentications()