Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved the node fqdn validation

Browse Source
This commit is contained in:
Marcel Baumgartner
2024-06-12 19:47:22 +02:00
parent 173361bc2b
commit 8b5270d2ed
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Moonlight/Features/Servers/UI/Views/Admin/Nodes/Index.razor
View File

@@ -183,8 +183,7 @@
private Task ValidateAdd(ServerNode node) private Task ValidateAdd(ServerNode node)
{ {
if (!IsDomainOrIp(node.Fqdn)) ValidateFqdn(node);
throw new DisplayException("The fqdn needs to be a valid domain or an ip address");
node.Token = Formatter.GenerateString(32); node.Token = Formatter.GenerateString(32);
@@ -193,21 +192,33 @@
private Task ValidateUpdate(ServerNode node) private Task ValidateUpdate(ServerNode node)
{ {
if (!IsDomainOrIp(node.Fqdn)) ValidateFqdn(node);
throw new DisplayException("The fqdn needs to be a valid domain or an ip address");
return Task.CompletedTask; return Task.CompletedTask;
} }
private bool IsDomainOrIp(string input) private void ValidateFqdn(ServerNode node)
{ {
if (Regex.IsMatch(input, "^(?!-)(?:[a-zA-Z\\d-]{0,62}[a-zA-Z\\d]\\.)+(?:[a-zA-Z]{2,})$")) if (node.Ssl)
return true; {
// Is it a valid domain?
if (Regex.IsMatch(node.Fqdn, "^(?!-)(?:[a-zA-Z\\d-]{0,62}[a-zA-Z\\d]\\.)+(?:[a-zA-Z]{2,})$"))
return;
if (Regex.IsMatch(input, "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")) throw new DisplayException("The fqdn needs to be a valid domain. If you want to use an ip address as the fqdn, disable ssl for this node");
return true; }
else
{
// Is it a valid domain?
if (Regex.IsMatch(node.Fqdn, "^(?!-)(?:[a-zA-Z\\d-]{0,62}[a-zA-Z\\d]\\.)+(?:[a-zA-Z]{2,})$"))
return;
return false; // Is it a valid ip?
if (Regex.IsMatch(node.Fqdn, "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"))
return;
throw new DisplayException("The fqdn needs to be either a domain or an ip");
}
} }
public void Dispose() public void Dispose()