add amfam tld

Author: rl-devops

compare_known_tld.py

@@ -38,40 +38,49 @@
     forceDownloadTld=forceDownloadTld,
 )
 
+# ge python whois known tld's and second level domains
 known = sorted(whois.validTlds())
 
+# get iana data
 URL = "https://data.iana.org/TLD/tlds-alpha-by-domain.txt"
 response = urllib.request.urlopen(URL)
 data = response.read().decode("utf-8").lower()
 dataList = sorted(data.splitlines())
 
+# filter out known names and try to detect names not known by iana
 for name in known:
-    # print(name)
     if name in dataList:
-        del dataList[dataList.index(name)]
-
-# Try to auto detect new domaisn via IANA and some known common regex lists like .com
-
+        continue
+    if "." in name:
+        continue
+    if name not in dataList:
+        print(f"{name} tld name from python_whois is not known in IANA list")
+        continue
+
+dataList2 = []
+for name in dataList:
+    if name in known:
+        continue
+    dataList2.append(name)
+
+# Try to auto detect new domains via IANA and some known common regex lists like .com
 found = {}
-for tld in dataList:
+for tld in dataList2:
     data, status = i.getInfoOnOneTld(tld)
-    # print(data)
+    # print(status, data)
 
     if data and "whois" in data and data["whois"] and data["whois"] != "NULL":
         wh = data["whois"]
-        # print(tld, wh, data, status)
         if wh.endswith(f".{tld}"):
             dd = wh.split(".")[-2:]
         else:
             dd = ["meta", tld]
 
-        # print(dd)
         zz = _do_whois_query(
             dd,
             ignore_returncode=False,
             server=wh,
         )
-        # print(zz)
 
         pp = {"_server": wh, "extend": "com"}
         aDictToTestOverride = {tld: pp}
@@ -87,8 +96,5 @@
         except Exception as e:
             print(e)
 
-for tld in found:
-    print(f"## ZZ['{tld}'] = {found[tld]} # auto-detected via IANA tld")
-
-# TODO
-# also make a list of all tld (without dot in them) that no longer exists in iana, we can remove them
+    else:
+        print(f"no whois info for tld: {tld}\n", data)

whois/tld_regexpr.py

@@ -1951,6 +1951,8 @@
 # 3322_org = {"extend": "_privateReg"}  # dynamic dns without any whois
 
 # https://en.wikipedia.org/wiki/.onion, a "official" fake domain
+# https://www.rfc-editor.org/rfc/rfc7686.html
+# .onion names are used to provide access to end to end encrypted, secure, anonymized services;
 ZZ["onion"] = {"extend": "_privateReg"}
 
 # backend registry for domain names ending in GG, JE, and AS.
@@ -2648,3 +2650,5 @@
 ZZ["yokohama"] = {"_server": "whois.nic.yokohama", "extend": "com"}
 ZZ["you"] = {"_server": "whois.nic.you", "extend": "com"}
 ZZ["zappos"] = {"_server": "whois.nic.zappos", "extend": "com"}
+
+ZZ['amfam'] = {'_server': 'whois.nic.amfam', 'extend': 'com'}