Feature: Ping Monitor improvements (#2573)

* Feature: Ping Monitor improvements * Feature: DNS Lookup / Port Scanner improve group string * Feature: Host range aded to Ping Monitor & new design * Feature: Allow range in profile * Feature: Ping Monitor * Feature: Setting to expand host view * Feature: Expand ping monitor host * Docs: Ping Monitor * Chore: Refactoring * Feature: Ping Monitor * Docs: Update img
BornToBeRoot · Dec 9, 2023 · 01ae7e6 · 01ae7e6
1 parent 24fa4f0
commit 01ae7e6
Show file tree

Hide file tree

Showing 49 changed files with 1,161 additions and 801 deletions.
diff --git a/InnoSetup.iss b/InnoSetup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "NETworkManager"
-#define MyAppVersion "2023.11.28.0"
+#define MyAppVersion "2023.12.9.0"
 #define MyAppPublisher "BornToBeRoot"
 #define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
 #define MyAppExeName "NETworkManager.exe"

diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2023.11.28.0")]
-[assembly: AssemblyFileVersion("2023.11.28.0")]
+[assembly: AssemblyVersion("2023.12.9.0")]
+[assembly: AssemblyFileVersion("2023.12.9.0")]
diff --git a/Source/NETworkManager.Converters/PercentConverter.cs b/Source/NETworkManager.Converters/PercentConverter.cs
diff --git a/Source/NETworkManager.Localization/Resources/StaticStrings.Designer.cs b/Source/NETworkManager.Localization/Resources/StaticStrings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/StaticStrings.resx b/Source/NETworkManager.Localization/Resources/StaticStrings.resx
@@ -145,7 +145,7 @@
     <value>SERVER-01 or 10.0.0.10</value>
   </data>
   <data name="ExampleHostRange" xml:space="preserve">
-    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; borntoberoot.net/24</value>
+    <value>192.168.178.0/24; 10.0.0.0 - 10.0.0.9; 10.0.[0-9,20].[1-2]; server-01.borntoberoot.net/24</value>
   </data>
   <data name="ExampleIPv4Address" xml:space="preserve">
     <value>10.0.0.10</value>

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -873,7 +873,7 @@ First make a backup copy of your profile files before enabling encryption!</valu
     <value>Hostname or IP address</value>
   </data>
   <data name="Hosts" xml:space="preserve">
-    <value>Host(s)</value>
+    <value>Hosts</value>
   </data>
   <data name="ID" xml:space="preserve">
     <value>ID</value>
@@ -3748,4 +3748,13 @@ Try again in a few seconds.</value>
   <data name="SNMPErrorCode_InconsistentName" xml:space="preserve">
     <value>The object's state is inconsistent, preventing the set operation!</value>
   </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Close all</value>
+  </data>
+  <data name="ExpandHostView" xml:space="preserve">
+    <value>Expand host view</value>
+  </data>
+  <data name="CannotSetHostWhileRunningMessage" xml:space="preserve">
+    <value>Host cannot be set while other hosts are being added. Please wait until the process is complete and try again.</value>
+  </data>
 </root>
diff --git a/Source/NETworkManager.Models/Export/ExportManager.DNSLookupRecordInfo.cs b/Source/NETworkManager.Models/Export/ExportManager.DNSLookupRecordInfo.cs
@@ -46,11 +46,11 @@ private static void CreateCsv(IEnumerable<DNSLookupRecordInfo> collection, strin
         var stringBuilder = new StringBuilder();
 
         stringBuilder.AppendLine(
-            $"{nameof(DNSLookupRecordInfo.DomainName)},{nameof(DNSLookupRecordInfo.TTL)},{nameof(DNSLookupRecordInfo.RecordClass)},{nameof(DNSLookupRecordInfo.RecordType)},{nameof(DNSLookupRecordInfo.Result)},{nameof(DNSLookupRecordInfo.Server)},{nameof(DNSLookupRecordInfo.IPEndPoint)}");
+            $"{nameof(DNSLookupRecordInfo.DomainName)},{nameof(DNSLookupRecordInfo.TTL)},{nameof(DNSLookupRecordInfo.RecordClass)},{nameof(DNSLookupRecordInfo.RecordType)},{nameof(DNSLookupRecordInfo.Result)},{nameof(DNSLookupRecordInfo.NameServerIPAddress)},{nameof(DNSLookupRecordInfo.NameServerHostName)},{nameof(DNSLookupRecordInfo.NameServerPort)}");
 
         foreach (var info in collection)
             stringBuilder.AppendLine(
-                $"{info.DomainName},{info.TTL},{info.RecordClass},{info.RecordType},{info.Result},{info.Server},{info.IPEndPoint}");
+                $"{info.DomainName},{info.TTL},{info.RecordClass},{info.RecordType},{info.Result},{info.NameServerIPAddress},{info.NameServerHostName},{info.NameServerPort}");
 
         System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
     }
