Chore: Adjust regex for IPv4

Author: BornToBeRoot

Source/NETworkManager.Converters/StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter.cs

@@ -1,16 +1,15 @@
-using System;
+using NETworkManager.Utilities;
+using System;
 using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows.Data;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Converters;
 
 public sealed class StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        return !string.IsNullOrEmpty(value as string) && !Regex.IsMatch((string)value, RegexHelper.IPv4AddressRegex);
+        return !string.IsNullOrEmpty(value as string) && !RegexHelper.IPv4AddressRegex().IsMatch((string)value);
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Source/NETworkManager.Models/Network/HostRangeHelper.cs

@@ -1,12 +1,13 @@
-using System.Collections.Concurrent;
+using ControlzEx.Standard;
+using NETworkManager.Utilities;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Models.Network;
 
@@ -46,7 +47,7 @@ private static (List<(IPAddress ipAddress, string hostname)> hosts, List<string>
             switch (host)
             {
                 // 192.168.0.1
-                case var _ when Regex.IsMatch(host, RegexHelper.IPv4AddressRegex):
+                case var _ when RegexHelper.IPv4AddressRegex().IsMatch(host):
                 // 2001:db8:85a3::8a2e:370:7334
                 case var _ when Regex.IsMatch(host, RegexHelper.IPv6AddressRegex):
                     hostsBag.Add((IPAddress.Parse(host), string.Empty));
@@ -71,7 +72,7 @@ private static (List<(IPAddress ipAddress, string hostname)> hosts, List<string>
                     break;
 
                 // 192.168.0.0 - 192.168.0.100
-                case var _ when Regex.IsMatch(host, RegexHelper.IPv4AddressRangeRegex):
+                case var _ when RegexHelper.IPv4AddressRangeRegex().IsMatch(host):
                     var range = host.Split('-');
 
                     Parallel.For(IPv4Address.ToInt32(IPAddress.Parse(range[0])),

Source/NETworkManager.Models/Network/SNTPLookup.cs

@@ -1,10 +1,11 @@
-using System;
+using ControlzEx.Standard;
+using NETworkManager.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Models.Network;
 
@@ -102,7 +103,7 @@ public void QueryAsync(IEnumerable<ServerConnectionInfo> servers, bool dnsResolv
                 // NTP requires an IP address to connect to
                 IPAddress serverIP = null;
 
-                if (Regex.IsMatch(server.Server, RegexHelper.IPv4AddressRegex) ||
+                if (RegexHelper.IPv4AddressRegex().IsMatch(server.Server) ||
                     Regex.IsMatch(server.Server, RegexHelper.IPv6AddressRegex))
                 {
                     serverIP = IPAddress.Parse(server.Server);

Source/NETworkManager.Utilities/RegexHelper.cs

@@ -1,6 +1,8 @@
-namespace NETworkManager.Utilities;
+using System.Text.RegularExpressions;
 
-public static class RegexHelper
+namespace NETworkManager.Utilities;
+
+public static partial class RegexHelper
 {
     /// <summary>
     ///     Match an IPv4-Address like 192.168.178.1
@@ -10,20 +12,36 @@ public static class RegexHelper
         @"((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]?)";
 
     /// <summary>
-    ///     Match exactly an IPv4-Address like 192.168.178.1
+    /// Provides a compiled regular expression that matches valid IPv4 addresses in dot-decimal notation.
     /// </summary>
-    // ReSharper disable once InconsistentNaming
-    public const string IPv4AddressRegex = $"^{IPv4AddressValues}$";
+    /// <remarks>The returned regular expression is compiled for performance. Use this regex to validate or
+    /// extract IPv4 addresses from text. The pattern enforces correct octet ranges and dot separators.</remarks>
+    /// <returns>A <see cref="Regex"/> instance that matches IPv4 addresses in the format "x.x.x.x", where each x is a number
+    /// from 0 to 255.</returns>
+    [GeneratedRegex($"^{IPv4AddressValues}$")]
+    public static partial Regex IPv4AddressRegex();
 
     /// <summary>
-    ///     Match IPv4-Address within a string
+    /// Provides a compiled regular expression that matches valid IPv4 addresses within input text.
     /// </summary>
-    // ReSharper disable once InconsistentNaming
-    public const string IPv4AddressExtractRegex = IPv4AddressValues;
+    /// <remarks>The returned regular expression matches IPv4 addresses in standard dotted-decimal notation
+    /// (e.g., "192.168.1.1"). The regular expression is compiled for improved performance when used
+    /// repeatedly.</remarks>
+    /// <returns>A <see cref="Regex"/> instance that can be used to extract IPv4 addresses from strings.</returns>
+    [GeneratedRegex(IPv4AddressValues)]
+    public static partial Regex IPv4AddressExtractRegex();
 
-    // Match IPv4-Address Range like 192.168.178.1-192.168.178.127
-    // ReSharper disable once InconsistentNaming
-    public const string IPv4AddressRangeRegex = $"^{IPv4AddressValues}-{IPv4AddressValues}$";
+    /// <summary>
+    /// Gets a regular expression that matches an IPv4 address range in the format "start-end", where both start and end
+    /// are valid IPv4 addresses.
+    /// </summary>
+    /// <remarks>The regular expression expects the input to consist of two IPv4 addresses separated by a
+    /// hyphen, with no additional whitespace or characters. Both addresses must be valid IPv4 addresses. This can be
+    /// used to validate or parse address range strings in network configuration scenarios.</remarks>
+    /// <returns>A <see cref="Regex"/> instance that matches strings representing IPv4 address ranges, such as
+    /// "192.168.1.1-192.168.1.100".</returns>
+    [GeneratedRegex($"^{IPv4AddressValues}-{IPv4AddressValues}$")]
+    public static partial Regex IPv4AddressRangeRegex();
 
     // Match a MAC-Address 000000000000 00:00:00:00:00:00, 00-00-00-00-00-00-00 or 0000.0000.0000
     public const string MACAddressRegex =

Source/NETworkManager.Validators/EmptyOrIPv4AddressValidator.cs

@@ -1,8 +1,9 @@
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Windows.Controls;
+using ControlzEx.Standard;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Utilities;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows.Controls;
 
 namespace NETworkManager.Validators;
 
@@ -13,7 +14,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         if (string.IsNullOrEmpty(value as string))
             return ValidationResult.ValidResult;
 
-        return Regex.IsMatch((string)value, RegexHelper.IPv4AddressRegex)
+        return RegexHelper.IPv4AddressRegex().IsMatch((string)value)
             ? ValidationResult.ValidResult
             : new ValidationResult(false, Strings.EnterValidIPv4Address);
     }

Source/NETworkManager.Validators/IPAddressOrHostnameAsRangeValidator.cs

@@ -20,7 +20,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             var localItem = item.Trim();
 
             // Check if it is a valid IPv4 address like 192.168.0.1, a valid IPv6 address like ::1 or a valid hostname like server-01 or server-01.example.com
-            var isValid = Regex.IsMatch(localItem, RegexHelper.IPv4AddressRegex) ||
+            var isValid = RegexHelper.IPv4AddressRegex().IsMatch(localItem) ||
                           Regex.IsMatch(localItem, RegexHelper.IPv6AddressRegex) ||
                           Regex.IsMatch(localItem, RegexHelper.HostnameOrDomainRegex);
 

Source/NETworkManager.Validators/IPAddressOrHostnameValidator.cs

@@ -16,7 +16,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
 
         // Check if it is a valid IPv4 address like 192.168.0.1
-        if (Regex.IsMatch(input, RegexHelper.IPv4AddressRegex))
+        if (RegexHelper.IPv4AddressRegex().IsMatch(input))
             return ValidationResult.ValidResult;
 
         // Check if it is a valid IPv6 address like ::1

Source/NETworkManager.Validators/IPv4AddressValidator.cs

@@ -1,8 +1,7 @@
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
+using NETworkManager.Localization.Resources;
 using NETworkManager.Utilities;
+using System.Globalization;
+using System.Windows.Controls;
 
 namespace NETworkManager.Validators;
 
@@ -15,7 +14,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         if (string.IsNullOrEmpty(ipAddress))
             return new ValidationResult(false, Strings.EnterValidIPv4Address);
 
-        return Regex.IsMatch(ipAddress, RegexHelper.IPv4AddressRegex)
+        return RegexHelper.IPv4AddressRegex().IsMatch(ipAddress)
             ? ValidationResult.ValidResult
             : new ValidationResult(false, Strings.EnterValidIPv4Address);
     }

Source/NETworkManager.Validators/MultipleHostsRangeValidator.cs

@@ -1,10 +1,10 @@
-using System.Globalization;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Models.Network;
+using NETworkManager.Utilities;
+using System.Globalization;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
-using NETworkManager.Models.Network;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
@@ -20,7 +20,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         foreach (var ipHostOrRange in ((string)value).Replace(" ", "").Split(';'))
         {
             // 192.168.0.1
-            if (Regex.IsMatch(ipHostOrRange, RegexHelper.IPv4AddressRegex))
+            if (RegexHelper.IPv4AddressRegex().IsMatch(ipHostOrRange))
                 continue;
 
             // 192.168.0.0/24
@@ -32,7 +32,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
                 continue;
 
             // 192.168.0.0 - 192.168.0.100
-            if (Regex.IsMatch(ipHostOrRange, RegexHelper.IPv4AddressRangeRegex))
+            if (RegexHelper.IPv4AddressRangeRegex().IsMatch(ipHostOrRange))
             {
                 var range = ipHostOrRange.Split('-');
 

Source/NETworkManager.Validators/MultipleIPAddressesValidator.cs

@@ -1,8 +1,8 @@
-using System.Globalization;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
@@ -15,13 +15,13 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
 
         for (var index = 0; index < ((string)value).Split(';').Length; index++)
         {
-            var ipAddress = ((string)value).Split(';')[index];
+            var ipAddress = ((string)value).Split(';')[index].Trim();
 
-            if (!Regex.IsMatch(ipAddress.Trim(), RegexHelper.IPv4AddressRegex) &&
+            if (!RegexHelper.IPv4AddressRegex().IsMatch(ipAddress) &&
                 !Regex.IsMatch(ipAddress.Trim(), RegexHelper.IPv6AddressRegex))
                 return new ValidationResult(false, Strings.EnterOneOrMoreValidIPAddresses);
         }
 
         return ValidationResult.ValidResult;
     }
-}
+}