Merge branch '0.7-develop' into develop

This commit is contained in:
Dane Everitt 2020-03-15 17:30:28 -07:00
commit b3fb658511
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 49 additions and 18 deletions

View file

@ -4,6 +4,7 @@ namespace Pterodactyl\Services\Databases;
use Exception;
use Pterodactyl\Models\Database;
use Pterodactyl\Helpers\Utilities;
use Illuminate\Database\DatabaseManager;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Extensions\DynamicDatabaseConnection;
@ -70,7 +71,9 @@ class DatabaseManagementService
$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(24));
$data['password'] = $this->encrypter->encrypt(
Utilities::randomStringWithSpecialCharacters(24)
);
$this->database->beginTransaction();
try {