Horrible master -> dev merge that makes baby jesus cry :(

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	resources/views/auth/two_factor_enroll.blade.php

app/Http/Controllers/Auth/LoginController.php

@@ -199,28 +199,37 @@ class LoginController extends Controller
     public function getTwoFactorEnroll()
     {
 
+        // Make sure the user is logged in
         if (!Auth::check()) {
-            return redirect()->route('login')->with('error', 'You must be logged in.');
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
         }
 
 
         $settings = Setting::getSettings();
         $user = Auth::user();
 
+        // We wouldn't normally see this page if 2FA isn't enforced via the
+        // \App\Http\Middleware\CheckForTwoFactor middleware AND if a device isn't enrolled,
+        // 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
+        // won't cause any harm.
+
         if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) {
-            return redirect()->route('two-factor')->with('error', 'Your device is already enrolled.');
+            return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled'));
         }
 
-
+        $google2fa = new Google2FA();
-
+        $secret = $google2fa->generateSecretKey();
-        new Otp();
-        $secret = GoogleAuthenticator::generateRandom();
         $user->two_factor_secret = $secret;
         $user->save();
 
-        $barcode = new \Com\Tecnick\Barcode\Barcode();
+        $google2fa_url = $google2fa->getQRCodeGoogleUrl(
-        $barcode_obj =  $barcode->getBarcodeObj('QRCODE', 'otpauth://totp/'.urlencode($settings->site_name).':'.urlencode($user->username).'?secret='.urlencode($secret).'&issuer=Snipe-IT&period=30', 300, 300, 'black', array(-2, -2, -2, -2));
+            urlencode(Setting::getSettings()->site_name),
-        return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj);
+            urlencode($user->username),
+            $user->two_factor_secret
+        );
+
+        return view('auth.two_factor_enroll')->with('google2fa_url', $google2fa_url);
 
     }
 
@@ -232,6 +241,20 @@ class LoginController extends Controller
      */
     public function getTwoFactorAuth()
     {
+        // Check that the user is logged in
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
+        }
+
+        $user = Auth::user();
+
+        // Check whether there is a device enrolled.
+        // This *should* be handled via 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)) {
+            return redirect()->route('two-factor-enroll');
+        }
+
         return view('auth.two_factor');
     }
 
@@ -246,7 +269,11 @@ class LoginController extends Controller
     {
 
         if (!Auth::check()) {
-            return redirect()->route('login')->with('error', 'You must be logged in.');
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
+        }
+
+        if (!$request->has('two_factor_secret')) {
+            return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
         }
 
         if (!$request->has('two_factor_secret')) {
@@ -254,19 +281,17 @@ class LoginController extends Controller
         }
 
         $user = Auth::user();
-        $otp = new Otp();
+        $google2fa = new Google2FA();
+        $secret = $request->input('two_factor_secret');
 
-
+        if ($google2fa->verifyKey($user->two_factor_secret, $secret)) {
-
-        if ($otp->checkTotp(Encoding::base32DecodeUpper($user->two_factor_secret), $request->get('two_factor_secret'))) {
             $user->two_factor_enrolled = 1;
             $user->save();
             $request->session()->put('2fa_authed', 'true');
             return redirect()->route('home')->with('success', 'You are logged in!');
         }
 
-        \Log::debug('Did not match');
+        return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code'));
-        return redirect()->route('two-factor')->with('error', 'Invalid two-factor code');
 
 
     }
@@ -291,7 +316,7 @@ class LoginController extends Controller
             return redirect()->away($customLogoutUrl);
         }
 
-        return redirect()->route('login')->with('success', 'You have successfully logged out!');
+        return redirect()->route('login')->with('success',  trans('auth/general.logout.success'));
     }
 
 
@@ -316,11 +341,11 @@ class LoginController extends Controller
     }
 
     /**
-    * Redirect the user after determining they are locked out.
+     * Redirect the user after determining they are locked out.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
-    */
+     */
     protected function sendLockoutResponse(Request $request)
     {
         $seconds = $this->limiter()->availableIn(
@@ -331,18 +356,18 @@ class LoginController extends Controller
 
         $message = \Lang::get('auth/message.throttle', ['minutes' => $minutes]);
 
-            return redirect()->back()
+        return redirect()->back()
             ->withInput($request->only($this->username(), 'remember'))
             ->withErrors([$this->username() => $message]);
     }
 
 
     /**
-    * Override the lockout time and duration
+     * Override the lockout time and duration
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @return  bool
+     * @return bool
-    */
+     */
     protected function hasTooManyLoginAttempts(Request $request)
     {
         $lockoutTime = config('auth.throttle.lockout_duration');

composer.json

@@ -38,8 +38,8 @@
     "patchwork/utf8": "~1.2",
     "phpdocumentor/reflection-docblock": "3.2.2",
     "phpspec/prophecy": "1.7.5",
-    "pragmarx/google2fa": "^3.0",
+    "pragmarx/google2fa": "^5.0",
-    "pragmarx/google2fa-laravel": "^0.2.0",
+    "pragmarx/google2fa-laravel": "^0.3.0",
     "predis/predis": "^1.1",
     "rollbar/rollbar-laravel": "^4.0",
     "schuppo/password-strength": "~1.5",

resources/lang/en/auth/message.php

@@ -9,11 +9,23 @@ return array(
     'account_banned'         => 'This user account is banned.',
     'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
+    'two_factor' => array(
+        'already_enrolled'      => 'Your device is already enrolled.',
+        'success'               => 'You have successfully logged in.',
+        'code_required'         => 'Two-factor code is required.',
+        'invalid_code'          => 'Two-factor code is invalid.',
+    ),
+
     'signin' => array(
         'error'   => 'There was a problem while trying to log you in, please try again.',
         'success' => 'You have successfully logged in.',
     ),
 
+    'logout' => array(
+        'error'   => 'There was a problem while trying to log you out, please try again.',
+        'success' => 'You have successfully logged out.',
+    ),
+
     'signup' => array(
         'error'   => 'There was a problem while trying to create your account, please try again.',
         'success' => 'Account sucessfully created.',