@@ -73,8 +73,9 @@ from info in collection
                             new XElement(nameof(DNSLookupRecordInfo.RecordClass), info.RecordClass),
                             new XElement(nameof(DNSLookupRecordInfo.RecordType), info.RecordType),
                             new XElement(nameof(DNSLookupRecordInfo.Result), info.Result),
-                            new XElement(nameof(DNSLookupRecordInfo.Server), info.Server),
-                            new XElement(nameof(DNSLookupRecordInfo.IPEndPoint), info.IPEndPoint)))));
+                            new XElement(nameof(DNSLookupRecordInfo.NameServerIPAddress), info.NameServerIPAddress),
+                            new XElement(nameof(DNSLookupRecordInfo.NameServerHostName), info.NameServerHostName),
+                            new XElement(nameof(DNSLookupRecordInfo.NameServerPort), info.NameServerPort)))));
 
         document.Save(filePath);
     }
@@ -97,8 +98,9 @@ private static void CreateJson(IReadOnlyList<DNSLookupRecordInfo> collection, st
                 collection[i].RecordClass,
                 collection[i].RecordType,
                 collection[i].Result,
-                collection[i].Server,
-                collection[i].IPEndPoint
+                collection[i].NameServerIPAddress,
+                collection[i].NameServerHostName,
+                collection[i].NameServerPort
             };
         }
 

diff --git a/Source/NETworkManager.Models/Network/DNSLookup.cs b/Source/NETworkManager.Models/Network/DNSLookup.cs
@@ -2,11 +2,11 @@
 using DnsClient.Protocol;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
+using NETworkManager.Utilities;
 
 namespace NETworkManager.Models.Network;
 
@@ -116,8 +116,15 @@ public void ResolveAsync(IEnumerable<string> hosts)
             var queries = _addSuffix && _settings.QueryType != QueryType.PTR ? GetHostWithSuffix(hosts) : hosts;
 
             // Foreach dns server
