dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Fix database naming conventions; closes #2404

Browse Source
This commit is contained in:
Dane Everitt 2020-09-24 19:31:42 -07:00
parent 6a4914df3b
commit c0fc9125ed
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Api/Client/Servers/Databases/StoreDatabaseRequest.php
View File

@ -22,7 +22,7 @@ class StoreDatabaseRequest extends ClientApiRequest implements ClientPermissions
public function rules(): array public function rules(): array
{ {
return [ return [
'database' => 'required|alpha_dash|min:1|max:100', 'database' => 'required|alpha_dash|min:3|max:48',
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/', 'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
]; ];
} }

2
app/Models/Database.php
View File

@ -65,7 +65,7 @@ class Database extends Model
public static $validationRules = [ public static $validationRules = [
'server_id' => 'required|numeric|exists:servers,id', 'server_id' => 'required|numeric|exists:servers,id',
'database_host_id' => 'required|exists:database_hosts,id', 'database_host_id' => 'required|exists:database_hosts,id',
'database' => 'required|string|alpha_dash|between:3,100', 'database' => 'required|string|alpha_dash|between:3,48',
'username' => 'string|alpha_dash|between:3,100', 'username' => 'string|alpha_dash|between:3,100',
'max_connections' => 'nullable|integer', 'max_connections' => 'nullable|integer',
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/', 'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',

5
app/Services/Databases/DatabaseManagementService.php
View File

@ -104,9 +104,12 @@ class DatabaseManagementService
} }
} }
// Max of 48 characters, including the s123_ that we append to the front.
$truncatedName = substr($data['database'], 0, 48 - strlen("s{$server->id}_"));
$data = array_merge($data, [ $data = array_merge($data, [
'server_id' => $server->id, 'server_id' => $server->id,
'database' => sprintf('s%d_%s', $server->id, $data['database']), 'database' => $truncatedName,
'username' => sprintf('u%d_%s', $server->id, str_random(10)), 'username' => sprintf('u%d_%s', $server->id, str_random(10)),
'password' => $this->encrypter->encrypt( 'password' => $this->encrypter->encrypt(
Utilities::randomStringWithSpecialCharacters(24) Utilities::randomStringWithSpecialCharacters(24)

6
resources/scripts/components/server/databases/CreateDatabaseButton.tsx
View File

@ -19,9 +19,9 @@ interface Values {
const schema = object().shape({ const schema = object().shape({
databaseName: string() databaseName: string()
.required('A database name must be provided.') .required('A database name must be provided.')
.min(5, 'Database name must be at least 5 characters.') .min(3, 'Database name must be at least 3 characters.')
.max(64, 'Database name must not exceed 64 characters.') .max(48, 'Database name must not exceed 48 characters.')
.matches(/^[A-Za-z0-9_\-.]{5,64}$/, 'Database name should only contain alphanumeric characters, underscores, dashes, and/or periods.'), .matches(/^[A-Za-z0-9_\-.]{3,48}$/, 'Database name should only contain alphanumeric characters, underscores, dashes, and/or periods.'),
connectionsFrom: string() connectionsFrom: string()
.required('A connection value must be provided.') .required('A connection value must be provided.')
.matches(/^([1-9]{1,3}|%)(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?$/, 'A valid connection address must be provided.'), .matches(/^([1-9]{1,3}|%)(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?$/, 'A valid connection address must be provided.'),