Merge pull request #323 from mboot-github/master

maarten-boot · web-flow · commit 81810ca32f69 · 2023-07-12T10:53:45.000+02:00
sync from WhoisDomain and new testdata
diff --git a/testdata/example.com/output b/testdata/example.com/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 1992-01-01 00:00:00
 expiration_date    NoneType          None
 last_updated       NoneType          None
-status             str               ''
-statuses           list              ['']
 dnssec             bool              False
+status             str               ''
+statuses           list              []
 name_servers       list              []
 registrant         str               ''
-emails             list              ['']
+emails             list              []
diff --git a/testdata/example.net/nameservers b/testdata/example.net/nameservers
@@ -1,2 +1,2 @@
-example.net name server b.iana-servers.net.
 example.net name server a.iana-servers.net.
+example.net name server b.iana-servers.net.
diff --git a/testdata/example.net/output b/testdata/example.net/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 1992-01-01 00:00:00
 expiration_date    NoneType          None
 last_updated       NoneType          None
-status             str               ''
-statuses           list              ['']
 dnssec             bool              False
+status             str               ''
+statuses           list              []
 name_servers       list              []
 registrant         str               ''
-emails             list              ['']
+emails             list              []
diff --git a/testdata/example.org/input b/testdata/example.org/input
@@ -4,7 +4,7 @@ Domain Name: example.org
 Registry Domain ID: 13a1800564ae4cf589c9f5723a630958-LROR
 Registrar WHOIS Server: 
 Registrar URL: 
-Updated Date: 2022-10-14T04:00:28Z
+Updated Date: 2023-05-23T17:10:38Z
 Creation Date: 1995-08-31T04:00:00Z
 Registry Expiry Date: 2023-08-30T04:00:00Z
 Registrar: ICANN
@@ -58,7 +58,7 @@ Name Server: a.iana-servers.net
 Name Server: b.iana-servers.net
 DNSSEC: signedDelegation
 URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
->>> Last update of WHOIS database: 2023-04-18T08:02:35Z <<<
+>>> Last update of WHOIS database: 2023-07-12T08:37:43Z <<<
 
 For more information on Whois status codes, please visit https://icann.org/epp
 
diff --git a/testdata/example.org/nameservers b/testdata/example.org/nameservers
@@ -1,2 +1,2 @@
-example.org name server b.iana-servers.net.
 example.org name server a.iana-servers.net.
+example.org name server b.iana-servers.net.
diff --git a/testdata/example.org/output b/testdata/example.org/output
@@ -7,9 +7,9 @@ registrant_country str               'US'
 creation_date      datetime.datetime 1995-08-31 04:00:00
 expiration_date    datetime.datetime 2023-08-30 04:00:00
 last_updated       NoneType          None
+dnssec             bool              True
 status             str               'serverDeleteProhibited https://icann.org/epp#serverDeleteProhibited'
 statuses           list              ['serverDeleteProhibited https://icann.org/epp#serverDeleteProhibited', 'serverRenewProhibited https://icann.org/epp#serverRenewProhibited', 'serverTransferProhibited https://icann.org/epp#serverTransferProhibited', 'serverUpdateProhibited https://icann.org/epp#serverUpdateProhibited']
-dnssec             bool              True
 name_servers       list              ['a.iana-servers.net', 'b.iana-servers.net']
 registrant         str               'ICANN'
-emails             list              ['']
+emails             list              []
diff --git a/testdata/hello.xyz/input b/testdata/hello.xyz/input
@@ -23,7 +23,7 @@ Billing Email: Please query the RDDS service of the Registrar of Record identifi
 Registrar Abuse Contact Email: abuse@namecheap.com
 Registrar Abuse Contact Phone: +1.9854014545
 URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
->>> Last update of WHOIS database: 2023-04-18T08:03:06.0Z <<<
+>>> Last update of WHOIS database: 2023-07-12T08:36:58.0Z <<<
 
 For more information on Whois status codes, please visit https://icann.org/epp
 
diff --git a/testdata/hello.xyz/output b/testdata/hello.xyz/output
@@ -7,9 +7,9 @@ registrant_country str               'IS'
 creation_date      datetime.datetime 2014-03-20 15:01:22
 expiration_date    datetime.datetime 2024-03-20 23:59:59
 last_updated       datetime.datetime 2023-03-14 09:24:32
+dnssec             bool              False
 status             str               'clientTransferProhibited https://icann.org/epp#clientTransferProhibited'
 statuses           list              ['clientTransferProhibited https://icann.org/epp#clientTransferProhibited']
-dnssec             bool              False
 name_servers       list              ['dns1.registrar-servers.com', 'dns2.registrar-servers.com']
 registrant         str               'Privacy service provided by Withheld for Privacy ehf'
 emails             list              ['abuse@namecheap.com']
diff --git a/testdata/make_testdata.sh b/testdata/make_testdata.sh
@@ -37,7 +37,7 @@ makeDataForDomain()
     tee "./$str/input"
 
     # dump the expected output as output
-    ../bin/test2.py -d "$str" |
+    ../test2.py -d "$str" |
     tee "./$str/output"
 
     # dump the nameservers via host
