fix(server): allow dots in ssh username
This commit is contained in:
parent
84b0f9ba7a
commit
ff4794ffec
4 changed files with 6 additions and 6 deletions
|
|
@ -487,7 +487,7 @@ public function create_server(Request $request)
|
||||||
'ip' => ['string', 'required', new ValidServerIp],
|
'ip' => ['string', 'required', new ValidServerIp],
|
||||||
'port' => 'integer|nullable|between:1,65535',
|
'port' => 'integer|nullable|between:1,65535',
|
||||||
'private_key_uuid' => 'string|required',
|
'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',
|
'is_build_server' => 'boolean|nullable',
|
||||||
'instant_validate' => 'boolean|nullable',
|
'instant_validate' => 'boolean|nullable',
|
||||||
'proxy_type' => 'string|nullable',
|
'proxy_type' => 'string|nullable',
|
||||||
|
|
@ -666,7 +666,7 @@ public function update_server(Request $request)
|
||||||
'ip' => ['string', 'nullable', new ValidServerIp],
|
'ip' => ['string', 'nullable', new ValidServerIp],
|
||||||
'port' => 'integer|nullable|between:1,65535',
|
'port' => 'integer|nullable|between:1,65535',
|
||||||
'private_key_uuid' => 'string|nullable',
|
'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',
|
'is_build_server' => 'boolean|nullable',
|
||||||
'instant_validate' => 'boolean|nullable',
|
'instant_validate' => 'boolean|nullable',
|
||||||
'proxy_type' => 'string|nullable',
|
'proxy_type' => 'string|nullable',
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ protected function rules(): array
|
||||||
'name' => ValidationPatterns::nameRules(),
|
'name' => ValidationPatterns::nameRules(),
|
||||||
'description' => ValidationPatterns::descriptionRules(),
|
'description' => ValidationPatterns::descriptionRules(),
|
||||||
'ip' => ['required', 'string', new ValidServerIp],
|
'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',
|
'port' => 'required|integer|between:1,65535',
|
||||||
'is_build_server' => 'required|boolean',
|
'is_build_server' => 'required|boolean',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ protected function rules(): array
|
||||||
'name' => ValidationPatterns::nameRules(),
|
'name' => ValidationPatterns::nameRules(),
|
||||||
'description' => ValidationPatterns::descriptionRules(),
|
'description' => ValidationPatterns::descriptionRules(),
|
||||||
'ip' => ['required', new ValidServerIp],
|
'ip' => ['required', new ValidServerIp],
|
||||||
'user' => ['required', 'regex:/^[a-zA-Z0-9_-]+$/'],
|
'user' => ['required', 'regex:/^[a-zA-Z0-9._-]+$/'],
|
||||||
'port' => 'required|integer|between:1,65535',
|
'port' => 'required|integer|between:1,65535',
|
||||||
'connectionTimeout' => 'required|integer|min:1|max:300',
|
'connectionTimeout' => 'required|integer|min:1|max:300',
|
||||||
'validationLogs' => 'nullable',
|
'validationLogs' => 'nullable',
|
||||||
|
|
|
||||||
|
|
@ -945,10 +945,10 @@ public function user(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
get: function ($value) {
|
get: function ($value) {
|
||||||
return preg_replace('/[^A-Za-z0-9\-_]/', '', $value);
|
return preg_replace('/[^A-Za-z0-9.\-_]/', '', $value);
|
||||||
},
|
},
|
||||||
set: function ($value) {
|
set: function ($value) {
|
||||||
return preg_replace('/[^A-Za-z0-9\-_]/', '', $value);
|
return preg_replace('/[^A-Za-z0-9.\-_]/', '', $value);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue