fix external id not respecting unique during update closes #5549

Author: robertdrakedennis

app/Http/Controllers/Admin/ServersController.php

@@ -25,6 +25,7 @@
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\StartupModificationService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\ServerDetailsFormRequest;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Pterodactyl\Services\Databases\DatabaseManagementService;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
@@ -67,9 +68,9 @@ public function __construct(
      * @throws DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function setDetails(Request $request, Server $server): RedirectResponse
+    public function setDetails(ServerDetailsFormRequest $request, Server $server): RedirectResponse
     {
-        $this->detailsModificationService->handle($server, $request->only([
+        $this->detailsModificationService->handle($server, $request->normalize([
             'owner_id', 'external_id', 'name', 'description',
         ]));
 

app/Http/Requests/Admin/ServerDetailsFormRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Admin;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Support\Collection;
+
+class ServerDetailsFormRequest extends AdminFormRequest
+{
+    /**
+     * Rules to apply to requests for updating a server's details
+     * in the Admin CP.
+     */
+    public function rules(): array
+    {
+        $rules = Collection::make(
+            Server::getRulesForUpdate($this->route()->parameter('server'))
+        )->only([
+            'external_id',
+            'owner_id',
+            'name',
+            'description',
+        ])->toArray();
+
+        $rules['description'][] = 'nullable';
+
+        return $rules;
+    }
+}

tests/Integration/Http/Controllers/Admin/ServersController/UpdateServerDetailsTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Pterodactyl\Tests\Integration\Http\Controllers\Admin\ServersController;
+
+use Pterodactyl\Models\User;
+use Pterodactyl\Tests\Integration\Http\HttpTestCase;
+
+class UpdateServerDetailsTest extends HttpTestCase
+{
+    public function testExternalIdMustBeUniqueWhenUpdatingServerDetails(): void
+    {
+        $server = $this->createServerModel(['external_id' => 'first-external-id']);
+        $otherServer = $this->createServerModel(['external_id' => 'duplicate-external-id']);
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->withHeaders(['Accept' => 'text/html'])
+            ->patch(route('admin.servers.view.details', ['server' => $server]), [
+                'external_id' => $otherServer->external_id,
+                'owner_id' => $server->owner_id,
+                'name' => $server->name,
+                'description' => $server->description,
+            ])
+            ->assertRedirect()
+            ->assertSessionHasErrors('external_id');
+
+        $this->assertSame('first-external-id', $server->refresh()->external_id);
+    }
+}