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

Replace 2FA QR Code generation (#1548)

Browse source 
Due to the Google API for generating the 2FA QR code will be shut down on 14.04.2019, this adds the package "pragmarx/google2fa-qrcode" and updates "pragmarx/google2fa" to version 5.x. 
Due to now using BaconQR, Pterodactyl now needs the php-imagick extension to render the images.
This commit is contained in:
saibotk 2019-04-27 20:18:12 +02:00 • committed by Dane Everitt
parent 4460b6835a
commit 7277b6449b
4 changed files with 167 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Services/Users/TwoFactorSetupService.php
View file

@ -10,7 +10,7 @@
namespace Pterodactyl\Services\Users;
use Pterodactyl\Models\User;
use PragmaRX\Google2FA\Google2FA;
use PragmaRX\Google2FAQRCode\Google2FA;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
@ -28,7 +28,7 @@ class TwoFactorSetupService
private $encrypter;
/**
* @var \PragmaRX\Google2FA\Google2FA
* @var PragmaRX\Google2FAQRCode\Google2FA
*/
private $google2FA;
@ -42,7 +42,7 @@ class TwoFactorSetupService
*
* @param \Illuminate\Contracts\Config\Repository $config
* @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
* @param \PragmaRX\Google2FA\Google2FA $google2FA
* @param PragmaRX\Google2FAQRCode\Google2FA $google2FA
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
*/
public function __construct(
@ -70,7 +70,7 @@ class TwoFactorSetupService
public function handle(User $user): string
{
$secret = $this->google2FA->generateSecretKey($this->config->get('pterodactyl.auth.2fa.bytes'));
$image = $this->google2FA->getQRCodeGoogleUrl($this->config->get('app.name'), $user->email, $secret);
$image = $this->google2FA->getQRCodeInline($this->config->get('app.name'), $user->email, $secret);
$this->repository->withoutFreshModel()->update($user->id, [
'totp_secret' => $this->encrypter->encrypt($secret),