add support for iana domains

Author: rl-devops

whois/_2_parse.py

@@ -150,26 +150,18 @@ def doDnsSec(whois_str: str) -> bool:
     return False
 
 
-def doSourceIana(tld: str, r: Dict, whois_str: str, verbose: bool = False) -> str:
-    # here we can handle the example.com and example.net permanent IANA domains
-
-    if verbose:
-        msg = "i have seen source: IANA"
-        print(msg, file=sys.stderr)
-
-    whois_splitted = whois_str.split("source:       IANA")
-    if len(whois_splitted) == 2 and whois_splitted[1].strip() != "":
-        # if we see source: IANA and the part after is not only whitespace
+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"after IANA: {whois_splitted[1]}"
+            msg = "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
 
-        return whois_splitted[1], None
-
-    # try to parse this as a IANA domain as after is only whitespace
-    # this will require us to fill in sufficient default values that the code expects to be there
-    r = doExtractPattensFromWhoisString(tld, r, whois_str, verbose)
 
+def doExtractPattensIanaFromWhoisString(tld: str, r: Dict, whois_str: str, verbose: bool = False):
+    # now handle the actual format if this whois response
     iana = {
         "domain_name": r"domain:\s?([^\n]+)",
         "registar": r"organisation:\s?([^\n]+)",
@@ -179,23 +171,34 @@ def doSourceIana(tld: str, r: Dict, whois_str: str, verbose: bool = False) -> st
         zz = re.findall(v, whois_str)
         if zz:
             if verbose:
-                print(zz, file=sys.stderr)
+                print(tld, zz, file=sys.stderr)
             r[k] = zz
+    return r
 
-    if verbose:
-        print(r, file=sys.stderr)
 
-    return whois_str, r
+def doSourceIana(tld: str, r: Dict, whois_str: str, verbose: bool = False) -> str:
+    # here we can handle the example.com and example.net permanent IANA domains
 
+    if verbose:
+        msg = "i have seen source: IANA"
+        print(msg, file=sys.stderr)
 
-def doIfServerNameLookForDomainName(whois_str: str, verbose: bool = False) -> str:
-    # not often available anymore
-    if re.findall(r"Server Name:\s?(.+)", whois_str, re.IGNORECASE):
+    whois_splitted = whois_str.split("source:       IANA")
+    if len(whois_splitted) == 2 and whois_splitted[1].strip() != "":
+        # if we see source: IANA and the part after is not only whitespace
         if verbose:
-            msg = "i have seen Server Name:, looking for Domain Name:"
+            msg = f"after IANA: {whois_splitted[1]}"
             print(msg, file=sys.stderr)
-        whois_str = whois_str[whois_str.find("Domain Name:") :]
-    return whois_str
+
+        return whois_splitted[1], None
+
+    # try to parse this as a IANA domain as after is only whitespace
+    r = doExtractPattensFromWhoisString(tld, r, whois_str, verbose)  # set default values
+
+    # now handle the actual format if this whois response
+    r = doExtractPattensIanaFromWhoisString(tld, r, whois_str, verbose)
+
+    return whois_str, r
 
 
 def doExtractPattensFromWhoisString(tld: str, r: Dict, whois_str: str, verbose: bool = False):