Merge branch 'develop' into feature/vuejs

Author: DaneEveritt

app/Http/Controllers/Admin/ServersController.php

@@ -599,7 +599,7 @@ public function resetDatabasePassword(Request $request, $server)
             ['id', '=', $request->input('database')],
         ]);
 
-        $this->databasePasswordService->handle($database, str_random(20));
+        $this->databasePasswordService->handle($database, str_random(24));
 
         return response('', 204);
     }

app/Models/Node.php

@@ -110,8 +110,8 @@ class Node extends Model implements CleansAttributes, ValidableContract
         'disk' => 'numeric|min:1',
         'disk_overallocate' => 'numeric|min:-1',
         'daemonBase' => 'regex:/^([\/][\d\w.\-\/]+)$/',
-        'daemonSFTP' => 'numeric|between:1024,65535',
-        'daemonListen' => 'numeric|between:1024,65535',
+        'daemonSFTP' => 'numeric|between:1,65535',
+        'daemonListen' => 'numeric|between:1,65535',
         'maintenance_mode' => 'boolean',
         'upload_size' => 'int|between:1,1024',
     ];

app/Services/Databases/DatabaseManagementService.php

@@ -69,7 +69,7 @@ public function create($server, array $data)
         $data['server_id'] = $server;
         $data['database'] = sprintf('s%d_%s', $server, $data['database']);
         $data['username'] = sprintf('u%d_%s', $server, str_random(10));
-        $data['password'] = $this->encrypter->encrypt(str_random(16));
+        $data['password'] = $this->encrypter->encrypt(str_random(24));
 
         $this->database->beginTransaction();
         try {

app/Services/Users/TwoFactorSetupService.php

@@ -9,21 +9,27 @@
 
 namespace Pterodactyl\Services\Users;
 
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Models\User;
-use PragmaRX\Google2FA\Google2FA;
+use PragmaRX\Google2FAQRCode\Google2FA;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class TwoFactorSetupService
 {
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    private $config;
+
     /**
      * @var \Illuminate\Contracts\Encryption\Encrypter
      */
     private $encrypter;
 
     /**
-     * @var \PragmaRX\Google2FA\Google2FA
+     * @var PragmaRX\Google2FAQRCode\Google2FA
      */
     private $google2FA;
 
@@ -35,15 +41,18 @@ class TwoFactorSetupService
     /**
      * TwoFactorSetupService constructor.
      *
+     * @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(
+        ConfigRepository $config,
         Encrypter $encrypter,
         Google2FA $google2FA,
         UserRepositoryInterface $repository
     ) {
+        $this->config = $config;
         $this->encrypter = $encrypter;
         $this->google2FA = $google2FA;
         $this->repository = $repository;
@@ -61,8 +70,8 @@ public function __construct(
      */
     public function handle(User $user): Collection
     {
-        $secret = $this->google2FA->generateSecretKey(config('pterodactyl.auth.2fa.bytes'));
-        $image = $this->google2FA->getQRCodeGoogleUrl(config('app.name'), $user->email, $secret);
+        $secret = $this->google2FA->generateSecretKey($this->config->get('pterodactyl.auth.2fa.bytes'));
+        $image = $this->google2FA->getQRCodeInline($this->config->get('app.name'), $user->email, $secret);
 
         $this->repository->withoutFreshModel()->update($user->id, [
             'totp_secret' => $this->encrypter->encrypt($secret),

composer.json

@@ -29,7 +29,8 @@
         "lord/laroute": "^2.4",
         "matriphe/iso-639": "^1.2",
         "nesbot/carbon": "^1.22",
-        "pragmarx/google2fa": "^2.0",
+        "pragmarx/google2fa": "^5.0",
+        "pragmarx/google2fa-qrcode": "^1.0.3",
         "predis/predis": "^1.1",
         "prologue/alerts": "^0.4",
         "ramsey/uuid": "^3.7",

composer.lock

@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-10-28T20:50:23+01:00",
+    "exported_at": "2019-05-01T16:35:15+00:00",
     "name": "Teamspeak3 Server",
     "author": "support@pterodactyl.io",
     "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.",
@@ -27,10 +27,10 @@
             "name": "Server Version",
             "description": "The version of Teamspeak 3 to use when running the server.",
             "env_variable": "TS_VERSION",
-            "default_value": "3.5.0",
+            "default_value": "3.7.1",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/"
         }
     ]
-}
+}

database/seeds/eggs/voice-servers/egg-teamspeak3-server.json

@@ -5,8 +5,9 @@
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\User;
-use PragmaRX\Google2FA\Google2FA;
 use Illuminate\Support\Collection;
+use PragmaRX\Google2FAQRCode\Google2FA;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Services\Users\TwoFactorSetupService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@@ -24,7 +25,7 @@ class TwoFactorSetupServiceTest extends TestCase
     private $encrypter;
 
     /**
-     * @var \PragmaRX\Google2FA\Google2FA|\Mockery\Mock
+     * @var PragmaRX\Google2FAQRCode\Google2FA|\Mockery\Mock
      */
     private $google2FA;
 
@@ -40,6 +41,7 @@ public function setUp()
     {
         parent::setUp();
 
+        $this->config = m::mock(Repository::class);
         $this->encrypter = m::mock(Encrypter::class);
         $this->google2FA = m::mock(Google2FA::class);
         $this->repository = m::mock(UserRepositoryInterface::class);
@@ -56,7 +58,8 @@ public function testSecretAndImageAreReturned()
         config()->set('app.name', 'CompanyName');
 
         $this->google2FA->shouldReceive('generateSecretKey')->with(32)->once()->andReturn('secretKey');
-        $this->google2FA->shouldReceive('getQRCodeGoogleUrl')->with('CompanyName', $model->email, 'secretKey')->once()->andReturn('http://url.com');
+        $this->config->shouldReceive('get')->with('app.name')->once()->andReturn('CompanyName');
+        $this->google2FA->shouldReceive('getQRCodeInline')->with('CompanyName', $model->email, 'secretKey')->once()->andReturn('http://url.com');
         $this->encrypter->shouldReceive('encrypt')->with('secretKey')->once()->andReturn('encryptedSecret');
         $this->repository->shouldReceive('withoutFreshModel->update')->with($model->id, ['totp_secret' => 'encryptedSecret'])->once()->andReturnNull();