diff --git a/testdata/meta.co.jp/input b/testdata/meta.co.jp/input
@@ -16,8 +16,8 @@ p. [Name Server]                ns.meta.co.jp
 p. [Name Server]                ns2.meta.co.jp
 p. [Name Server]                ns2.sphere.ad.jp
 s. [Signing Key]                
-[State]                         Connected (2023/04/30)
+[State]                         Connected (2024/04/30)
 [Registered Date]               1994/04/01
 [Connected Date]                1994/12/01
-[Last Update]                   2022/05/01 01:02:20 (JST)
+[Last Update]                   2023/05/01 01:02:23 (JST)
 
diff --git a/testdata/meta.co.jp/nameservers b/testdata/meta.co.jp/nameservers
@@ -1,3 +1,3 @@
-meta.co.jp name server ns2.sphere.ad.jp.
 meta.co.jp name server ns.meta.co.jp.
+meta.co.jp name server ns2.sphere.ad.jp.
 meta.co.jp name server ns2.meta.co.jp.
diff --git a/testdata/meta.co.jp/output b/testdata/meta.co.jp/output
@@ -6,10 +6,10 @@ registrar          str               'JPRS'
 registrant_country str               ''
 creation_date      datetime.datetime 1994-04-01 00:00:00
 expiration_date    NoneType          None
-last_updated       datetime.datetime 2022-04-30 18:02:20
-status             str               'Connected (2023/04/30)'
-statuses           list              ['Connected (2023/04/30)']
+last_updated       datetime.datetime 2023-04-30 18:02:23
 dnssec             bool              False
+status             str               'Connected (2024/04/30)'
+statuses           list              ['Connected (2024/04/30)']
 name_servers       list              ['ns.meta.co.jp', 'ns2.meta.co.jp', 'ns2.sphere.ad.jp']
 registrant         str               ''
-emails             list              ['']
+emails             list              []
diff --git a/testdata/meta.co.uk/input b/testdata/meta.co.uk/input
@@ -31,7 +31,7 @@
         c.ns.facebook.com
         d.ns.facebook.com
 
-    WHOIS lookup made at 09:02:36 18-Apr-2023
+    WHOIS lookup made at 09:37:46 12-Jul-2023
 
 -- 
 This WHOIS information is provided for free by Nominet UK the central registry
diff --git a/testdata/meta.co.uk/nameservers b/testdata/meta.co.uk/nameservers
@@ -1,5 +1,4 @@
-;; communications error to 127.0.0.53#53: timed out
-meta.co.uk name server a.ns.facebook.com.
-meta.co.uk name server b.ns.facebook.com.
 meta.co.uk name server c.ns.facebook.com.
 meta.co.uk name server d.ns.facebook.com.
+meta.co.uk name server a.ns.facebook.com.
+meta.co.uk name server b.ns.facebook.com.
diff --git a/testdata/meta.co.uk/output b/testdata/meta.co.uk/output
@@ -7,10 +7,10 @@ registrant_country str               ''
 creation_date      datetime.datetime 2001-11-01 00:00:00
 expiration_date    datetime.datetime 2029-11-01 00:00:00
 last_updated       datetime.datetime 2022-07-28 00:00:00
+dnssec             bool              False
 status             str               'Registered until expiry date.'
 statuses           list              ['Registered until expiry date.']
-dnssec             bool              False
 name_servers       list              ['a.ns.facebook.com', 'b.ns.facebook.com', 'c.ns.facebook.com', 'd.ns.facebook.com']
 owner              str               ''
 registrant         str               'Meta Platforms, Inc.'
-emails             list              ['']
+emails             list              []
diff --git a/testdata/meta.com.tr/input b/testdata/meta.com.tr/input
@@ -33,4 +33,4 @@ Expires on..............: 2026-Dec-27.
 
 
 ** Whois Server:
-Last Update Time: 2023-04-18T10:53:04+03:00
+Last Update Time: 2023-07-12T11:31:58+03:00
diff --git a/testdata/meta.com.tr/output b/testdata/meta.com.tr/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 2006-12-28 00:00:00
 expiration_date    datetime.datetime 2026-12-27 00:00:00
 last_updated       NoneType          None
-status             str               ''
-statuses           list              ['']
 dnssec             bool              False
+status             str               ''
+statuses           list              []
 name_servers       list              ['ns1.efektyazilim.com', 'ns2.efektyazilim.com']
 registrant         str               'Meta İnşaat ve Ticaret Ltd. Şti.'
-emails             list              ['']
+emails             list              []
diff --git a/testdata/meta.com/input b/testdata/meta.com/input
@@ -64,7 +64,7 @@ Name Server: C.NS.FACEBOOK.COM
 Name Server: B.NS.FACEBOOK.COM
 DNSSEC: unsigned
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
->>> Last update of WHOIS database: 2023-04-18T08:02:47Z <<<
+>>> Last update of WHOIS database: 2023-07-12T08:37:45Z <<<
 
 Search results obtained from the RegistrarSafe, LLC WHOIS database are
 provided by RegistrarSafe, LLC for information purposes only, to assist