-            Parallel.ForEach(_servers, dnsServer =>
+            Parallel.ForEach(_servers, async dnsServer =>
             {
+                // Get the dns server hostname for some additional information
+                var dnsServerHostName = string.Empty;
+
+                var dnsResult = await DNSClient.GetInstance().ResolvePtrAsync(dnsServer.Address);
+                if (!dnsResult.HasError)
+                    dnsServerHostName = dnsResult.Value;
+
                 // Init each dns server once
                 LookupClientOptions lookupClientOptions = new(dnsServer)
                 {
@@ -129,7 +136,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
                 };
 
                 LookupClient lookupClient = new(lookupClientOptions);
-
+                
                 // Foreach host
                 Parallel.ForEach(queries, query =>
                 {
@@ -153,7 +160,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
                         }
 
                         // Process the results...
-                        ProcessDnsAnswers(dnsResponse.Answers, dnsResponse.NameServer);
+                        ProcessDnsAnswers(dnsResponse.Answers, dnsResponse.NameServer, dnsServerHostName);
                     }
                     catch (Exception ex)
                     {
@@ -171,7 +178,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
     /// </summary>
     /// <param name="answers">List of DNS resource records.</param>
     /// <param name="nameServer">DNS name server that answered the query.</param>
-    private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServer nameServer)
+    private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServer nameServer, string nameServerHostname = null)
     {
         if(answers is not DnsResourceRecord[] dnsResourceRecords)
             return;
@@ -180,49 +187,49 @@ private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServe
         foreach (var record in dnsResourceRecords.ARecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}" , $"{record.Address}", $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}" , $"{record.Address}", $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // AAAA
         foreach (var record in dnsResourceRecords.AaaaRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", $"{record.Address}", $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", $"{record.Address}", $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // CNAME
         foreach (var record in dnsResourceRecords.CnameRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.CanonicalName, $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.CanonicalName, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // MX
         foreach (var record in dnsResourceRecords.MxRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.Exchange, $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.Exchange, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // NS
         foreach (var record in dnsResourceRecords.NsRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.NSDName, $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.NSDName, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // PTR
         foreach (var record in dnsResourceRecords.PtrRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.PtrDomainName, $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.PtrDomainName, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // SOA
         foreach (var record in dnsResourceRecords.SoaRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.MName + ", " + record.RName, $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", record.MName + ", " + record.RName, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // TXT
         foreach (var record in dnsResourceRecords.TxtRecords())
             OnRecordReceived(new DNSLookupRecordReceivedArgs(
                 new DNSLookupRecordInfo(
-                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", string.Join(", ", record.Text), $"{nameServer.Address}", $"{nameServer.Address}:{nameServer.Port}")));
+                    record.DomainName, record.TimeToLive, $"{record.RecordClass}",$"{record.RecordType}", string.Join(", ", record.Text), $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
 
         // ToDo: implement more
     }

diff --git a/Source/NETworkManager.Models/Network/DNSLookupRecordInfo.cs b/Source/NETworkManager.Models/Network/DNSLookupRecordInfo.cs
@@ -9,12 +9,12 @@ public class DNSLookupRecordInfo
     /// Domain name of the record.
     /// </summary>
     public string DomainName { get; set; }
-    
+
     /// <summary>
     /// Time to live (TTL) of the record.
     /// </summary>
     public int TTL { get; set; }
-    
+
     /// <summary>
     /// Class of the record.
     /// </summary>
@@ -31,14 +31,26 @@ public class DNSLookupRecordInfo
     public string Result { get; set; }
 
     /// <summary>
-    /// Name server that provided the result. 
+    /// IP address of the name server that provided the result. 
+    /// </summary>
+    public string NameServerIPAddress { get; set; }
+
+    /// <summary>
+    /// Port of the name server that provided the result.
+    /// </summary>
+    public int NameServerPort { get; set; }
+
+    /// <summary>
+    /// Hostname of the name server that provided the result.
     /// </summary>
-    public string Server { get; set; }
+    public string NameServerHostName { get; set; }
 
     /// <summary>
-    /// IP endpoint (IP address:port) of the name server that provided the result.
+    /// Hostname (if available) or/and IP address with port of the name server that provided the result.
     /// </summary>
-    public string IPEndPoint { get; set; }
+    public string NameServerAsString => string.IsNullOrEmpty(NameServerHostName)
+        ? $"{NameServerIPAddress}:{NameServerPort}"
+        : $"{NameServerHostName.TrimEnd('.')} # {NameServerIPAddress}:{NameServerPort}";
 
     /// <summary>
     /// Creates a new instance of <see cref="DNSLookupRecordInfo"/> with the specified parameters.
@@ -48,16 +60,19 @@ public class DNSLookupRecordInfo
     /// <param name="recordClass">Class of the record.</param>
     /// <param name="recordType">Type of the record.</param>
     /// <param name="result">Result of the record. (IP address, hostname, text, etc.)</param>
-    /// <param name="server">Name server that provided the result.</param>
-    /// <param name="ipEndPoint">IP endpoint (IP address:port) of the name server that provided the result.</param>
-    public DNSLookupRecordInfo(string domainName, int ttl, string recordClass, string recordType, string result, string server, string ipEndPoint)
+    /// <param name="nameServerIPAddress">IP address of the name server that provided the result.</param>
+    /// <param name="nameServerHostName">Hostname of the name server that provided the result.</param>
+    /// <param name="nameServerPort">Port of the name server that provided the result.</param>
+    public DNSLookupRecordInfo(string domainName, int ttl, string recordClass, string recordType, string result,
+        string nameServerIPAddress, string nameServerHostName, int nameServerPort)
     {
         DomainName = domainName;
         TTL = ttl;
         RecordClass = recordClass;
         RecordType = recordType;
         Result = result;
-        Server = server;
-        IPEndPoint = ipEndPoint;
+        NameServerIPAddress = nameServerIPAddress;
+        NameServerPort = nameServerPort;
+        NameServerHostName = nameServerHostName;
     }
-}
+}
diff --git a/Source/NETworkManager.Models/Network/HostNotFoundException.cs b/Source/NETworkManager.Models/Network/HostNotFoundException.cs