DNS Lookup implemented

BornToBeRoot · BornToBeRoot · commit fdccad514f5c · 2017-08-13T02:46:29.000+02:00
diff --git a/Source/NETworkManager/3rdParty/Heijden.DNS/Resolver.cs b/Source/NETworkManager/3rdParty/Heijden.DNS/Resolver.cs
@@ -353,7 +353,7 @@ private Response UdpRequest(Request request)
                     else
                         socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Dgram, ProtocolType.Udp);
 
-                    socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, m_Timeout * 1000);
+                    socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, m_Timeout);
 
                     try
                     {
@@ -403,7 +403,7 @@ private Response TcpRequest(Request request)
                     else
                         tcpClient = new TcpClient(AddressFamily.InterNetworkV6);
 
-                    tcpClient.ReceiveTimeout = m_Timeout * 1000;
+                    tcpClient.ReceiveTimeout = m_Timeout;
 
                     try
                     {
diff --git a/Source/NETworkManager/Models/Network/DNSLookup.cs b/Source/NETworkManager/Models/Network/DNSLookup.cs
@@ -1,11 +1,6 @@
 ﻿using Heijden.DNS;
-using NETworkManager.Helpers;
 using System;
-using System.Linq;
 using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Sockets;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -18,12 +13,19 @@ public class DNSLookup
         #endregion
 
         #region Events
-        /* public event EventHandler<IPScannerHostFoundArgs> RecordReceived;
+        public event EventHandler<DNSLookupRecordArgs> RecordReceived;
 
-                protected virtual void OnRecordReceived(IPScannerHostFoundArgs e)
-                {
-                    RecordReceived?.Invoke(this, e);
-                } */
+        protected virtual void OnRecordReceived(DNSLookupRecordArgs e)
+        {
+            RecordReceived?.Invoke(this, e);
+        }
+
+        public event EventHandler<DNSLookupErrorArgs> LookupError;
+
+        protected virtual void OnLookupError(DNSLookupErrorArgs e)
+        {
+            LookupError?.Invoke(this, e);
+        }
 
         public event EventHandler LookupComplete;
 
@@ -34,49 +36,69 @@ protected virtual void OnLookupComplete()
         #endregion
 
         #region Methods        
-        public void LookupAsync(string hostnameOrIPAddress)
+        public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions dnsLookupOptions)
         {
             Task.Run(() =>
             {
-                dnsResolver.DnsServer = "2001:4860:4860::8888";
-                dnsResolver.TransportType = Heijden.DNS.TransportType.Udp;
-                dnsResolver.Recursion = true;
-                dnsResolver.TransportType = Heijden.DNS.TransportType.Tcp;
-                Response dnsResponse = dnsResolver.Query(hostnameOrIPAddress, QType.ANY, QClass.IN);
+                // This will convert the query to an Arpa request
+                if (dnsLookupOptions.Type == QType.PTR)
+                {
+                    IPAddress ip;
+                    if (IPAddress.TryParse(hostnameOrIPAddress, out ip))
+                        hostnameOrIPAddress = Resolver.GetArpaFromIp(ip);
+                }
 
-                if (!string.IsNullOrEmpty(dnsResponse.Error))
-                    MessageBox.Show(dnsResponse.Error);
+                if (dnsLookupOptions.Type == QType.NAPTR)
+                    hostnameOrIPAddress = Resolver.GetArpaFromEnum(hostnameOrIPAddress);
 
-                foreach (RecordA r in dnsResponse.RecordsA)
+                if (dnsLookupOptions.UseCustomDNSServer)
+                    dnsResolver.DnsServer = dnsLookupOptions.CustomDNSServer;
+                
+                dnsResolver.Recursion = dnsLookupOptions.Recursion;
+                dnsResolver.TransportType = dnsLookupOptions.TransportType;
+                dnsResolver.Retries = dnsLookupOptions.Attempts;
+                dnsResolver.TimeOut = dnsLookupOptions.Timeout;
+
+                Response dnsResponse = dnsResolver.Query(hostnameOrIPAddress, dnsLookupOptions.Type, dnsLookupOptions.Class);
+
+                // If there was an error... return
+                if (!string.IsNullOrEmpty(dnsResponse.Error))
                 {
-                    MessageBox.Show(r.Address.ToString());
+                    OnLookupError(new DNSLookupErrorArgs(dnsResponse.Error));
+                    return;
                 }
 
+                // A
+                foreach (RecordA r in dnsResponse.RecordsA)
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
+
+                // AAAA
                 foreach (RecordAAAA r in dnsResponse.RecordsAAAA)
-                {
-                    MessageBox.Show(r.Address.ToString());
-                }
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
 
+                // CNAME
                 foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
-                {
-                    MessageBox.Show(r.CNAME);
-                }
-
-                foreach (RecordPTR r in dnsResponse.RecordsPTR)
-                {
-                    MessageBox.Show(r.PTRDNAME);
-                }
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
 
+                // MX
                 foreach (RecordMX r in dnsResponse.RecordsMX)
-                {
-                    MessageBox.Show(r.EXCHANGE);
-                }
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
 
+                // NS
                 foreach (RecordNS r in dnsResponse.RecordsNS)
-                {
-                    MessageBox.Show(r.NSDNAME);
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
 
-                }
+                // PTR
+                foreach (RecordPTR r in dnsResponse.RecordsPTR)
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
+
+                // SOA
+                foreach (RecordSOA r in dnsResponse.RecordsSOA)
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
+
+                // TXT
+                foreach (RecordTXT r in dnsResponse.RecordsTXT)
+                    OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString()));
 
                 OnLookupComplete();
             });
