IP-Scanner iprange like 192.168.[0-100,200].1

BornToBeRoot · BornToBeRoot · commit 2f7e062c5019 · 2017-11-19T20:33:20.000+01:00
diff --git a/Source/NETworkManager/Helpers/IPScanRangeHelper.cs b/Source/NETworkManager/Helpers/IPScanRangeHelper.cs
@@ -68,7 +68,7 @@ public static IPAddress[] ConvertIPRangeToIPAddresses(string ipRange, Cancellati
                     continue;
                 }
 
-                // Convert 192.168.[50-100].1 to 192.168.50.1, 192.168.51.1, 192.168.52.1, etc.
+                // Convert 192.168.[50-100,200].1 to 192.168.50.1, 192.168.51.1, 192.168.52.1, {..}, 192.168.200.1
                 if (Regex.IsMatch(ipOrRange, RegexHelper.IPv4AddressSpecialRangeRegex))
                 {
                     string[] octets = ipOrRange.Split('.');
@@ -83,11 +83,22 @@ public static IPAddress[] ConvertIPRangeToIPAddresses(string ipRange, Cancellati
                         // Create a range for each octet
                         if (Regex.IsMatch(octets[i], RegexHelper.SpecialRangeRegex))
                         {
-                            string[] rangeNumbers = octets[i].Substring(1, octets[i].Length - 2).Split('-');
-
-                            for (int j = int.Parse(rangeNumbers[0]); j < (int.Parse(rangeNumbers[1]) + 1); j++)
+                            foreach (string numberOrRange in octets[i].Substring(1, octets[i].Length - 2).Split(','))
                             {
-                                innerList.Add(j);
+                                // 50-100
+                                if (numberOrRange.Contains("-"))
+                                {
+                                    string[] rangeNumbers = numberOrRange.Split('-');
+
+                                    for (int j = int.Parse(rangeNumbers[0]); j < (int.Parse(rangeNumbers[1]) + 1); j++)
+                                    {
+                                        innerList.Add(j);
+                                    }
+                                } // 200
+                                else
+                                {
+                                    innerList.Add(int.Parse(numberOrRange));
+                                }
                             }
                         }
                         else
diff --git a/Source/NETworkManager/Helpers/RegexHelper.cs b/Source/NETworkManager/Helpers/RegexHelper.cs
@@ -28,7 +28,7 @@ public static class RegexHelper
         public const string IPv4AddressSubnetmaskRegex = @"^(?:(?: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]?)\/(" + SubnetmaskValues + ".0.0.0)|(255." + SubnetmaskValues + ".0.0)|(255.255." + SubnetmaskValues + ".0)|(255.255.255." + SubnetmaskValues + ")$";
 
         // Match a range like [0-255]
-        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]?)\]";
+        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]?))))*\]";
 
         // Match a IPv4-Address like 192.168.[50-100].1
         public const string IPv4AddressSpecialRangeRegex = @"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|" + SpecialRangeRegex + @")\.){3}((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|" + SpecialRangeRegex + @")$";
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -348,7 +348,7 @@
     <system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
     <system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname oder IP-Adresse...</system:String>
-    <system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[0-100].1; 192.168.178.150</system:String>
+    <system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
     <system:String x:Key="String_Watermark_LocationOfTheImport">Speicherort der Importdatei...</system:String>
     <system:String x:Key="String_Watermark_ExampleMACAddressesOrVendor">01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</system:String>
     <system:String x:Key="String_Watermark_EamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -348,7 +348,7 @@
     <system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
     <system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname or IP-Address...</system:String>
-    <system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[0-100].1; 192.168.178.150</system:String>
+    <system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
     <system:String x:Key="String_Watermark_LocationOfTheImport">Location of the import file...</system:String>
     <system:String x:Key="String_Watermark_ExampleMACAddressesOrVendor">01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</system:String>
     <system:String x:Key="String_Watermark_EamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
