Merge branch 'release/v0.7.14' into feature/react

app/Http/Controllers/Auth/LoginController.php

@@ -54,6 +54,71 @@ class LoginController extends AbstractLoginController
             return $this->sendFailedLoginResponse($request, $user);
         }
 
+        if ($user->use_totp) {
+            $token = str_random(64);
+            $this->cache->put($token, ['user_id' => $user->id, 'valid_credentials' => true], 5);
+
+            return redirect()->route('auth.totp')->with('authentication_token', $token);
+        }
+
+        $this->auth->guard()->login($user, true);
+
+        return $this->sendLoginResponse($user, $request);
+    }
+
+    /**
+     * Handle a TOTP implementation page.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     */
+    public function totp(Request $request)
+    {
+        $token = $request->session()->get('authentication_token');
+        if (is_null($token) || $this->auth->guard()->user()) {
+            return redirect()->route('auth.login');
+        }
+
+        return view('auth.totp', ['verify_key' => $token]);
+    }
+
+    /**
+     * Handle a login where the user is required to provide a TOTP authentication
+     * token.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
+     *
+     * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
+     * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
+     * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     */
+    public function loginUsingTotp(Request $request)
+    {
+        if (is_null($request->input('verify_token'))) {
+            return $this->sendFailedLoginResponse($request);
+        }
+
+        try {
+            $cache = $this->cache->pull($request->input('verify_token'), []);
+            $user = $this->repository->find(array_get($cache, 'user_id', 0));
+        } catch (RecordNotFoundException $exception) {
+            return $this->sendFailedLoginResponse($request);
+        }
+
+        if (is_null($request->input('2fa_token'))) {
+            return $this->sendFailedLoginResponse($request, $user);
+        }
+
+        if (! $this->google2FA->verifyKey(
+            $this->encrypter->decrypt($user->totp_secret),
+            $request->input('2fa_token'),
+            $this->config->get('pterodactyl.auth.2fa.window')
+        )) {
+            return $this->sendFailedLoginResponse($request, $user);
+        }
+
         // If the user is using 2FA we do not actually log them in at this step, we return
         // a one-time token to link the 2FA credentials to this account via the UI.
         if ($user->use_totp) {

app/Http/Controllers/Base/SecurityController.php

@@ -83,8 +83,8 @@ class SecurityController extends Controller
 
         return JsonResponse::create([
             'enabled' => false,
-            'qr_image' => $response->get('image'),
-            'secret' => $response->get('secret'),
+            'qr_image' => $response,
+            'secret' => '',
         ]);
     }