An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(server): return SSH username validation messages
Andras Bacsai419a551d766f
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.phpindex 0322b2240b..2c2195ea3b 100644--- a/app/Http/Controllers/Api/ServersController.php+++ b/app/Http/Controllers/Api/ServersController.php@@ -492,6 +492,8 @@ class ServersController extends Controller'is_build_server' => 'boolean|nullable','instant_validate' => 'boolean|nullable','proxy_type' => 'string|nullable',+ ], [+ ...ValidationPatterns::serverUsernameMessages(),]);$extraFields = array_diff(array_keys($request->all()), $allowedFields);@@ -677,6 +679,8 @@ class ServersController extends Controller'server_disk_usage_notification_threshold' => 'integer|min:1|max:100','server_disk_usage_check_frequency' => 'string','connection_timeout' => 'integer|min:1|max:300',+ ], [+ ...ValidationPatterns::serverUsernameMessages(),]);$extraFields = array_diff(array_keys($request->all()), $allowedFields);diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.phpindex e72a2507cf..2d0ae939d0 100644--- a/app/Livewire/Boarding/Index.php+++ b/app/Livewire/Boarding/Index.php@@ -213,6 +213,23 @@ class Index extends Component}}+ protected function rules(): array+ {+ return [+ 'remoteServerName' => 'required|string',+ 'remoteServerHost' => 'required|string',+ 'remoteServerPort' => 'required|integer|min:1|max:65535',+ 'remoteServerUser' => ValidationPatterns::serverUsernameRules(),+ ];+ }++ protected function messages(): array+ {+ return [+ ...ValidationPatterns::serverUsernameMessages('remoteServerUser', 'SSH User'),+ ];+ }+public function getProxyType(){$this->selectProxy(ProxyTypes::TRAEFIK->value);@@ -275,12 +292,7 @@ class Index extends Componentpublic function saveServer(){- $this->validate([- 'remoteServerName' => 'required|string',- 'remoteServerHost' => 'required|string',- 'remoteServerPort' => 'required|integer',- 'remoteServerUser' => ValidationPatterns::serverUsernameRules(),- ]);+ $this->validate();$this->privateKey = formatPrivateKey($this->privateKey);$foundServer = Server::whereIp($this->remoteServerHost)->first();@@ -466,10 +478,10 @@ class Index extends Componentpublic function saveAndValidateServer(){- $this->validate([- 'remoteServerPort' => 'required|integer|min:1|max:65535',- 'remoteServerUser' => ValidationPatterns::serverUsernameRules(),- ]);+ $this->validate(array_intersect_key($this->rules(), array_flip([+ 'remoteServerPort',+ 'remoteServerUser',+ ])));$this->createdServer->update(['port' => $this->remoteServerPort,diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.phpindex 08af8ee42a..f2b672fef6 100644--- a/bootstrap/helpers/shared.php+++ b/bootstrap/helpers/shared.php@@ -1865,15 +1865,15 @@ function isBase64Encoded($strValue){return base64_encode(base64_decode($strValue, true)) === $strValue;}-function customApiValidator(Collection|array $item, array $rules)+function customApiValidator(Collection|array $item, array $rules, array $messages = []){if (is_array($item)) {$item = collect($item);}- return Validator::make($item->toArray(), $rules, [+ return Validator::make($item->toArray(), $rules, array_merge(['required' => 'This field is required.',- ]);+ ], $messages));}function parseDockerComposeFile(Service|Application $resource, bool $isNew = false, int $pull_request_id = 0, ?int $preview_id = null){diff --git a/tests/Feature/ServerUsernameValidationTest.php b/tests/Feature/ServerUsernameValidationTest.phpindex 96236935aa..4213ee21d3 100644--- a/tests/Feature/ServerUsernameValidationTest.php+++ b/tests/Feature/ServerUsernameValidationTest.php@@ -73,6 +73,21 @@ it('updates a server through the API with a dotted SSH username', function () {expect($server->fresh()->user)->toBe('deploy.user');});+it('rejects unsafe SSH usernames when creating a server through the API', function () {+ $response = $this->withHeaders([+ 'Authorization' => 'Bearer '.$this->token,+ 'Content-Type' => 'application/json',+ ])->postJson('/api/v1/servers', [+ 'name' => 'Unsafe User Server',+ 'ip' => '192.0.2.11',+ 'private_key_uuid' => $this->privateKey->uuid,+ 'user' => 'deploy$user',+ ]);++ $response->assertStatus(422);+ $response->assertJsonPath('errors.user.0', 'The User may only contain letters, numbers, dots, hyphens, and underscores.');+});+it('rejects unsafe SSH usernames through the API', function () {$server = Server::factory()->create(['team_id' => $this->team->id,@@ -88,6 +103,7 @@ it('rejects unsafe SSH usernames through the API', function () {$response->assertStatus(422);$response->assertJsonStructure(['errors' => ['user']]);+ $response->assertJsonPath('errors.user.0', 'The User may only contain letters, numbers, dots, hyphens, and underscores.');});it('allows dotted SSH usernames in the server creation form', function () {@@ -135,7 +151,12 @@ it('rejects unsafe SSH usernames during onboarding server creation', function ()->set('remoteServerPort', 22)->set('remoteServerUser', 'deploy$user')->call('saveServer')- ->assertHasErrors(['remoteServerUser' => ['regex']]);+ ->assertHasErrors([+ 'remoteServerUser' => [+ 'regex',+ 'The SSH User may only contain letters, numbers, dots, hyphens, and underscores.',+ ],+ ]);});it('rejects unsafe SSH usernames during onboarding server validation', function () {@@ -152,5 +173,10 @@ it('rejects unsafe SSH usernames during onboarding server validation', function->set('remoteServerPort', 22)->set('remoteServerUser', 'deploy$user')->call('saveAndValidateServer')- ->assertHasErrors(['remoteServerUser' => ['regex']]);+ ->assertHasErrors([+ 'remoteServerUser' => [+ 'regex',+ 'The SSH User may only contain letters, numbers, dots, hyphens, and underscores.',+ ],+ ]);});