Skip to content

Commit 8c44cab

Browse files
Merge pull request #304 from brondsem/fix_id_ar
Fixes for .id and .ar
2 parents c20f60b + 810a914 commit 8c44cab

4 files changed

Lines changed: 37 additions & 27 deletions

File tree

test/samples/expected/afip.gob.ar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"domain_name": "afip.gob.ar", "expiration_date": "2019-05-26 00:00:00+00:00", "updated_date": ["2018-05-19 12:18:44.329522+00:00", "2019-03-21 20:38:40.827111+00:00"], "registrar": "nicar", "registrar_url": null, "creation_date": ["2013-10-30 00:00:00+00:00", "2016-06-30 22:15:47.314461+00:00"], "status": null}
1+
{"domain_name": "afip.gob.ar", "expiration_date": "2019-05-26 00:00:00+00:00", "updated_date": ["2018-05-19 12:18:44.329522+00:00", "2019-03-21 20:38:40.827111+00:00"], "registrar": "nicar", "registrar_url": null, "creation_date": "1997-05-26 00:00:00+00:00", "status": null}

test/samples/expected/google.co.id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"domain_name": "GOOGLE.CO.ID", "expiration_date": "2019-09-01 23:59:59+00:00", "updated_date": "2018-12-06 09:07:33+00:00", "registrar": "Digital Registra", "registrar_url": null, "creation_date": "2004-12-18 13:33:21+00:00", "status": ["clientTransferProhibited", "serverTransferProhibited"]}
1+
{"domain_name": "GOOGLE.CO.ID", "expiration_date": "2026-09-01 23:59:59+00:00", "updated_date": "2025-08-05 05:00:20+00:00", "registrar": "PT Digital Registra Indonesia", "registrar_url": "www.digitalregistra.co.id", "creation_date": "2004-12-18 13:33:21+00:00", "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited", "serverDeleteProhibited", "serverRenewProhibited", "serverTransferProhibited", "serverUpdateProhibited"]}

test/samples/whois/google.co.id

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
Domain ID:PANDI-DO246796
2-
Domain Name:GOOGLE.CO.ID
3-
Created On:18-Dec-2004 13:33:21 UTC
4-
Last Updated On:06-Dec-2018 09:07:33 UTC
5-
Expiration Date:01-Sep-2019 23:59:59 UTC
6-
Status:clientTransferProhibited
7-
Status:serverTransferProhibited
8-
=======================================================
9-
Sponsoring Registrar Organization:Digital Registra
10-
Sponsoring Registrar City:Sleman
11-
Sponsoring Registrar Postal Code:55281
12-
Sponsoring Registrar Country:ID
13-
Sponsoring Registrar Phone:0274882257
14-
Sponsoring Registrar Contact Email:info@digitalregistra.co.id
15-
Name Server:NS2.GOOGLE.COM
16-
Name Server:NS4.GOOGLE.COM
17-
Name Server:NS1.GOOGLE.COM
18-
Name Server:NS3.GOOGLE.COM
19-
DNSSEC:Unsigned
1+
# whois.id
2+
3+
Domain Name: GOOGLE.CO.ID
4+
Registry Domain ID: 166626_DOMAIN_ID-ID
5+
Registrar WHOIS Server:
6+
Registrar URL: www.digitalregistra.co.id
7+
Updated Date: 2025-08-05T05:00:20Z
8+
Creation Date: 2004-12-18T13:33:21Z
9+
Registry Expiry Date: 2026-09-01T23:59:59Z
10+
Registrar: PT Digital Registra Indonesia
11+
Registrar IANA ID: 1
12+
Registrar Abuse Contact Email: info@digitalregistra.co.id
13+
Registrar Abuse Contact Phone:
14+
Domain Status: clientDeleteProhibited
15+
Domain Status: clientRenewProhibited
16+
Domain Status: clientTransferProhibited
17+
Domain Status: clientUpdateProhibited
18+
Domain Status: serverDeleteProhibited
19+
Domain Status: serverRenewProhibited
20+
Domain Status: serverTransferProhibited
21+
Domain Status: serverUpdateProhibited
22+
Name Server: NS1.GOOGLE.COM
23+
Name Server: NS2.GOOGLE.COM
24+
Name Server: NS3.GOOGLE.COM
25+
Name Server: NS4.GOOGLE.COM
26+
DNSSEC: unsigned
27+
URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
28+
>>> Last update of WHOIS database: 2025-10-16T19:03:31Z <<<

whois/parser.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,18 +1759,19 @@ class WhoisID(WhoisEntry):
17591759
"""Whois parser for .id domains"""
17601760

17611761
regex: dict[str, str] = {
1762-
"domain_id": r"Domain ID:(.+)",
1762+
"domain_id": r"Registry Domain ID:(.+)",
17631763
"domain_name": r"Domain Name:(.+)",
1764-
"creation_date": r"Created On:(.+)",
1765-
"expiration_date": r"Expiration Date:(.+)",
1766-
"updated_date": r"Last Updated On:(.+)",
1764+
"creation_date": r"Creation Date:(.+)",
1765+
"expiration_date": r"Registry Expiry Date:(.+)",
1766+
"updated_date": r"Updated Date:(.+)",
17671767
"dnssec": r"DNSSEC:(.+)",
1768-
"registrar": r"Sponsoring Registrar Organization:(.+)",
1768+
"registrar": r"Registrar:(.+)",
17691769
"registrar_city": r"Sponsoring Registrar City:(.+)",
17701770
"registrar_postal_code": r"Sponsoring Registrar Postal Code:(.+)",
17711771
"registrar_country": r"Sponsoring Registrar Country:(.+)",
17721772
"registrar_phone": r"Sponsoring Registrar Phone:(.+)",
17731773
"registrar_email": r"Sponsoring Registrar Contact Email:(.+)",
1774+
"registrar_url": r"Registrar URL:(.+)",
17741775
"status": r"Status:(.+)", # list of statuses
17751776
"registrant_id": r"Registrant ID:(.+)",
17761777
"registrant_name": r"Registrant Name:(.+)",
@@ -2854,7 +2855,7 @@ class WhoisAr(WhoisEntry):
28542855
"registrar": r"registrar: *(.+)",
28552856
"whois_server": r"whois: *(.+)",
28562857
"updated_date": r"changed: *(.+)",
2857-
"creation_date": r"created: *(.+)",
2858+
"creation_date": r"registered: *(.+)",
28582859
"expiration_date": r"expire: *(.+)",
28592860
"name_servers": r"nserver: *(.+) \(.*\)", # list of name servers
28602861
"status": r"Domain Status: *(.+)",

0 commit comments

Comments
 (0)