Add support for TLD WHOIS lookups

- Add query support for ".{tld}" format lookups to just download top level TLD data from IANA. E.g. ".com"
flipbit · Oct 20, 2019 · c516dcf · c516dcf
1 parent 0affff4
commit c516dcf
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/Whois.Tests/WhoisLookupTest.cs b/Whois.Tests/WhoisLookupTest.cs
@@ -143,6 +143,26 @@ public async Task TestLookupDomainSpecifyRootServer()
                 .Verify(call => call.LookupAsync(request), Times.Never());
         }
 
+        [Test]
+        public async Task TestLookupTld()
+        {
+            var request = new WhoisRequest(".com");
+
+            var rootServer = new WhoisResponse
+            {
+                DomainName = "com",
+                Registrar = new Registrar { WhoisServerUrl = "whois.markmonitor.com" }
+            };
+
+            whoisServerLookup
+                .Setup(call => call.LookupAsync(request))
+                .Returns(Task.FromResult(rootServer));
+
+            var result = await lookup.LookupAsync(request);
+
+            Assert.AreEqual(rootServer, result);
+        }
+
         [Test]
         public void TestLookupDomainWithEmptyQuery()
         {

diff --git a/Whois/Servers/IanaServerLookup.cs b/Whois/Servers/IanaServerLookup.cs
@@ -58,10 +58,17 @@ public async Task<WhoisResponse> LookupAsync(WhoisRequest request)
             {
                 var match = result.BestMatch.Value;
 
+                match.Content = content;
+
                 return match;
             }
 
-            return new WhoisResponse { DomainName = tld, Status = WhoisStatus.Unknown };
+            return new WhoisResponse
+            {
+                Content = content,
+                DomainName = tld, 
+                Status = WhoisStatus.Unknown
+            };
         }
 
         private async Task<string> Download(string tld, WhoisRequest request)

diff --git a/Whois/WhoisLookup.cs b/Whois/WhoisLookup.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Tokens.Extensions;
 using Whois.Logging;
 using Whois.Net;
 using Whois.Parsers;
@@ -107,7 +108,13 @@ public async Task<WhoisResponse> LookupAsync(WhoisRequest request)
                 throw new ArgumentNullException("domain");
             }
 
-            if (IsValidDomainName(request.Query) == false)
+            var isTldQuery = false;
+            if (IsTldQuery(request.Query))
+            {
+                isTldQuery = true;
+                request.Query = request.Query.SubstringAfterString(".");
+            }
+            else if (IsValidDomainName(request.Query) == false)
             {
                 throw new WhoisException($"Domain Name is invalid: {request.Query}");
             }
@@ -129,7 +136,7 @@ public async Task<WhoisResponse> LookupAsync(WhoisRequest request)
 
             // Main loop: download & parse WHOIS data and follow the referrer chain
             var whoisServerUrl = response?.WhoisServerUrl;
-            while (string.IsNullOrEmpty(whoisServerUrl) == false)
+            while (string.IsNullOrEmpty(whoisServerUrl) == false && !isTldQuery)
             {
                 // Download
                 var content = await Download(whoisServerUrl, request);
@@ -165,6 +172,21 @@ public bool IsValidDomainName(string domain)
             return valid;
         }
 
+        internal bool IsTldQuery(string query)
+        {
+            var isTldQuery = false;
+
+            if (!string.IsNullOrEmpty(query))
+            {
+                var regex = new Regex(@"^\.([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)");
+
+                isTldQuery = regex.Match(query).Success;
+            }
+
+
+            return isTldQuery;
+        }
+
         private async Task<string> Download(string url, WhoisRequest request)
         {
             // TODO: Expose this & extend for other TLDs