Merge pull request #300 from python151/master

Adds xyz TLD support

Author: richardpenman

test/samples/expected/abc.xyz

@@ -0,0 +1 @@
+{"domain_name": "ABC.XYZ", "registry_domain_id": "D2192285-CNIC", "whois_server": "D2192285-CNIC", "registrar_url": null, "updated_date": "2025-03-10 15:22:23+00:00", "creation_date": "2014-03-20 12:59:17+00:00", "expiration_date": "2026-03-20 23:59:59+00:00", "registrar": "MarkMonitor, Inc (TLDs)", "regisrar_id": "292", "status": ["clientTransferProhibited https://icann.org/epp#clientTransferProhibited", "clientUpdateProhibited https://icann.org/epp#clientUpdateProhibited", "clientDeleteProhibited https://icann.org/epp#clientDeleteProhibited"], "name_servers": ["NS2.GOOGLE.COM", "NS4.GOOGLE.COM", "NS3.GOOGLE.COM", "NS1.GOOGLE.COM"], "dnssec": "unsigned", "registrar_email": "registryescalations@markmonitor.com", "registrar_phone": "+1.2083895740"}

test/samples/whois/abc.xyz

@@ -0,0 +1,45 @@
+[whois.nic.xyz]
+Domain Name: ABC.XYZ
+Registry Domain ID: D2192285-CNIC
+Registrar WHOIS Server: whois.markmonitor.com
+Registrar URL:
+Updated Date: 2025-03-10T15:22:23.0Z
+Creation Date: 2014-03-20T12:59:17.0Z
+Registry Expiry Date: 2026-03-20T23:59:59.0Z
+Registrar: MarkMonitor, Inc (TLDs)
+Registrar IANA ID: 292
+Domain Status: clientTransferProhibited https://icann.org/epp#clientTransferProhibited
+Domain Status: clientUpdateProhibited https://icann.org/epp#clientUpdateProhibited
+Domain Status: clientDeleteProhibited https://icann.org/epp#clientDeleteProhibited
+Name Server: NS2.GOOGLE.COM
+Name Server: NS4.GOOGLE.COM
+Name Server: NS3.GOOGLE.COM
+Name Server: NS1.GOOGLE.COM
+DNSSEC: unsigned
+Registrar Abuse Contact Email: registryescalations@markmonitor.com
+Registrar Abuse Contact Phone: +1.2083895740
+URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
+>>> Last update of WHOIS database: 2025-10-10T02:49:26.0Z <<<
+
+For more information on Whois status codes, please visit https://icann.org/epp
+
+>>> IMPORTANT INFORMATION ABOUT THE DEPLOYMENT OF RDAP: please visit
+https://www.centralnicregistry.com/support/information/rdap <<<
+
+The registration data available in this service is limited. Additional
+data may be available at https://lookup.icann.org
+
+The Whois and RDAP services are provided by CentralNic, and contain
+information pertaining to Internet domain names registered by our
+our customers. By using this service you are agreeing (1) not to use any
+information presented here for any purpose other than determining
+ownership of domain names, (2) not to store or reproduce this data in
+any way, (3) not to use any high-volume, automated, electronic processes
+to obtain data from this service. Abuse of this service is monitored and
+actions in contravention of these terms will result in being permanently
+blacklisted. All data is (c) CentralNic Ltd (https://www.centralnicregistry.com)
+
+Access to the Whois and RDAP services is rate limited. For more
+information, visit https://centralnicregistry.com/policies/whois-guidance.
+
+

whois/parser.py

@@ -3570,3 +3570,32 @@ def __init__(self, domain: str, text: str):
             raise WhoisDomainNotFoundError(text)
         else:
             WhoisEntry.__init__(self, domain, text, self.regex)
+
+
+class WhoisXyz(WhoisEntry):
+    """Whois parser for .xyz domains"""
+
+    regex: dict[str, str] = {
+        "domain_name": r"Domain Name: *(.+)",
+        "registry_domain_id": r"Registry Domain ID: *(.+)",
+        "whois_server": r"Registrar WHOIS Server: *(.+)",
+        "registrar_url": r"Registrar URL: *(.+)",
+        "updated_date": r"Updated Date: *(.+)",
+        "creation_date": r"Creation Date: *(.+)",
+        "expiration_date": r"Registry Expiry Date: *(.+)",
+        "registrar": r"Registrar: *(.+)",
+        "registrar_id": r"Registrar IANA ID: *(.+)",
+        "status": r"Domain Status: *(.+)", # list of statuses
+        "name_servers": r"Name Server: *(.+)",  # list of name servers
+        "dnssec": r"DNSSEC: *(.+)",
+        "registrar_email": r"Registrar Abuse Contact Email: *(.+)",
+        "registrar_phone": r"Registrar Abuse Contact Phone: *(.+)",
+    }
+
+    def __init__(self, domain: str, text: str):
+        if 'The queried object does not exist: DOMAIN NOT FOUND' in text:
+            raise WhoisDomainNotFoundError(text)
+        else:
+            WhoisEntry.__init__(self, domain, text, self.regex)
+
+

whois/whois.py

@@ -113,6 +113,7 @@ class NICClient:
     TN_HOST = "whois.ati.tn"
     SBS_HOST = "whois.nic.sbs"
     GA_HOST = "whois.nic.ga"
+    XYZ_HOST = "whois.nic.xyz"
 
     SITE_HOST = "whois.nic.site"
     DESIGN_HOST = "whois.nic.design"
@@ -409,6 +410,8 @@ def choose_server(self, domain: str) -> Optional[str]:
             return NICClient.SITE_HOST
         elif tld == "ga":
             return NICClient.GA_HOST
+        elif tld == "xyz":
+            return NICClient.XYZ_HOST
         else:
             return self.findwhois_iana(tld)
             # server = tld + NICClient.QNICHOST_TAIL