diff --git a/Source/NETworkManager/Models/Network/DNSLookupErrorArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupErrorArgs.cs
@@ -0,0 +1,17 @@
+﻿namespace NETworkManager.Models.Network
+{
+    public class DNSLookupErrorArgs : System.EventArgs
+    {
+        public string Error { get; set; }
+        
+        public DNSLookupErrorArgs()
+        {
+
+        }
+
+        public DNSLookupErrorArgs(string error)
+        {
+            Error = error;
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Network/DNSLookupOptions.cs b/Source/NETworkManager/Models/Network/DNSLookupOptions.cs
@@ -0,0 +1,22 @@
+﻿using Heijden.DNS;
+
+namespace NETworkManager.Models.Network
+{
+    public class DNSLookupOptions
+    {
+        public bool UseCustomDNSServer { get; set; }
+        public string CustomDNSServer { get; set; }
+        public QClass Class { get; set; }
+        public QType Type { get; set; }
+        public bool Recursion { get; set; }
+        public bool UseResolverCache { get; set; }
+        public TransportType TransportType { get; set; }
+        public int Attempts { get; set; }
+        public int Timeout { get; set;}
+
+        public DNSLookupOptions()
+        {
+
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs
@@ -0,0 +1,21 @@
+﻿using Heijden.DNS;
+
+namespace NETworkManager.Models.Network
+{
+    public class DNSLookupRecordArgs : System.EventArgs
+    {        
+        public RR ResourceRecord { get; set; }
+        public string Result { get; set; }
+
+        public DNSLookupRecordArgs()
+        {
+
+        }
+
+        public DNSLookupRecordArgs(RR resourceRecord, object result)
+        {
+            ResourceRecord = resourceRecord;
+            Result = result.ToString();
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs b/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs
@@ -0,0 +1,32 @@
+﻿using Heijden.DNS;
+
+namespace NETworkManager.Models.Network
+{
+    public class DNSLookupRecordInfo
+    {
+        public string Name { get; set; }
+        public uint TTL { get; set; }
+        public string Class { get; set; }
+        public string Type { get; set; }
+        public string Result { get; set; }
+
+        public DNSLookupRecordInfo()
+        {
+
+        }
+
+        public DNSLookupRecordInfo(RR resourceRecord, string result)
+        {
+            Name = resourceRecord.NAME;
+            TTL = resourceRecord.TTL;
+            Class = resourceRecord.Class.ToString();
+            Type = resourceRecord.Type.ToString();
+            Result = result;
+        }
+
+        public static DNSLookupRecordInfo Parse(DNSLookupRecordArgs e)
+        {
+            return new DNSLookupRecordInfo(e.ResourceRecord, e.Result);
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Network/IPScannerOptions.cs b/Source/NETworkManager/Models/Network/IPScannerOptions.cs
@@ -13,15 +13,5 @@ public IPScannerOptions()
         {
 
         }
-
-        public IPScannerOptions(int threads, int timeout, byte[] buffer, int attempts, bool resolveHostname, bool resolveMACAddress)
-        {
-            Threads = threads;
-            Timeout = timeout;
-            Buffer = buffer;
-            Attempts = attempts;
-            ResolveHostname = resolveHostname;
-            ResolveMACAddress = resolveMACAddress;
-        }
     }
 }
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
@@ -164,6 +164,10 @@
     <Compile Include="3rdParty\Heijden.DNS\Structs.cs" />
     <Compile Include="Converters\NullableDateTimeToStringConverter.cs" />
     <Compile Include="Models\Network\DNSLookup.cs" />
+    <Compile Include="Models\Network\DNSLookupOptions.cs" />
+    <Compile Include="Models\Network\DNSLookupErrorArgs.cs" />
+    <Compile Include="Models\Network\DNSLookupRecordInfo.cs" />
+    <Compile Include="Models\Network\DNSLookupRecordArgs.cs" />
     <Compile Include="Validators\IPAddressValidator.cs" />
     <Compile Include="Validators\OpacityTextboxValidator.cs" />
     <Compile Include="ViewModels\Applications\DNSLookupViewModel.cs" />
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -210,7 +210,8 @@
     <system:String x:Key="String_Class">Klasse</system:String>
     <system:String x:Key="String_Recursion">Rekursion</system:String>
     <system:String x:Key="String_UseResolverCache">Resolver-Cache verwenden</system:String>
-    
+    <system:String x:Key="String_Result">Ergebnis</system:String>
+
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Wechseln</system:String>
     <system:String x:Key="String_Button_Default">Standard</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -43,7 +43,6 @@
     <system:String x:Key="String_Header_Confirm">Confirm</system:String>
     <system:String x:Key="String_Header_HotKeys">HotKeys</system:String>
     <system:String x:Key="String_Header_DNSLookup">DNS Lookup</system:String>
-    <system:String x:Key="String_Button_Lookup">Lookup</system:String>
     <system:String x:Key="String_Header_Route">Route</system:String>
     <system:String x:Key="String_Header_MaximumHopsReached">Maximum hops reached</system:String>
     <system:String x:Key="String_Header_CanceledByUser">Canceled by user</system:String>
@@ -213,6 +212,7 @@
     <system:String x:Key="String_Class">Class</system:String>
     <system:String x:Key="String_Recursion">Recursion</system:String>
     <system:String x:Key="String_UseResolverCache">Use resolver cache</system:String>
+    <system:String x:Key="String_Result">Result</system:String>
     
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Change</system:String>
@@ -238,6 +238,7 @@
     <system:String x:Key="String_Button_Reset">Reset</system:String>
     <system:String x:Key="String_Button_Continue">Continue</system:String>
     <system:String x:Key="String_Button_Validate">Validate</system:String>
+    <system:String x:Key="String_Button_Lookup">Lookup</system:String>
 
     <!-- ContextMenuItem.Header -->
     <system:String x:Key="String_ContextMenu_Cut">Cut</system:String>
diff --git a/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs
@@ -77,8 +77,8 @@ public bool CancelLookup
             }
         }
 
-        private AsyncObservableCollection<PingInfo> _lookupResult = new AsyncObservableCollection<PingInfo>();
-        public AsyncObservableCollection<PingInfo> LookupResult
+        private AsyncObservableCollection<DNSLookupRecordInfo> _lookupResult = new AsyncObservableCollection<DNSLookupRecordInfo>();
+        public AsyncObservableCollection<DNSLookupRecordInfo> LookupResult
         {
             get { return _lookupResult; }
             set
@@ -137,32 +137,50 @@ private void StartLookup()
             LookupResult.Clear();
 
             HostnameOrIPAddressHistory = new List<string>(HistoryListHelper.Modify(HostnameOrIPAddressHistory, HostnameOrIPAddress, SettingsManager.Current.Application_HistoryListEntries));
-            
+
+            DNSLookupOptions dnsLookupOptions = new DNSLookupOptions
+            {
+                UseCustomDNSServer = SettingsManager.Current.DNSLookup_UseCustomDNSServer,
+                CustomDNSServer = SettingsManager.Current.DNSLookup_CustomDNSServer,
+                Class = SettingsManager.Current.DNSLookup_Class,
+                Type = SettingsManager.Current.DNSLookup_Type,
+                Recursion = SettingsManager.Current.DNSLookup_Recursion,
+                UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache,
+                TransportType = SettingsManager.Current.DNSLookup_TransportType,
+                Attempts = SettingsManager.Current.DNSLookup_Attempts,
+                Timeout = SettingsManager.Current.DNSLookup_Timeout
+            };
+
             DNSLookup dnsLookup = new DNSLookup();
 
+            dnsLookup.RecordReceived += DnsLookup_RecordReceived;
+            dnsLookup.LookupError += DnsLookup_LookupError;
             dnsLookup.LookupComplete += DnsLookup_LookupComplete;
 
-            dnsLookup.LookupAsync(HostnameOrIPAddress);
+            dnsLookup.LookupAsync(HostnameOrIPAddress, dnsLookupOptions);
         }
-
-        /*private void StopLookup()
-        {
-            IsLookupRunning = false;
-        }*/
         #endregion
 
         #region Events
-        private void DnsLookup_LookupComplete(object sender, EventArgs e)
+        private void DnsLookup_RecordReceived(object sender, DNSLookupRecordArgs e)
         {
+            DNSLookupRecordInfo dnsLookupRecordInfo = DNSLookupRecordInfo.Parse(e);
+
+            Application.Current.Dispatcher.BeginInvoke(new Action(delegate ()
+            {
+                LookupResult.Add(dnsLookupRecordInfo);
+            }));                        
+        }
+
+        private void DnsLookup_LookupError(object sender, DNSLookupErrorArgs e)
+        {
+            MessageBox.Show(e.Error);
             IsLookupRunning = false;
         }
-        #endregion
 
-        #region OnShutdown
-        public void OnShutdown()
+        private void DnsLookup_LookupComplete(object sender, EventArgs e)
         {
-            //if (IsLookupRunning)
-            //    LookupAction();
+            IsLookupRunning = false;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
@@ -259,11 +259,11 @@ private void StopScan()
         #region Events
         private void IpScanner_HostFound(object sender, IPScannerHostFoundArgs e)
         {
-            IPScannerHostInfo ipScannerInfo = IPScannerHostInfo.Parse(e);
+            IPScannerHostInfo ipScannerHostInfo = IPScannerHostInfo.Parse(e);
 
             Application.Current.Dispatcher.BeginInvoke(new Action(delegate ()
             {
-                IPScanResult.Add(ipScannerInfo);
+                IPScanResult.Add(ipScannerHostInfo);
             }));
         }
 
diff --git a/Source/NETworkManager/Views/Applications/DNSLookupView.xaml b/Source/NETworkManager/Views/Applications/DNSLookupView.xaml
diff --git a/Source/NETworkManager/Views/Applications/DNSLookupView.xaml.cs b/Source/NETworkManager/Views/Applications/DNSLookupView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ private Response UdpRequest(Request request)`
`353`	`353`	`else`
`354`	`354`	`socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Dgram, ProtocolType.Udp);`
`355`	`355`
`356`		`- socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, m_Timeout * 1000);`
	`356`	`+ socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, m_Timeout);`
`357`	`357`
`358`	`358`	`try`
`359`	`359`	`{`
`@@ -403,7 +403,7 @@ private Response TcpRequest(Request request)`
`403`	`403`	`else`
`404`	`404`	`tcpClient = new TcpClient(AddressFamily.InterNetworkV6);`
`405`	`405`
`406`		`- tcpClient.ReceiveTimeout = m_Timeout * 1000;`
	`406`	`+ tcpClient.ReceiveTimeout = m_Timeout;`
`407`	`407`
`408`	`408`	`try`
`409`	`409`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,5 @@ public IPScannerOptions()`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`}`
`16`		`-`
`17`		`- public IPScannerOptions(int threads, int timeout, byte[] buffer, int attempts, bool resolveHostname, bool resolveMACAddress)`
`18`		`- {`
`19`		`- Threads = threads;`
`20`		`- Timeout = timeout;`
`21`		`- Buffer = buffer;`
`22`		`- Attempts = attempts;`
`23`		`- ResolveHostname = resolveHostname;`
`24`		`- ResolveMACAddress = resolveMACAddress;`
`25`		`- }`
`26`	`16`	`}`
`27`	`17`	`}`