StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix 2FA handling; closes #1962

Browse source
This commit is contained in:
Dane Everitt 2020-04-25 13:01:16 -07:00
parent 2cf1c7f712
commit 9eb31a16d9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 105 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/Auth/LoginCheckpointController.php
View file

@ -66,7 +66,7 @@ class LoginCheckpointController extends AbstractLoginController
* provided a valid username and password.
*
* @param \Pterodactyl\Http\Requests\Auth\LoginCheckpointRequest $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|void
*
* @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
* @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
@ -75,18 +75,19 @@ class LoginCheckpointController extends AbstractLoginController
*/
public function __invoke(LoginCheckpointRequest $request): JsonResponse
{
$token = $request->input('confirmation_token');
try {
$user = $this->repository->find(
$this->cache->pull($request->input('confirmation_token'), 0)
);
$user = $this->repository->find($this->cache->get($token, 0));
} catch (RecordNotFoundException $exception) {
return $this->sendFailedLoginResponse($request);
}
$decrypted = $this->encrypter->decrypt($user->totp_secret);
$window = $this->config->get('pterodactyl.auth.2fa.window');
if ($this->google2FA->verifyKey($decrypted, $request->input('authentication_code'), $window)) {
if ($this->google2FA->verifyKey($decrypted, (string) $request->input('authentication_code') ?? '', config('pterodactyl.auth.2fa.window'))) {
$this->cache->delete($token);
return $this->sendLoginResponse($user, $request);
}