Don't allow creation of a database with an identical name for the same server; closes #2447
This commit is contained in:
parent
7b0f998f0b
commit
a4d7170fac
2 changed files with 68 additions and 1 deletions
|
@ -2,7 +2,11 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Databases;
|
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Databases;
|
||||||
|
|
||||||
|
use Webmozart\Assert\Assert;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
use Pterodactyl\Models\Permission;
|
use Pterodactyl\Models\Permission;
|
||||||
|
use Illuminate\Database\Query\Builder;
|
||||||
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
|
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
|
||||||
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
|
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
|
||||||
|
|
||||||
|
@ -21,9 +25,31 @@ class StoreDatabaseRequest extends ClientApiRequest implements ClientPermissions
|
||||||
*/
|
*/
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
|
$server = $this->route()->parameter('server');
|
||||||
|
|
||||||
|
Assert::isInstanceOf($server, Server::class);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'database' => 'required|alpha_dash|min:3|max:48',
|
'database' => [
|
||||||
|
'required',
|
||||||
|
'alpha_dash',
|
||||||
|
'min:3',
|
||||||
|
'max:48',
|
||||||
|
// Yes, I am aware that you could have the same database name across two unique hosts. However,
|
||||||
|
// I don't really care about that for this validation. We just want to make sure it is unique to
|
||||||
|
// the server itself. No need for complexity.
|
||||||
|
Rule::unique('databases', 'database')->where(function (Builder $query) use ($server) {
|
||||||
|
$query->where('server_id', $server->id);
|
||||||
|
}),
|
||||||
|
],
|
||||||
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
|
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function messages()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'database.unique' => 'The database name you have selected is already in use by this server.',
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
class ChangeUniqueDatabaseNameToAccountForServer extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('databases', function (Blueprint $table) {
|
||||||
|
$table->dropUnique(['database_host_id', 'database']);
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::table('databases', function (Blueprint $table) {
|
||||||
|
$table->unique(['database_host_id', 'server_id', 'database']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('databases', function (Blueprint $table) {
|
||||||
|
$table->dropUnique(['database_host_id', 'server_id', 'database']);
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::table('databases', function (Blueprint $table) {
|
||||||
|
$table->unique(['database_host_id', 'database']);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue