kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 00:20:03 +00:00
Code Issues Projects Releases Wiki Activity

Better 2fa handling

Browse Source
This commit is contained in:
James Cole
2017-02-17 20:15:17 +01:00
parent 48c26c5837
commit f7642beb7c
6 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Middleware/AuthenticateTwoFactor.php
View File

@@ -14,8 +14,10 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Log;
use Preferences;
use Session;
@@ -55,8 +57,13 @@ class AuthenticateTwoFactor
}
$is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
$has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$is2faAuthed = Session::get('twofactor-authenticated');
// grab 2auth information from cookie, not from session.
$is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true';
if ($is2faEnabled && $has2faSecret && !$is2faAuthed) {
Log::debug('Does not seem to be 2 factor authed, redirect.');
return redirect(route('two-factor.index'));
}

8
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -17,7 +17,8 @@ use Closure;
use Illuminate\Support\Facades\Auth;
use Preferences;
use Session;
use Log;
use Cookie;
/**
* Class RedirectIfTwoFactorAuthenticated
*
@@ -40,7 +41,10 @@ class RedirectIfTwoFactorAuthenticated
$is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
$has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$is2faAuthed = Session::get('twoFactorAuthenticated');
// grab 2auth information from cookie
$is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true';
if ($is2faEnabled && $has2faSecret && $is2faAuthed) {
return redirect('/');
}