Skip to content

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.

fix(server): allow dots in ssh username

ShadowArcanistff4794ffec24
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.php
index 6c3b2da007..8f5a39ed0f 100644
--- a/app/Http/Controllers/Api/ServersController.php
+++ b/app/Http/Controllers/Api/ServersController.php
@@ -487,7 +487,7 @@ class ServersController extends Controller
'ip' => ['string', 'required', new ValidServerIp],
'port' => 'integer|nullable|between:1,65535',
'private_key_uuid' => 'string|required',
- 'user' => ['string', 'nullable', 'regex:/^[a-zA-Z0-9_-]+$/'],
+ 'user' => ['string', 'nullable', 'regex:/^[a-zA-Z0-9._-]+$/'],
'is_build_server' => 'boolean|nullable',
'instant_validate' => 'boolean|nullable',
'proxy_type' => 'string|nullable',
@@ -666,7 +666,7 @@ class ServersController extends Controller
'ip' => ['string', 'nullable', new ValidServerIp],
'port' => 'integer|nullable|between:1,65535',
'private_key_uuid' => 'string|nullable',
- 'user' => ['string', 'nullable', 'regex:/^[a-zA-Z0-9_-]+$/'],
+ 'user' => ['string', 'nullable', 'regex:/^[a-zA-Z0-9._-]+$/'],
'is_build_server' => 'boolean|nullable',
'instant_validate' => 'boolean|nullable',
'proxy_type' => 'string|nullable',
diff --git a/app/Livewire/Server/New/ByIp.php b/app/Livewire/Server/New/ByIp.php
index 51c6a06eec..13888d992f 100644
--- a/app/Livewire/Server/New/ByIp.php
+++ b/app/Livewire/Server/New/ByIp.php
@@ -57,7 +57,7 @@ class ByIp extends Component
'name' => ValidationPatterns::nameRules(),
'description' => ValidationPatterns::descriptionRules(),
'ip' => ['required', 'string', new ValidServerIp],
- 'user' => ['required', 'string', 'regex:/^[a-zA-Z0-9_-]+$/'],
+ 'user' => ['required', 'string', 'regex:/^[a-zA-Z0-9._-]+$/'],
'port' => 'required|integer|between:1,65535',
'is_build_server' => 'required|boolean',
];
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php
index 3e05d9306c..acdfb98fd7 100644
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -110,7 +110,7 @@ class Show extends Component
'name' => ValidationPatterns::nameRules(),
'description' => ValidationPatterns::descriptionRules(),
'ip' => ['required', new ValidServerIp],
- 'user' => ['required', 'regex:/^[a-zA-Z0-9_-]+$/'],
+ 'user' => ['required', 'regex:/^[a-zA-Z0-9._-]+$/'],
'port' => 'required|integer|between:1,65535',
'connectionTimeout' => 'required|integer|min:1|max:300',
'validationLogs' => 'nullable',
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 74e8ba5b08..4f2340e724 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -945,10 +945,10 @@ $schema://$host {
{
return Attribute::make(
get: function ($value) {
- return preg_replace('/[^A-Za-z0-9\-_]/', '', $value);
+ return preg_replace('/[^A-Za-z0-9.\-_]/', '', $value);
},
set: function ($value) {
- return preg_replace('/[^A-Za-z0-9\-_]/', '', $value);
+ return preg_replace('/[^A-Za-z0-9.\-_]/', '', $value);
}
);
}