diff --git a/Source/NETworkManager/Validators/IPScanRangeValidator.cs b/Source/NETworkManager/Validators/IPScanRangeValidator.cs
@@ -48,18 +48,24 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
                         // Match [50-100]
                         if (Regex.IsMatch(octet, RegexHelper.SpecialRangeRegex))
                         {
-                            // [50-100] --> {"50","100"}
-                            string[] rangeNumber = octet.Substring(1, octet.Length - 2).Split('-');
+                            foreach (string numberOrRange in octet.Substring(1, octet.Length - 2).Split(','))
+                            {
+                                if (numberOrRange.Contains("-"))
+                                {
+                                    // 50-100 --> {50, 100}
+                                    string[] rangeNumber = numberOrRange.Split('-');
 
-                            if (int.Parse(rangeNumber[0]) > int.Parse(rangeNumber[1]))
-                                isValid = false;
+                                    if (int.Parse(rangeNumber[0]) > int.Parse(rangeNumber[1]))
+                                        isValid = false;
+                                }
+                            }
                         }
                     }
 
                     continue;
                 }
 
-                isValid = false;                
+                isValid = false;
             }
 
             if (isValid)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static IPAddress[] ConvertIPRangeToIPAddresses(string ipRange, Cancellati`
`68`	`68`	`continue;`
`69`	`69`	`}`
`70`	`70`
`71`		`- // Convert 192.168.[50-100].1 to 192.168.50.1, 192.168.51.1, 192.168.52.1, etc.`
	`71`	`+ // Convert 192.168.[50-100,200].1 to 192.168.50.1, 192.168.51.1, 192.168.52.1, {..}, 192.168.200.1`
`72`	`72`	`if (Regex.IsMatch(ipOrRange, RegexHelper.IPv4AddressSpecialRangeRegex))`
`73`	`73`	`{`
`74`	`74`	`string[] octets = ipOrRange.Split('.');`
`@@ -83,11 +83,22 @@ public static IPAddress[] ConvertIPRangeToIPAddresses(string ipRange, Cancellati`
`83`	`83`	`// Create a range for each octet`
`84`	`84`	`if (Regex.IsMatch(octets[i], RegexHelper.SpecialRangeRegex))`
`85`	`85`	`{`
`86`		`- string[] rangeNumbers = octets[i].Substring(1, octets[i].Length - 2).Split('-');`
`87`		`-`
`88`		`- for (int j = int.Parse(rangeNumbers[0]); j < (int.Parse(rangeNumbers[1]) + 1); j++)`
	`86`	`+ foreach (string numberOrRange in octets[i].Substring(1, octets[i].Length - 2).Split(','))`
`89`	`87`	`{`
`90`		`- innerList.Add(j);`
	`88`	`+ // 50-100`
	`89`	`+ if (numberOrRange.Contains("-"))`
	`90`	`+ {`
	`91`	`+ string[] rangeNumbers = numberOrRange.Split('-');`
	`92`	`+`
	`93`	`+ for (int j = int.Parse(rangeNumbers[0]); j < (int.Parse(rangeNumbers[1]) + 1); j++)`
	`94`	`+ {`
	`95`	`+ innerList.Add(j);`
	`96`	`+ }`
	`97`	`+ } // 200`
	`98`	`+ else`
	`99`	`+ {`
	`100`	`+ innerList.Add(int.Parse(numberOrRange));`
	`101`	`+ }`
`91`	`102`	`}`
`92`	`103`	`}`
`93`	`104`	`else`
Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,24 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)`
`48`	`48`	`// Match [50-100]`
`49`	`49`	`if (Regex.IsMatch(octet, RegexHelper.SpecialRangeRegex))`
`50`	`50`	`{`
`51`		`- // [50-100] --> {"50","100"}`
`52`		`- string[] rangeNumber = octet.Substring(1, octet.Length - 2).Split('-');`
	`51`	`+ foreach (string numberOrRange in octet.Substring(1, octet.Length - 2).Split(','))`
	`52`	`+ {`
	`53`	`+ if (numberOrRange.Contains("-"))`
	`54`	`+ {`
	`55`	`+ // 50-100 --> {50, 100}`
	`56`	`+ string[] rangeNumber = numberOrRange.Split('-');`
`53`	`57`
`54`		`- if (int.Parse(rangeNumber[0]) > int.Parse(rangeNumber[1]))`
`55`		`- isValid = false;`
	`58`	`+ if (int.Parse(rangeNumber[0]) > int.Parse(rangeNumber[1]))`
	`59`	`+ isValid = false;`
	`60`	`+ }`
	`61`	`+ }`
`56`	`62`	`}`
`57`	`63`	`}`
`58`	`64`
`59`	`65`	`continue;`
`60`	`66`	`}`
`61`	`67`
`62`		`- isValid = false;`
	`68`	`+ isValid = false;`
`63`	`69`	`}`
`64`	`70`
`65`	`71`	`if (isValid)`