diff --git a/testdata/meta.com/nameservers b/testdata/meta.com/nameservers
@@ -1,4 +1,4 @@
-meta.com name server b.ns.facebook.com.
-meta.com name server a.ns.facebook.com.
 meta.com name server c.ns.facebook.com.
 meta.com name server d.ns.facebook.com.
+meta.com name server b.ns.facebook.com.
+meta.com name server a.ns.facebook.com.
diff --git a/testdata/meta.com/output b/testdata/meta.com/output
@@ -7,9 +7,9 @@ registrant_country str               'US'
 creation_date      datetime.datetime 1991-01-21 05:00:00
 expiration_date    datetime.datetime 2032-01-22 05:00:00
 last_updated       datetime.datetime 2023-01-25 20:09:06
+dnssec             bool              False
 status             str               'clientDeleteProhibited https://www.icann.org/epp#clientDeleteProhibited'
 statuses           list              ['clientDeleteProhibited https://www.icann.org/epp#clientDeleteProhibited', 'clientTransferProhibited https://www.icann.org/epp#clientTransferProhibited', 'clientUpdateProhibited https://www.icann.org/epp#clientUpdateProhibited', 'serverDeleteProhibited https://www.icann.org/epp#serverDeleteProhibited', 'serverTransferProhibited https://www.icann.org/epp#serverTransferProhibited', 'serverUpdateProhibited https://www.icann.org/epp#serverUpdateProhibited']
-dnssec             bool              False
 name_servers       list              ['a.ns.facebook.com', 'b.ns.facebook.com', 'c.ns.facebook.com', 'd.ns.facebook.com']
 registrant         str               'Meta Platforms, Inc.'
 emails             list              ['abusecomplaints@registrarsafe.com', 'domain@fb.com']
diff --git a/testdata/meta.jp/nameservers b/testdata/meta.jp/nameservers
@@ -1,4 +1 @@
-;; communications error to 127.0.0.53#53: timed out
-;; communications error to 127.0.0.53#53: timed out
-;; no servers could be reached
-
+meta.jp name server ns.meta.jp.
diff --git a/testdata/meta.jp/output b/testdata/meta.jp/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 2009-07-10 00:00:00
 expiration_date    datetime.datetime 2023-07-31 00:00:00
 last_updated       datetime.datetime 2022-07-31 18:05:08
+dnssec             bool              False
 status             str               'Active'
 statuses           list              ['Active']
-dnssec             bool              False
 name_servers       list              ['ns.meta.jp']
 registrant         str               'METATECHNO INC.'
 emails             list              ['itjpnc@meta.co.jp']
diff --git a/testdata/meta.kr/nameservers b/testdata/meta.kr/nameservers
@@ -1,4 +1,4 @@
-meta.kr name server ns3.lovellsnames.org.
 meta.kr name server ns4.lovellsnames.org.
+meta.kr name server ns3.lovellsnames.org.
 meta.kr name server ns1.lovellsnames.org.
 meta.kr name server ns2.lovellsnames.org.
diff --git a/testdata/meta.kr/output b/testdata/meta.kr/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 2007-03-12 00:00:00
 expiration_date    datetime.datetime 2025-03-12 00:00:00
 last_updated       datetime.datetime 2022-04-05 00:00:00
-status             str               ''
-statuses           list              ['']
 dnssec             bool              False
+status             str               ''
+statuses           list              []
 name_servers       list              ['ns1.lovellsnames.org', 'ns2.lovellsnames.org', 'ns3.lovellsnames.org', 'ns4.lovellsnames.org']
 registrant         str               'Gabia C&S'
 emails             list              ['domreg@101domain.com']
diff --git a/testdata/xs4all.nl/output b/testdata/xs4all.nl/output
@@ -7,9 +7,9 @@ registrant_country str               ''
 creation_date      datetime.datetime 1994-08-07 00:00:00
 expiration_date    NoneType          None
 last_updated       datetime.datetime 2022-08-31 00:00:00
+dnssec             bool              True
 status             str               'active'
 statuses           list              ['active']
-dnssec             bool              True
 name_servers       list              ['ns1.kpn.net', 'ns11.kpn.net']
 abuse_contact      str               'abuse@kpn.com'
 reseller           str               ''
diff --git a/whois/tld_regexpr.py b/whois/tld_regexpr.py
@@ -383,7 +383,7 @@
     "creation_date": r"Domain record activated:\s?(.+)",
     "updated_date": r"Domain record last updated:\s?(.+)",
     "expiration_date": r"Domain expires:\s?(.+)",
-    "name_servers": r"Name Servers:\s?\t(.+)\n\t(.+)\n",
+    "name_servers": r"Name Servers:\s?(?:\t(.+)\n)(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?(?:\t(.+)\n)?",
 }
 
 # estonian

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-example.net name server b.iana-servers.net.`
`2`	`1`	`example.net name server a.iana-servers.net.`
	`2`	`+example.net name server b.iana-servers.net.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-example.org name server b.iana-servers.net.`
`2`	`1`	`example.org name server a.iana-servers.net.`
	`2`	`+example.org name server b.iana-servers.net.`