Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-384333: Update IPv4 regex and remove redundant codes.

Browse Source
This commit is contained in:
Bengang Yuan 2023-10-30 23:17:08 +08:00 committed by Konstantina Chremmou
parent 2e9c144bd9
commit 7a3d17fdb9
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/SettingsPanels/NRPEEditPage.cs
View File

@ -42,7 +42,7 @@ namespace XenAdmin.SettingsPanels
{ {
public partial class NRPEEditPage : UserControl, IEditPage public partial class NRPEEditPage : UserControl, IEditPage
{ {
private static readonly Regex REGEX_IPV4 = new Regex("^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)"); private static readonly Regex REGEX_IPV4 = new Regex("^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$");
private static readonly Regex REGEX_IPV4_CIDR = new Regex("^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$"); private static readonly Regex REGEX_IPV4_CIDR = new Regex("^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$");
private static readonly Regex REGEX_DOMAIN = new Regex("^(((?!-))(xn--|_)?[a-z0-9-]{0,61}[a-z0-9]{1,1}\\.)*(xn--)?([a-z0-9][a-z0-9\\-]{0,60}|[a-z0-9-]{1,30}\\.[a-z]{2,})$"); private static readonly Regex REGEX_DOMAIN = new Regex("^(((?!-))(xn--|_)?[a-z0-9-]{0,61}[a-z0-9]{1,1}\\.)*(xn--)?([a-z0-9][a-z0-9\\-]{0,60}|[a-z0-9-]{1,30}\\.[a-z]{2,})$");
@ -315,16 +315,6 @@ namespace XenAdmin.SettingsPanels
} }
} }
} }
foreach (string host in hostArray)
{
if (!REGEX_IPV4.Match(host.Trim()).Success &&
!REGEX_IPV4_CIDR.Match(host.Trim()).Success &&
!REGEX_DOMAIN.Match(host.Trim()).Success)
{
_invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_FORMAT_ERROR;
return false;
}
}
return true; return true;
} }