Merge branch 'develop' into develop

app/Http/Requests/Api/Client/Account/StoreApiKeyRequest.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http\Requests\Api\Client\Account;
 
+use Pterodactyl\Models\ApiKey;
 use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
 
 class StoreApiKeyRequest extends ClientApiRequest
@@ -11,9 +12,11 @@ class StoreApiKeyRequest extends ClientApiRequest
      */
     public function rules(): array
     {
+        $rules = ApiKey::getRules();
+
         return [
-            'description' => 'required|string|min:4',
-            'allowed_ips' => 'array',
+            'description' => $rules['memo'],
+            'allowed_ips' => $rules['allowed_ips'],
             'allowed_ips.*' => 'ip',
         ];
     }

app/Http/Requests/Api/Client/Servers/Backups/StoreBackupRequest.php

@@ -21,7 +21,7 @@ class StoreBackupRequest extends ClientApiRequest
     public function rules(): array
     {
         return [
-            'name' => 'nullable|string|max:255',
+            'name' => 'nullable|string|max:191',
             'ignored' => 'nullable|string',
         ];
     }

app/Http/Requests/Api/Client/Servers/Databases/StoreDatabaseRequest.php

@@ -2,9 +2,14 @@
 
 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 Illuminate\Database\Query\Builder;
 use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
 use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+use Pterodactyl\Services\Databases\DatabaseManagementService;
 
 class StoreDatabaseRequest extends ClientApiRequest implements ClientPermissionsRequest
 {
@@ -21,9 +26,35 @@ class StoreDatabaseRequest extends ClientApiRequest implements ClientPermissions
      */
     public function rules(): array
     {
+        $server = $this->route()->parameter('server');
+
+        Assert::isInstanceOf($server, Server::class);
+
         return [
-            'database' => 'required|alpha_dash|min:3|max:48',
+            'database' => [
+                'required',
+                'alpha_dash',
+                'min:1',
+                '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')->where(function (Builder $query) use ($server) {
+                    $query->where('server_id', $server->id)
+                        ->where('database', DatabaseManagementService::generateUniqueDatabaseName($this->input('database'), $server->id));
+                }),
+            ],
             'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'database.unique' => 'The database name you have selected is already in use by this server.',
+        ];
+    }
 }

app/Http/Requests/Api/Client/Servers/Startup/UpdateStartupVariableRequest.php

@@ -24,7 +24,7 @@ class UpdateStartupVariableRequest extends ClientApiRequest
     {
         return [
             'key' => 'required|string',
-            'value' => 'present|string',
+            'value' => 'present',
         ];
     }
 }

app/Http/Requests/Api/Client/Servers/Subusers/StoreSubuserRequest.php

@@ -20,7 +20,7 @@ class StoreSubuserRequest extends SubuserRequest
     public function rules(): array
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email|between:1,191',
             'permissions' => 'required|array',
             'permissions.*' => 'string',
         ];