add nic to default test group for makeTestdataAll.sh; add net.tr and tr (privateReg), onl, blue, garden, promo, one; fix tokyo, add sy

Author: rl-devops

DONE

@@ -35,3 +35,8 @@ DONE
 
   - add tld st, so, nrw, lat, so , realestate, ph, com.ph, org.ph, net.ph, zm
 
+  -  fix tokyo, it needs a explicit server, add sy it has a whois server but i cannot get it to answer, set to privateReg
+  -  add net.tr and tr (privateReg), onl, blue, garden, promo, one,
+
+  -  add nic to default test group for makeTestdataAll.sh
+

makeTestdataAll.sh

@@ -170,6 +170,7 @@ domainsToTry()
 
     [ "$domain" = "__DEFAULT__" ] && {
         cat <<! |
+nic
 meta
 google
 !

testdata/google.com/input

@@ -31,13 +31,13 @@ Tech Organization: Google LLC
 Tech State/Province: CA
 Tech Country: US
 Tech Email: Select Request Email Form at https://domains.markmonitor.com/whois/google.com
-Name Server: ns2.google.com
+Name Server: ns4.google.com
 Name Server: ns3.google.com
 Name Server: ns1.google.com
-Name Server: ns4.google.com
+Name Server: ns2.google.com
 DNSSEC: unsigned
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
->>> Last update of WHOIS database: 2022-11-17T10:39:21+0000 <<<
+>>> Last update of WHOIS database: 2022-11-17T22:52:22+0000 <<<
 
 For more information on WHOIS status codes, please visit:
   https://www.icann.org/resources/pages/epp-status-codes

whois/__init__.py

@@ -80,6 +80,7 @@
     ".com.tr": "com_tr",
     ".edu.tr": "edu_tr",
     ".org.tr": "org_tr",
+    ".net.tr": "net_tr",
     #
     ".edu.ua": "edu_ua",
     ".lviv.ua": "lviv_ua",
@@ -113,6 +114,7 @@
 
 Utf8Map = {
     ".xn--p1ai": "ru_rf",
+    ".xn--p1acf": "pyc_",  # .РУС
 }
 
 

whois/tld_regexpr.py

@@ -290,6 +290,10 @@
     "extend": "com_tr",
 }
 
+net_tr = {
+    "extend": "com_tr",
+}
+
 co_il = {
     "extend": "com",
     "domain_name": r"domain:\s*(.+)",
@@ -1023,6 +1027,7 @@
 
 tokyo = {
     "extend": "com",
+    "_server": "whois.nic.tokyo",
 }
 
 top = {
@@ -1983,28 +1988,36 @@
 gd = {"extend": "com"}
 mn = {"extend": "com"}
 tl = {"extend": "com"}
-gay = { "extend": "com", "_server": "whois.nic.gay" }
+gay = {"extend": "com", "_server": "whois.nic.gay"}
 tt = {"extend": "_privateReg"}
 mo = {
     "extend": "com",
     "creation_date": r"created on\s+(.+)",
     "expiration_date": r"expires on\s+(.+)",
     "name_servers": r"Domain name servers:\s*\-+(?:\s*(\S+)\n)(?:\s*(\S+)\n)?(?:\s*(\S+)\n)?(?:\s*(\S+)\n)?",
 }
-com_mo = {    "extend": "mo"}
+com_mo = {"extend": "mo"}
 st = {
     # .ST domains can now be registered with many different competing registrars. and hence different formats
+    # >>> line appears quite early, valid info after would have been suppressed with the ^>>> cleanup rule: switched off
     "extend": "com",
     "registrant_country": r"registrant-country:\s+(\S+)",
     "registrant": r"registrant-organi(?:s|z)ation:\s*(.+)\r?\n",
 }
-so = { "extend": "com" }
-nrw = { "extend": "com" }
-lat = { "extend": "com" }
-realestate = { "_server": "whois.nic.realestate", "extend": "com" }
+so = {"extend": "com"}
+nrw = {"extend": "com"}
+lat = {"extend": "com"}
+realestate = {"_server": "whois.nic.realestate", "extend": "com"}
 ph = {"extend": "_privateReg"}
 com_ph = {"extend": "ph"}
-org_ph= {"extend": "ph"}
-net_ph= {"extend": "ph"}
-zm = { "extend": "com" }
-
+org_ph = {"extend": "ph"}
+net_ph = {"extend": "ph"}
+zm = {"extend": "com"}
+sy = {"extend": "_privateReg", "_server": "whois.tld.sy"}
+tr = {"extend": "_privateReg"}
+onl = {"extend": "com"}
+blue = {"extend": "com"}
+garden = {"extend": "com", "_server": "whois.nic.garden"}
+promo = {"extend": "com", "_server": "whois.nic.promo"}
+one = {"extend": "com"}
+pyc_ = {"extend": "com"}