Feature: Use Regex to validate OID (#2205)

* Feature: Use Regex to validate OID

* Docs: #2205

Author: BornToBeRoot

Source/NETworkManager.Utilities/RegexHelper.cs

@@ -83,4 +83,7 @@ public static class RegexHelper
 
     // Match a number (like 12, 12.4, 12,3) 
     public const string NumberRegex = @"^\d+((\.|,)\d+)?$";
+
+    // Match an SNMP OID (like 1.3.6.1)
+    public const string SNMOIODRegex = @"^[012]\.(?:[0-9]|[1-3][0-9])(\.\d+)*$";
 }

Source/NETworkManager.Validators/SNMPOIDValidator.cs

@@ -1,5 +1,6 @@
-using Lextm.SharpSnmpLib;
+using NETworkManager.Utilities;
 using System.Globalization;
+using System.Text.RegularExpressions;
 using System.Windows.Controls;
 
 namespace NETworkManager.Validators;
@@ -10,26 +11,19 @@ public class SNMPOIDValidator : ValidationRule
 
     public override ValidationResult Validate(object value, CultureInfo cultureInfo)
     {
-        // Use SharpSNMP new ObjectIdentifiert to validate oid
-        try
-        {
-            var oidValue = (value as string).Replace(" ", "");
+        var oidValue = (value as string).Replace(" ", "");
 
-            if (Wrapper.Mode == Models.Network.SNMPMode.Get && oidValue.Contains(';'))
+        if (Wrapper.Mode == Models.Network.SNMPMode.Get && oidValue.Contains(';'))
+        {
+            foreach (var oid in oidValue.Split(';'))
             {
-                foreach (var oid in oidValue.Split(';'))
-                    _ = new ObjectIdentifier(oid);
-
-                return ValidationResult.ValidResult;
+                if (!Regex.IsMatch(oid, RegexHelper.SNMOIODRegex))
+                    return new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
             }
-            
-            _ = new ObjectIdentifier(oidValue);                     
-        }
-        catch (System.ArgumentException)
-        {
-            return new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
+
+            return ValidationResult.ValidResult;
         }
 
-        return ValidationResult.ValidResult;
+        return Regex.IsMatch(oidValue, RegexHelper.SNMOIODRegex) ? ValidationResult.ValidResult : new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
     }
 }

docs/Changelog/next-release.md

@@ -40,6 +40,7 @@ Release date: **xx.xx.2023**
   - Get request can query multiple OIDs at once now [#2167](https://github.com/BornToBeRoot/NETworkManager/pull/2167){:target="\_blank"}
   - SHA256, SHA384 and SHA512 for SNMPv3 auth added [#2166](https://github.com/BornToBeRoot/NETworkManager/pull/2166){:target="\_blank"}
   - AES192 and AES256 for SNMPv3 privacy added [#2166](https://github.com/BornToBeRoot/NETworkManager/pull/2166){:target="\_blank"}
+  - Use Regex to validate OID [#2205](https://github.com/BornToBeRoot/NETworkManager/pull/2205){:target="\_blank"}
 - Connections
   - Automatically refresh is now enabled if it was enabled on the last exit [#2116](https://github.com/BornToBeRoot/NETworkManager/pull/2116){:target="\_blank"}
 - Listeners