Feature: Parse input and profile server field

BornToBeRoot · BornToBeRoot · commit bf1b01cdb8ff · 2025-12-13T19:36:38.000+01:00
diff --git a/Source/NETworkManager.Models/Network/HostRangeHelper.cs b/Source/NETworkManager.Models/Network/HostRangeHelper.cs
@@ -1,5 +1,4 @@
-﻿using ControlzEx.Standard;
-using NETworkManager.Utilities;
+﻿using NETworkManager.Utilities;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -148,7 +147,7 @@ private static (List<(IPAddress ipAddress, string hostname)> hosts, List<string>
                     break;
 
                 // example.com
-                case var _ when Regex.IsMatch(host, RegexHelper.HostnameOrDomainRegex):
+                case var _ when RegexHelper.HostnameOrDomainRegex().IsMatch(host):
                     using (var dnsResolverTask =
                            DNSClientHelper.ResolveAorAaaaAsync(host, dnsResolveHostnamePreferIPv4))
                     {
diff --git a/Source/NETworkManager.Models/Network/ServerConnectionInfo.cs b/Source/NETworkManager.Models/Network/ServerConnectionInfo.cs
@@ -10,6 +10,7 @@ public class ServerConnectionInfo
     /// </summary>
     public ServerConnectionInfo()
     {
+
     }
 
     /// <summary>
@@ -52,6 +53,20 @@ public ServerConnectionInfo(string server, int port, TransportProtocol transport
     /// </summary>
     public TransportProtocol TransportProtocol { get; set; }
 
+   // public static ServerConnectionInfo Parse (string input)
+   // {
+        
+
+   //     return null;
+   // }
+
+   //public static bool TryParse (string input, out ServerConnectionInfo serverConnectionInfo)
+   // {
+   //     serverConnectionInfo = null;
+     
+   //     return false;
+   // }
+
     /// <summary>
     ///     Returns a string that represents the current object.
     /// </summary>
diff --git a/Source/NETworkManager.Models/Network/ServerConnectionInfoProfile.cs b/Source/NETworkManager.Models/Network/ServerConnectionInfoProfile.cs
@@ -12,6 +12,7 @@ public class ServerConnectionInfoProfile
     /// </summary>
     public ServerConnectionInfoProfile()
     {
+
     }
 
     /// <summary>
diff --git a/Source/NETworkManager.Utilities/RegexHelper.cs b/Source/NETworkManager.Utilities/RegexHelper.cs
@@ -20,7 +20,13 @@ public static partial class RegexHelper
     /// Represents the regular expression pattern used to validate CIDR notation values for IPv4 subnet masks.
     /// </summary>    
     private const string CidrRegexValues = @"([1-9]|[1-2][0-9]|3[0-2])";
-     
+
+    /// <summary>
+    /// Represents a regular expression pattern that matches valid hostnames or fully qualified domain names (FQDNs).
+    /// </summary>
+    private const string HostnameOrDomainValues =
+        @"(?=.{1,255}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z0-9-]{1,63})*\.?";
+
     /// <summary>
     /// Provides a compiled regular expression that matches valid IPv4 addresses in dot-decimal notation like "192.168.178.0".
     /// </summary>    
@@ -71,7 +77,7 @@ public static partial class RegexHelper
     public static partial Regex IPv4AddressCidrRegex();
 
     /// <summary>
-    /// Creates a regular expression that matches IPv4 addresses, allowing for a special range in one or more octets like
+    /// Provides a compiled regular expression that matches IPv4 addresses, allowing for a special range in one or more octets like
     /// "192.168.[0-50].1".
     /// </summary>    
     /// <returns>A <see cref="Regex"/> instance that matches IPv4 addresses with support for custom special ranges like
@@ -101,12 +107,15 @@ public static partial class RegexHelper
     public const string SpecialRangeRegex =
         @"\[((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)-(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))([,]((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)-(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))))*\]";
 
-    // Private hostname values
-    private const string HostnameOrDomainValues =
-        @"(?=.{1,255}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z0-9-]{1,63})*\.?";
+    
 
-    // Hostname regex like server-01 or server-01.example.com
-    public const string HostnameOrDomainRegex = $@"^{HostnameOrDomainValues}$";
+    /// <summary>
+    /// Provides a compiled regular expression that matches valid hostnames or fully qualified domain names (FQDNs) like
+    /// server-01 or server-01.example.com.
+    /// </summary>
+    /// <returns> A <see cref="Regex"/> instance that matches valid hostnames or FQDNs.</returns>
+    [GeneratedRegex($@"^{HostnameOrDomainValues}$")]
+    public static partial Regex HostnameOrDomainRegex();
 
     // Match a hostname with cidr like server-01.example.com/24
     public const string HostnameOrDomainWithCidrRegex = $@"^{HostnameOrDomainValues}\/{CidrRegexValues}$";
diff --git a/Source/NETworkManager.Validators/EmptyOrWindowsDomainValidator.cs b/Source/NETworkManager.Validators/EmptyOrWindowsDomainValidator.cs
@@ -1,5 +1,4 @@
 ﻿using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Utilities;
@@ -19,7 +18,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         if (domain.Equals("."))
             return ValidationResult.ValidResult;
 
-        return Regex.IsMatch(domain, RegexHelper.HostnameOrDomainRegex)
+        return RegexHelper.HostnameOrDomainRegex().IsMatch(domain)
             ? ValidationResult.ValidResult
             : new ValidationResult(false, Strings.EnterValidDomain);
     }
diff --git a/Source/NETworkManager.Validators/HostsFileEntryHostnameValidator.cs b/Source/NETworkManager.Validators/HostsFileEntryHostnameValidator.cs
@@ -2,7 +2,6 @@
 using NETworkManager.Utilities;
 using System.Diagnostics;
 using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows.Controls;
 
 namespace NETworkManager.Validators;
@@ -19,7 +18,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
 
         foreach (var hostname in input.Split(' '))
         {
-            if (Regex.IsMatch(hostname, RegexHelper.HostnameOrDomainRegex) == false)
+            if (RegexHelper.HostnameOrDomainRegex().IsMatch(hostname) == false)
             {
                 isValid = false;
                 break;
diff --git a/Source/NETworkManager.Validators/IPAddressOrHostnameAsRangeValidator.cs b/Source/NETworkManager.Validators/IPAddressOrHostnameAsRangeValidator.cs
@@ -1,8 +1,9 @@
-﻿using System.Globalization;
+﻿using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+using System.DirectoryServices.ActiveDirectory;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
@@ -22,7 +23,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             // 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 = RegexHelper.IPv4AddressRegex().IsMatch(localItem) ||
                           Regex.IsMatch(localItem, RegexHelper.IPv6AddressRegex) ||
-                          Regex.IsMatch(localItem, RegexHelper.HostnameOrDomainRegex);
+                          RegexHelper.HostnameOrDomainRegex().IsMatch(localItem);
 
             if (!isValid)
                 return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
diff --git a/Source/NETworkManager.Validators/IPAddressOrHostnameValidator.cs b/Source/NETworkManager.Validators/IPAddressOrHostnameValidator.cs
@@ -1,8 +1,9 @@
-﻿using System.Globalization;
+﻿using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+using System.DirectoryServices.ActiveDirectory;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
@@ -24,7 +25,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             return ValidationResult.ValidResult;
 
         // Check if it is a valid hostname like server-01 or server-01.example.com
-        if (Regex.IsMatch(input, RegexHelper.HostnameOrDomainRegex))
+        if(RegexHelper.HostnameOrDomainRegex().IsMatch(input))
             return ValidationResult.ValidResult;
 
         return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
diff --git a/Source/NETworkManager.Validators/MultipleHostsRangeValidator.cs b/Source/NETworkManager.Validators/MultipleHostsRangeValidator.cs
@@ -1,6 +1,7 @@
 ﻿using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Network;
 using NETworkManager.Utilities;
+using System.DirectoryServices.ActiveDirectory;
 using System.Globalization;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -74,7 +75,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
                 continue;
 
             // server-01.example.com
-            if (Regex.IsMatch(ipHostOrRange, RegexHelper.HostnameOrDomainRegex))
+            if (RegexHelper.HostnameOrDomainRegex().IsMatch(ipHostOrRange))
                 continue;
 
             // server-01.example.com/24
diff --git a/Source/NETworkManager.Validators/RemoteDesktopHostnameAndPortValidator.cs b/Source/NETworkManager.Validators/RemoteDesktopHostnameAndPortValidator.cs
@@ -1,8 +1,9 @@
-﻿using System.Globalization;
+﻿using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+using System.DirectoryServices.ActiveDirectory;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using NETworkManager.Localization.Resources;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
@@ -16,15 +17,15 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         {
             var hostnameAndPortValues = hostnameAndPort.Split(':');
 
-            if (Regex.IsMatch(hostnameAndPortValues[0], RegexHelper.HostnameOrDomainRegex) &&
+            if (RegexHelper.HostnameOrDomainRegex().IsMatch(hostnameAndPortValues[0]) &&
                 !string.IsNullOrEmpty(hostnameAndPortValues[1]) &&
                 Regex.IsMatch(hostnameAndPortValues[1], RegexHelper.PortRegex))
                 return ValidationResult.ValidResult;
 
             return new ValidationResult(false, Strings.EnterValidHostnameAndPort);
         }
 
-        return Regex.IsMatch((string)value, RegexHelper.HostnameOrDomainRegex)
+        return RegexHelper.HostnameOrDomainRegex().IsMatch((string)value)
             ? ValidationResult.ValidResult
             : new ValidationResult(false, Strings.EnterValidHostname);
     }
diff --git a/Source/NETworkManager.Validators/ServerValidator.cs b/Source/NETworkManager.Validators/ServerValidator.cs
@@ -13,11 +13,13 @@ public partial class ServerValidator : ValidationRule
     public override ValidationResult Validate(object value, CultureInfo cultureInfo)
     {
         var allowOnlyIPAddress = Wrapper.AllowOnlyIPAddress;
+
         var genericErrorResult =
             allowOnlyIPAddress ? Strings.EnterValidIPAddress : Strings.EnterValidHostnameOrIPAddress;
 
         var input = (value as string)?.Trim();
 
+        // Empty input is considered invalid
         if (string.IsNullOrEmpty(input))
             return new ValidationResult(false, genericErrorResult);
 
@@ -30,7 +32,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             return ValidationResult.ValidResult;
 
         // Check if it is a valid hostname like server-01 or server-01.example.com
-        if (Regex.IsMatch(input, RegexHelper.HostnameOrDomainRegex) && !allowOnlyIPAddress)
+        if(RegexHelper.HostnameOrDomainRegex().IsMatch(input) && !allowOnlyIPAddress)
             return ValidationResult.ValidResult;
 
         return new ValidationResult(false, genericErrorResult);
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
diff --git a/Source/NETworkManager/Views/ServerConnectionInfoProfileDialog.xaml b/Source/NETworkManager/Views/ServerConnectionInfoProfileDialog.xaml
diff --git a/Source/NETworkManager/Views/ServerConnectionInfoProfileDialog.xaml.cs b/Source/NETworkManager/Views/ServerConnectionInfoProfileDialog.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class ServerConnectionInfoProfile`
`12`	`12`	`/// </summary>`
`13`	`13`	`public ServerConnectionInfoProfile()`
`14`	`14`	`{`
	`15`	`+`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using NETworkManager.Utilities;`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.Globalization;`
`5`		`-using System.Text.RegularExpressions;`
`6`	`5`	`using System.Windows.Controls;`
`7`	`6`
`8`	`7`	`namespace NETworkManager.Validators;`
`@@ -19,7 +18,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)`
`19`	`18`
`20`	`19`	`foreach (var hostname in input.Split(' '))`
`21`	`20`	`{`
`22`		`- if (Regex.IsMatch(hostname, RegexHelper.HostnameOrDomainRegex) == false)`
	`21`	`+ if (RegexHelper.HostnameOrDomainRegex().IsMatch(hostname) == false)`
`23`	`22`	`{`
`24`	`23`	`isValid = false;`
`25`	`24`	`break;`