add doIfServerNameLookForDomainName; move some comments; show where we use 'empty string' as default return

Author: rl-devops

whois/_2_parse.py

@@ -100,7 +100,7 @@ def handleShortResponse(
     dl: List,
     whois_str: str,
     verbose: bool = False,
-):
+): # returns None or raises one of (WhoisQuotaExceeded, FailedParsingWhoisOutput)
     if verbose:
         d = ".".join(dl)
         print(f"line count < 5:: {tld} {d} {whois_str}", file=sys.stderr)
@@ -150,14 +150,35 @@ def handleShortResponse(
     # ---------------------------------
     raise FailedParsingWhoisOutput(whois_str)
 
-def doDnsSec(whois_str: str):
+def doDnsSec(whois_str: str) -> bool:
     whois_dnssec: Any = whois_str.split("DNSSEC:")
     if len(whois_dnssec) >= 2:
         whois_dnssec = whois_dnssec[1].split("\n")[0]
         if whois_dnssec.strip() == "signedDelegation" or whois_dnssec.strip() == "yes":
             return True
     return False
 
+def doSourceIana(whois_str: str, verbose: bool = False) -> str:
+    # here we can handle the example.com and example.net permanent IANA domains
+
+    if verbose:
+        msg = f"i have seen source: IANA"
+        print(msg, file=sys.stderr)
+
+    whois_splitted = whois_str.split("source:       IANA")
+    if len(whois_splitted) == 2:
+        whois_str = whois_splitted[1] # often this is actually just whitespace
+    return whois_str
+
+def doIfServerNameLookForDomainName(whois_str: str, verbose: bool = False) -> str:
+    # not often available anymore
+    if re.findall(r"Server Name:\s?(.+)", whois_str, re.IGNORECASE):
+        if verbose:
+            msg = f"i have seen Server Name:, looking for Domain Name:"
+            print(msg, file=sys.stderr)
+        whois_str = whois_str[whois_str.find("Domain Name:") :]
+    return whois_str
+
 def do_parse(
     whois_str: str,
     tld: str,
@@ -178,27 +199,20 @@ def do_parse(
 
     r["DNSSEC"] = doDnsSec(whois_str) # check the status of DNSSEC
 
-    # this is mostly not available in many tld's anymore, should be investigated
-    # split whois_str to remove first IANA part showing info for TLD only
-    whois_splitted = whois_str.split("source:       IANA")
-    if len(whois_splitted) == 2:
-        whois_str = whois_splitted[1]
+    if "source:       IANA" in whois_str: # prepare for handling historical IANA domains
+        whois_str = doSourceIana(whois_str, verbose)
 
-    # also not available for many modern tld's
-    sn = re.findall(r"Server Name:\s?(.+)", whois_str, re.IGNORECASE)
-    if sn:
-        whois_str = whois_str[whois_str.find("Domain Name:") :]
+    if "Server Name" in whois_str: # handle old type Server Name (not very common anymore)
+        whois_str = doIfServerNameLookForDomainName(whois_str, verbose)
 
-    # return TLD_RE["com"] as default if tld not exists in TLD_RE
-    for k, v in TLD_RE.get(tld, TLD_RE["com"]).items():
-        if k.startswith("_"):
-            # skip meta element like: _server or _privateRegistry
+    for k, v in TLD_RE.get(tld, TLD_RE["com"]).items(): # use TLD_RE["com"] as default if a regex is missing
+        if k.startswith("_"): # skip meta element like: _server or _privateRegistry
             continue
 
+        # Historical: here we use 'empty string' as default, not None
         if v is None:
             r[k] = [""]
         else:
             r[k] = v.findall(whois_str) or [""]
-            # print("DEBUG: Keyval = " + str(r[k]))
 
     return r