lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Moar comments

Browse source
This commit is contained in:
snipe 2019-03-20 01:21:34 -07:00
parent cc5c7d33e7
commit 8d0ee9e531
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Auth/LoginController.php
View file

@ -223,7 +223,7 @@ class LoginController extends Controller
// but let's check check anyway in case there's a browser history or back button thing. // but let's check check anyway in case there's a browser history or back button thing.
// While you can access this page directly, enrolling a device when 2FA isn't enforced // While you can access this page directly, enrolling a device when 2FA isn't enforced
// won't cause any harm. // won't cause any harm.
if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) { if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) {
return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled')); return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled'));
} }
@ -247,12 +247,16 @@ class LoginController extends Controller
*/ */
public function getTwoFactorAuth() public function getTwoFactorAuth()
{ {
// Check that the user is logged in
if (!Auth::check()) { if (!Auth::check()) {
return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
} }
$user = Auth::user(); $user = Auth::user();
// Check whether there is a device enrolled.
// This *should* be handled viaq the \App\Http\Middleware\CheckForTwoFactor middleware
// but we're just making sure (in case someone edited the database directly, etc)
if (($user->two_factor_secret=='') || ($user->two_factor_enrolled!=1)) { if (($user->two_factor_secret=='') || ($user->two_factor_enrolled!=1)) {
return redirect()->route('two-factor-enroll'); return redirect()->route('two-factor-enroll');
} }