diff --git a/testdata/domena.pl/input b/testdata/domena.pl/input new file mode 100644 index 0000000..1106154 --- /dev/null +++ b/testdata/domena.pl/input @@ -0,0 +1,27 @@ +DOMAIN NAME: domena.pl +registrant type: organization +nameservers: ns1.domena.pl. [193.239.44.33] + ns2.domena.pl. [91.234.176.240] + ns3.domena.pl. [195.110.49.49] +created: 1999.05.20 01:00:00 +last modified: 2022.03.02 11:00:20 +renewal date: 2032.05.19 00:00:00 + +option created: 2020.05.02 12:01:14 +option expiration date: 2026.05.02 12:01:14 + +dnssec: Unsigned + +REGISTRAR: +Domena.pl sp. z o.o. +ul. Gdanska 119 +85-022 Bydgoszcz +Polska/Poland +Tel: +48.523667777 +Tel: +48.523667788 +https://www.domena.pl/ +bok@domena.pl + +WHOIS database responses: https://dns.pl/en/whois + +WHOIS displays data with a delay not exceeding 15 minutes in relation to the .pl Registry system diff --git a/testdata/google.be/input b/testdata/google.be/input new file mode 100644 index 0000000..d7fb371 --- /dev/null +++ b/testdata/google.be/input @@ -0,0 +1,61 @@ +% .be Whois Server 6.1 +% +% The WHOIS service offered by DNS Belgium and the access to the records in the DNS Belgium +% WHOIS database are provided for information purposes only. It allows +% persons to check whether a specific domain name is still available or not +% and to obtain information related to the registration records of +% existing domain names. +% +% DNS Belgium cannot, under any circumstances, be held liable where the stored +% information would prove to be incomplete or inaccurate in any sense. +% +% By submitting a query you agree not to use the information made available +% to: +% - allow, enable or otherwise support the transmission of unsolicited, +% commercial advertising or other solicitations whether via email or otherwise; +% - target advertising in any possible way; +% - to cause nuisance in any possible way to the domain name holders by sending +% messages to them (whether by automated, electronic processes capable of +% enabling high volumes or other possible means). +% +% Without prejudice to the above, it is explicitly forbidden to extract, copy +% and/or use or re-utilise in any form and by any means (electronically or +% not) the whole or a quantitatively or qualitatively substantial part +% of the contents of the WHOIS database without prior and explicit permission +% by DNS Belgium, nor in any attempt thereof, to apply automated, electronic +% processes to DNS Belgium (or its systems). +% +% You agree that any reproduction and/or transmission of data for commercial +% purposes will always be considered as the extraction of a substantial +% part of the content of the WHOIS database. +% +% By submitting the query you agree to abide by this policy and accept that +% DNS Belgium can take measures to limit the use of its whois services in order to +% protect the privacy of its registrants or the integrity of the database. +% + +Domain: google.be +Status: NOT AVAILABLE +Registered: Tue Dec 12 2000 + +Registrant: + Not shown, please visit www.dnsbelgium.be for webbased whois. + +Registrar Technical Contacts: + +Registrar: + Name: Markmonitor Inc. + Website: https://www.markmonitor.com + +Nameservers: + ns3.google.com + ns1.google.com + ns2.google.com + ns4.google.com + +Keys: + +Flags: + clientTransferProhibited + +Please visit www.dnsbelgium.be for more info. diff --git a/testdata/wp.pl/input b/testdata/wp.pl/input new file mode 100644 index 0000000..e775b2c --- /dev/null +++ b/testdata/wp.pl/input @@ -0,0 +1,25 @@ +DOMAIN NAME: wp.pl +registrant type: organization +nameservers: ns1.wp.pl. [212.77.106.200] + ns2.wp.pl. [153.19.88.162] +created: 1998.04.28 13:00:00 +last modified: 2026.02.18 14:22:40 +renewal date: 2027.04.27 14:00:00 + +option created: 2026.02.10 10:51:12 +option expiration date: 2029.02.10 10:51:12 + +dnssec: Unsigned + +REGISTRAR: +AZ.pl Sp. z o.o. +ul. Zbozowa 4 +70-653 Szczecin +Polska/Poland +Tel: +48.914243780 +https://az.pl/ +domena@az.pl + +WHOIS database responses: https://dns.pl/en/whois + +WHOIS displays data with a delay not exceeding 15 minutes in relation to the .pl Registry system diff --git a/whoisdomain/tldDb/tld_regexpr.py b/whoisdomain/tldDb/tld_regexpr.py index e10d386..5f9ff4b 100644 --- a/whoisdomain/tldDb/tld_regexpr.py +++ b/whoisdomain/tldDb/tld_regexpr.py @@ -277,12 +277,16 @@ def xStr(what: str, times: int = 1, firstMandatory: bool = True) -> str: } ZZ["be"] = { - "extend": "pl", + "extend": "com", + "_server": "whois.dns.be", "domain_name": R(r"\nDomain:\s*(.+)"), - "registrar": R(r"Company Name:\n?(.+)"), + "registrar": R(r"Registrar:\s*\n\s+Name:\s*(.+)"), "creation_date": R(r"Registered:\s*(.+)\n"), - "status": R(r"Status:\s?(.+)"), - "name_servers": R(r"Nameservers:(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?\n\n"), + "expiration_date": None, + "updated_date": None, + "status": R(r"Status:\s*(.+)"), + "name_servers": R(r"Nameservers:(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?(?:\n[ \t]+(\S+))?\n"), + "_test": "google.be", } ZZ["biz"] = { @@ -792,13 +796,15 @@ def xStr(what: str, times: int = 1, firstMandatory: bool = True) -> str: } ZZ["pl"] = { - "extend": "uk", + "extend": "com", + "_server": "whois.dns.pl", + "domain_name": R(r"DOMAIN NAME:\s*(.+)"), "registrar": R(r"\nREGISTRAR:\s*(.+)\n"), "creation_date": R(r"\ncreated:\s*(.+)\n"), "updated_date": R(r"\nlast modified:\s*(.+)\n"), # "expiration_date": R(r"\noption expiration date:\s*(.+)\n"), # If no "option expiration date:" is present, use "renewal date:", but only - # if it's not not followed by "option expiration date:". google.pl is the test case here + # if it's not followed by "option expiration date:". google.pl is the test case here "expiration_date": R(r"(?:\noption expiration date:|renewal date:(?!(?:.|\n)*\noption expiration date:))\s*(.+)\n"), "name_servers": R(r"nameservers:%s" % xStr(r"(?:\s+(\S+)[^\n]*\n)?", 4)), "status": R(r"\nStatus:\n\s*(.+)"),