diff --git a/pythonwhois/net.py b/pythonwhois/net.py index 5e23c14..b0dd315 100644 --- a/pythonwhois/net.py +++ b/pythonwhois/net.py @@ -5,7 +5,8 @@ from . import shared def get_whois_raw(domain, server="", previous=[], rfc3490=True): # Sometimes IANA simply won't give us the right root WHOIS server exceptions = { - ".ac.uk": "whois.ja.net" + ".ac.uk": "whois.ja.net", + ".ps": "whois.pnina.ps" } if rfc3490: @@ -41,7 +42,7 @@ def get_whois_raw(domain, server="", previous=[], rfc3490=True): response = record break for line in [x.strip() for x in response.splitlines()]: - match = re.match("(refer|whois server|referral url|whois server|registrar whois):\s*([^\s]+)", line, re.IGNORECASE) + match = re.match("(refer|whois server|referral url|whois server|registrar whois):\s*([^\s]+\.[^\s]+)", line, re.IGNORECASE) if match is not None: referal_server = match.group(2) if referal_server != server: diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 5560285..2f6845b 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -505,7 +505,7 @@ def parse_registrants(data): "Registrant ID:(?P.+)\nRegistrant Name:(?P.*)\n(?:Registrant Organization:(?P.*)\n)?Registrant Address1?:(?P.*)\n(?:Registrant Address2:(?P.*)\n)?(?:Registrant Address3:(?P.*)\n)?Registrant City:(?P.*)\nRegistrant State/Province:(?P.*)\nRegistrant Country/Economy:(?P.*)\nRegistrant Postal Code:(?P.*)\nRegistrant Phone:(?P.*)\n(?:Registrant Phone Ext.:(?P.*)\n)?(?:Registrant FAX:(?P.*)\n)?(?:Registrant FAX Ext.:(?P.*)\n)?Registrant E-mail:(?P.*)", # .ME, DotAsia "Registrant ID:\s*(?P.+)\nRegistrant Name:\s*(?P.+)\nRegistrant Organization:\s*(?P.*)\nRegistrant Address1:\s*(?P.+)\nRegistrant Address2:\s*(?P.*)\nRegistrant City:\s*(?P.+)\nRegistrant State/Province:\s*(?P.+)\nRegistrant Postal Code:\s*(?P.+)\nRegistrant Country:\s*(?P.+)\nRegistrant Country Code:\s*(?P.+)\nRegistrant Phone Number:\s*(?P.+)\nRegistrant Email:\s*(?P.+)\n", # .CO Internet "Registrant Contact: (?P.+)\nRegistrant Organization: (?P.+)\nRegistrant Name: (?P.+)\nRegistrant Street: (?P.+)\nRegistrant City: (?P.+)\nRegistrant Postal Code: (?P.+)\nRegistrant State: (?P.+)\nRegistrant Country: (?P.+)\nRegistrant Phone: (?P.*)\nRegistrant Phone Ext: (?P.*)\nRegistrant Fax: (?P.*)\nRegistrant Fax Ext: (?P.*)\nRegistrant Email: (?P.*)\n", # Key-Systems GmbH - "(?:Registrant ID:[ ]*(?P.*)\n)?Registrant Name:[ ]*(?P.*)\n(?:Registrant Organization:[ ]*(?P.*)\n)?Registrant Street:[ ]*(?P.+)\n(?:Registrant Street:[ ]*(?P.+)\n)?(?:Registrant Street:[ ]*(?P.+)\n)?Registrant City:[ ]*(?P.+)\nRegistrant State(?:\/Province)?:[ ]*(?P.*)\nRegistrant Postal Code:[ ]*(?P.+)\nRegistrant Country:[ ]*(?P.+)\n(?:Registrant Phone:[ ]*(?P.*)\n)?(?:Registrant Phone Ext:[ ]*(?P.*)\n)?(?:Registrant Fax:[ ]*(?P.*)\n)?(?:Registrant Fax Ext:[ ]*(?P.*)\n)?(?:Registrant Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS + "(?:Registrant ID:[ ]*(?P.*)\n)?Registrant Name:[ ]*(?P.*)\n(?:Registrant Organization:[ ]*(?P.*)\n)?Registrant Street:[ ]*(?P.+)\n(?:Registrant Street:[ ]*(?P.+)\n)?(?:Registrant Street:[ ]*(?P.+)\n)?Registrant City:[ ]*(?P.+)\nRegistrant State(?:\/Province)?:[ ]*(?P.*)\nRegistrant Postal Code:[ ]*(?P.+)\nRegistrant Country:[ ]*(?P.+)\n(?:Registrant Phone:[ ]*(?P.*)\n)?(?:Registrant Phone Ext:[ ]*(?P.*)\n)?(?:Registrant Fax:[ ]*(?P.*)\n)?(?:Registrant Fax Ext:[ ]*(?P.*)\n)?(?:Registrant Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS, nic.ps "Registrant\n(?: (?P.+)\n)? (?P.+)\n Email:(?P.+)\n (?P.+)\n(?: (?P.+)\n)? (?P.+) (?P.+)\n (?P.+)\n Tel: (?P.+)\n\n", # internet.bs " Registrant Contact Details:[ ]*\n (?P.*)\n (?P.*)[ ]{2,}\((?P.*)\)\n (?P.*)\n(?: (?P.*)\n)?(?: (?P.*)\n)? (?P.*)\n (?P.*),(?P.*)\n (?P.*)\n Tel. (?P.*)", # Whois.com "owner-id:[ ]*(?P.*)\n(?:owner-organization:[ ]*(?P.*)\n)?owner-name:[ ]*(?P.*)\nowner-street:[ ]*(?P.*)\nowner-city:[ ]*(?P.*)\nowner-zip:[ ]*(?P.*)\nowner-country:[ ]*(?P.*)\n(?:owner-phone:[ ]*(?P.*)\n)?(?:owner-fax:[ ]*(?P.*)\n)?owner-email:[ ]*(?P.*)", # InterNetworX @@ -538,7 +538,7 @@ def parse_registrants(data): "Tech(?:nical)? ID:(?P.+)\nTech(?:nical)? Name:(?P.*)\n(?:Tech(?:nical)? Organization:(?P.*)\n)?Tech(?:nical)? Address1?:(?P.*)\n(?:Tech(?:nical)? Address2:(?P.*)\n)?(?:Tech(?:nical)? Address3:(?P.*)\n)?Tech(?:nical)? City:(?P.*)\nTech(?:nical)? State/Province:(?P.*)\nTech(?:nical)? Country/Economy:(?P.*)\nTech(?:nical)? Postal Code:(?P.*)\nTech(?:nical)? Phone:(?P.*)\n(?:Tech(?:nical)? Phone Ext.:(?P.*)\n)?(?:Tech(?:nical)? FAX:(?P.*)\n)?(?:Tech(?:nical)? FAX Ext.:(?P.*)\n)?Tech(?:nical)? E-mail:(?P.*)", # .ME, DotAsia "Technical Contact ID:\s*(?P.+)\nTechnical Contact Name:\s*(?P.+)\nTechnical Contact Organization:\s*(?P.*)\nTechnical Contact Address1:\s*(?P.+)\nTechnical Contact Address2:\s*(?P.*)\nTechnical Contact City:\s*(?P.+)\nTechnical Contact State/Province:\s*(?P.+)\nTechnical Contact Postal Code:\s*(?P.+)\nTechnical Contact Country:\s*(?P.+)\nTechnical Contact Country Code:\s*(?P.+)\nTechnical Contact Phone Number:\s*(?P.+)\nTechnical Contact Email:\s*(?P.+)\n", # .CO Internet "Tech Contact: (?P.+)\nTech Organization: (?P.+)\nTech Name: (?P.+)\nTech Street: (?P.+)\nTech City: (?P.+)\nTech Postal Code: (?P.+)\nTech State: (?P.+)\nTech Country: (?P.+)\nTech Phone: (?P.*)\nTech Phone Ext: (?P.*)\nTech Fax: (?P.*)\nTech Fax Ext: (?P.*)\nTech Email: (?P.*)\n", # Key-Systems GmbH - "(?:Tech ID:[ ]*(?P.*)\n)?Tech[ ]*Name:[ ]*(?P.*)\n(?:Tech[ ]*Organization:[ ]*(?P.*)\n)?Tech[ ]*Street:[ ]*(?P.+)\n(?:Tech[ ]*Street:[ ]*(?P.+)\n)?(?:Tech[ ]*Street:[ ]*(?P.+)\n)?Tech[ ]*City:[ ]*(?P.+)\nTech[ ]*State(?:\/Province)?:[ ]*(?P.*)\nTech[ ]*Postal[ ]*Code:[ ]*(?P.+)\nTech[ ]*Country:[ ]*(?P.+)\n(?:Tech[ ]*Phone:[ ]*(?P.*)\n)?(?:Tech[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Tech[ ]*Fax:[ ]*(?P.*)\n)?(?:Tech[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Tech[ ]*Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS + "(?:Tech ID:[ ]*(?P.*)\n)?Tech[ ]*Name:[ ]*(?P.*)\n(?:Tech[ ]*Organization:[ ]*(?P.*)\n)?Tech[ ]*Street:[ ]*(?P.+)\n(?:Tech[ ]*Street:[ ]*(?P.+)\n)?(?:Tech[ ]*Street:[ ]*(?P.+)\n)?Tech[ ]*City:[ ]*(?P.+)\nTech[ ]*State(?:\/Province)?:[ ]*(?P.*)\nTech[ ]*Postal[ ]*Code:[ ]*(?P.+)\nTech[ ]*Country:[ ]*(?P.+)\n(?:Tech[ ]*Phone:[ ]*(?P.*)\n)?(?:Tech[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Tech[ ]*Fax:[ ]*(?P.*)\n)?(?:Tech[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Tech[ ]*Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS, nic.ps "Technical Contact\n(?: (?P.+)\n)? (?P.+)\n Email:(?P.+)\n (?P.+)\n(?: (?P.+)\n)? (?P.+) (?P.+)\n (?P.+)\n Tel: (?P.+)\n\n", # internet.bs " Technical Contact Details:[ ]*\n (?P.*)\n (?P.*)[ ]{2,}\((?P.*)\)\n (?P.*)\n(?: (?P.*)\n)?(?: (?P.*)\n)? (?P.*)\n (?P.*),(?P.*)\n (?P.*)\n Tel. (?P.*)", # Whois.com "tech-id:[ ]*(?P.*)\n(?:tech-organization:[ ]*(?P.*)\n)?tech-name:[ ]*(?P.*)\ntech-street:[ ]*(?P.*)\ntech-city:[ ]*(?P.*)\ntech-zip:[ ]*(?P.*)\ntech-country:[ ]*(?P.*)\n(?:tech-phone:[ ]*(?P.*)\n)?(?:tech-fax:[ ]*(?P.*)\n)?tech-email:[ ]*(?P.*)", # InterNetworX @@ -562,7 +562,7 @@ def parse_registrants(data): "Admin(?:istrative)? ID:(?P.+)\nAdmin(?:istrative)? Name:(?P.*)\n(?:Admin(?:istrative)? Organization:(?P.*)\n)?Admin(?:istrative)? Address1?:(?P.*)\n(?:Admin(?:istrative)? Address2:(?P.*)\n)?(?:Admin(?:istrative)? Address3:(?P.*)\n)?Admin(?:istrative)? City:(?P.*)\nAdmin(?:istrative)? State/Province:(?P.*)\nAdmin(?:istrative)? Country/Economy:(?P.*)\nAdmin(?:istrative)? Postal Code:(?P.*)\nAdmin(?:istrative)? Phone:(?P.*)\n(?:Admin(?:istrative)? Phone Ext.:(?P.*)\n)?(?:Admin(?:istrative)? FAX:(?P.*)\n)?(?:Admin(?:istrative)? FAX Ext.:(?P.*)\n)?Admin(?:istrative)? E-mail:(?P.*)", # .ME, DotAsia "Administrative Contact ID:\s*(?P.+)\nAdministrative Contact Name:\s*(?P.+)\nAdministrative Contact Organization:\s*(?P.*)\nAdministrative Contact Address1:\s*(?P.+)\nAdministrative Contact Address2:\s*(?P.*)\nAdministrative Contact City:\s*(?P.+)\nAdministrative Contact State/Province:\s*(?P.+)\nAdministrative Contact Postal Code:\s*(?P.+)\nAdministrative Contact Country:\s*(?P.+)\nAdministrative Contact Country Code:\s*(?P.+)\nAdministrative Contact Phone Number:\s*(?P.+)\nAdministrative Contact Email:\s*(?P.+)\n", # .CO Internet "Admin Contact: (?P.+)\nAdmin Organization: (?P.+)\nAdmin Name: (?P.+)\nAdmin Street: (?P.+)\nAdmin City: (?P.+)\nAdmin State: (?P.+)\nAdmin Postal Code: (?P.+)\nAdmin Country: (?P.+)\nAdmin Phone: (?P.*)\nAdmin Phone Ext: (?P.*)\nAdmin Fax: (?P.*)\nAdmin Fax Ext: (?P.*)\nAdmin Email: (?P.*)\n", # Key-Systems GmbH - "(?:Admin ID:[ ]*(?P.*)\n)?Admin[ ]*Name:[ ]*(?P.*)\n(?:Admin[ ]*Organization:[ ]*(?P.*)\n)?Admin[ ]*Street:[ ]*(?P.+)\n(?:Admin[ ]*Street:[ ]*(?P.+)\n)?(?:Admin[ ]*Street:[ ]*(?P.+)\n)?Admin[ ]*City:[ ]*(?P.+)\nAdmin[ ]*State(?:\/Province)?:[ ]*(?P.*)\nAdmin[ ]*Postal[ ]*Code:[ ]*(?P.+)\nAdmin[ ]*Country:[ ]*(?P.+)\n(?:Admin[ ]*Phone:[ ]*(?P.*)\n)?(?:Admin[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Admin[ ]*Fax:[ ]*(?P.*)\n)?(?:Admin[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Admin[ ]*Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS + "(?:Admin ID:[ ]*(?P.*)\n)?Admin[ ]*Name:[ ]*(?P.*)\n(?:Admin[ ]*Organization:[ ]*(?P.*)\n)?Admin[ ]*Street:[ ]*(?P.+)\n(?:Admin[ ]*Street:[ ]*(?P.+)\n)?(?:Admin[ ]*Street:[ ]*(?P.+)\n)?Admin[ ]*City:[ ]*(?P.+)\nAdmin[ ]*State(?:\/Province)?:[ ]*(?P.*)\nAdmin[ ]*Postal[ ]*Code:[ ]*(?P.+)\nAdmin[ ]*Country:[ ]*(?P.+)\n(?:Admin[ ]*Phone:[ ]*(?P.*)\n)?(?:Admin[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Admin[ ]*Fax:[ ]*(?P.*)\n)?(?:Admin[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Admin[ ]*Email:[ ]*(?P.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom, Ascio, Musedoma (.museum), EuroDNS, nic.ps "Administrative Contact\n(?: (?P.+)\n)? (?P.+)\n Email:(?P.+)\n (?P.+)\n(?: (?P.+)\n)? (?P.+) (?P.+)\n (?P.+)\n Tel: (?P.+)\n\n", # internet.bs " Administrative Contact Details:[ ]*\n (?P.*)\n (?P.*)[ ]{2,}\((?P.*)\)\n (?P.*)\n(?: (?P.*)\n)?(?: (?P.*)\n)? (?P.*)\n (?P.*),(?P.*)\n (?P.*)\n Tel. (?P.*)", # Whois.com "admin-id:[ ]*(?P.*)\n(?:admin-organization:[ ]*(?P.*)\n)?admin-name:[ ]*(?P.*)\nadmin-street:[ ]*(?P.*)\nadmin-city:[ ]*(?P.*)\nadmin-zip:[ ]*(?P.*)\nadmin-country:[ ]*(?P.*)\n(?:admin-phone:[ ]*(?P.*)\n)?(?:admin-fax:[ ]*(?P.*)\n)?admin-email:[ ]*(?P.*)", # InterNetworX @@ -581,7 +581,7 @@ def parse_registrants(data): "Billing ID:(?P.+)\nBilling Name:(?P.*)\n(?:Billing Organization:(?P.*)\n)?Billing Address1?:(?P.*)\n(?:Billing Address2:(?P.*)\n)?(?:Billing Address3:(?P.*)\n)?Billing City:(?P.*)\nBilling State/Province:(?P.*)\nBilling Country/Economy:(?P.*)\nBilling Postal Code:(?P.*)\nBilling Phone:(?P.*)\n(?:Billing Phone Ext.:(?P.*)\n)?(?:Billing FAX:(?P.*)\n)?(?:Billing FAX Ext.:(?P.*)\n)?Billing E-mail:(?P.*)", # DotAsia "Billing Contact ID:\s*(?P.+)\nBilling Contact Name:\s*(?P.+)\nBilling Contact Organization:\s*(?P.*)\nBilling Contact Address1:\s*(?P.+)\nBilling Contact Address2:\s*(?P.*)\nBilling Contact City:\s*(?P.+)\nBilling Contact State/Province:\s*(?P.+)\nBilling Contact Postal Code:\s*(?P.+)\nBilling Contact Country:\s*(?P.+)\nBilling Contact Country Code:\s*(?P.+)\nBilling Contact Phone Number:\s*(?P.+)\nBilling Contact Email:\s*(?P.+)\n", # .CO Internet "Billing Contact: (?P.+)\nBilling Organization: (?P.+)\nBilling Name: (?P.+)\nBilling Street: (?P.+)\nBilling City: (?P.+)\nBilling Postal Code: (?P.+)\nBilling State: (?P.+)\nBilling Country: (?P.+)\nBilling Phone: (?P.*)\nBilling Phone Ext: (?P.*)\nBilling Fax: (?P.*)\nBilling Fax Ext: (?P.*)\nBilling Email: (?P.*)\n", # Key-Systems GmbH - "(?:Billing ID:[ ]*(?P.*)\n)?Billing[ ]*Name:[ ]*(?P.*)\nBilling[ ]*Organization:[ ]*(?P.*)\nBilling[ ]*Street:[ ]*(?P.+)\n(?:Billing[ ]*Street:[ ]*(?P.+)\n)?Billing[ ]*City:[ ]*(?P.+)\nBilling[ ]*State\/Province:[ ]*(?P.+)\nBilling[ ]*Postal[ ]*Code:[ ]*(?P.+)\nBilling[ ]*Country:[ ]*(?P.+)\n(?:Billing[ ]*Phone:[ ]*(?P.*)\n)?(?:Billing[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Billing[ ]*Fax:[ ]*(?P.*)\n)?(?:Billing[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Billing[ ]*Email:[ ]*(?P.+)\n)?", # Musedoma (.museum) + "(?:Billing ID:[ ]*(?P.*)\n)?Billing[ ]*Name:[ ]*(?P.*)\n(?:Billing[ ]*Organization:[ ]*(?P.*)\n)?Billing[ ]*Street:[ ]*(?P.+)\n(?:Billing[ ]*Street:[ ]*(?P.+)\n)?Billing[ ]*City:[ ]*(?P.+)\nBilling[ ]*State\/Province:[ ]*(?P.+)\nBilling[ ]*Postal[ ]*Code:[ ]*(?P.+)\nBilling[ ]*Country:[ ]*(?P.+)\n(?:Billing[ ]*Phone:[ ]*(?P.*)\n)?(?:Billing[ ]*Phone[ ]*Ext:[ ]*(?P.*)\n)?(?:Billing[ ]*Fax:[ ]*(?P.*)\n)?(?:Billing[ ]*Fax[ ]*Ext:\s*?(?P.*)\n)?(?:Billing[ ]*Email:[ ]*(?P.+)\n)?", # Musedoma (.museum) "Billing Contact:\n (?P.+)\n (?P.+)\n(?: (?P.*)\n)?(?: (?P.*)\n)? (?P.+), (?P.+)\n (?P.+)\n (?P.+)\n (?P.+)\n\n", # OVH " Billing Contact Details:[ ]*\n (?P.*)\n (?P.*)[ ]{2,}\((?P.*)\)\n (?P.*)\n(?: (?P.*)\n)?(?: (?P.*)\n)? (?P.*)\n (?P.*),(?P.*)\n (?P.*)\n Tel. (?P.*)", # Whois.com "billing-id:[ ]*(?P.*)\n(?:billing-organization:[ ]*(?P.*)\n)?billing-name:[ ]*(?P.*)\nbilling-street:[ ]*(?P.*)\nbilling-city:[ ]*(?P.*)\nbilling-zip:[ ]*(?P.*)\nbilling-country:[ ]*(?P.*)\n(?:billing-phone:[ ]*(?P.*)\n)?(?:billing-fax:[ ]*(?P.*)\n)?billing-email:[ ]*(?P.*)", # InterNetworX @@ -703,7 +703,7 @@ def parse_registrants(data): obj[key] = obj[key].strip() if "phone_ext" in obj: if "phone" in obj: - obj["phone"] += "ext. %s" % obj["phone_ext"] + obj["phone"] += " ext. %s" % obj["phone_ext"] del obj["phone_ext"] if "street1" in obj: street_items = [] diff --git a/test/data/nic.ps b/test/data/nic.ps new file mode 100644 index 0000000..156ff7b --- /dev/null +++ b/test/data/nic.ps @@ -0,0 +1,92 @@ +Domain Name: nic.ps +Domain ID: 24353-PS +WHOIS Server: Palestine PS/Felasteen ccTLD Registry +Referral URL: +Creation Date: 2004-07-28T22:00:00.000Z +Registry Expiry Date: 2014-07-28T22:00:00.000Z +Sponsoring Registrar: Palestinian National Internet Naming Authority (PNINA) +Sponsoring Registrar IANA ID: +Domain Status: ok + +Registrant ID: 24124-PS +Registrant Name: Palestinian National Internet Naming Authority +Registrant Street: El Wehda St.- El Amal Building - Gaza +Registrant City: GAZA +Registrant State/Province: +Registrant Postal Code: +Registrant Country: PS +Registrant Phone: 970-8-2861617 +Registrant Phone Ext: +Registrant Fax: 970-8-2861618 +Registrant Fax Ext: + +Admin ID: 24164-PS +Admin Name: Marwan Radwan +Admin Street: El Wehda St.- El Amal Building +Admin City: Gaza +Admin State/Province: +Admin Postal Code: +Admin Country: PS +Admin Phone: 972-08-2861617 +Admin Phone Ext: 059-781440 +Admin Fax: 972-08-2861618 +Admin Fax Ext: + +Billing ID: 24164-PS +Billing Name: Marwan Radwan +Billing Street: El Wehda St.- El Amal Building +Billing City: Gaza +Billing State/Province: +Billing Postal Code: +Billing Country: PS +Billing Phone: 972-08-2861617 +Billing Phone Ext: 059-781440 +Billing Fax: 972-08-2861618 +Billing Fax Ext: + +Tech ID: 24164-PS +Tech Name: Marwan Radwan +Tech Street: El Wehda St.- El Amal Building +Tech City: Gaza +Tech State/Province: +Tech Postal Code: +Tech Country: PS +Tech Phone: 972-08-2861617 +Tech Phone Ext: 059-781440 +Tech Fax: 972-08-2861618 +Tech Fax Ext: + +Name Server: ns1.pnina.ps +Name Server: ns2.pnina.ps + +DNSSEC: unsigned + + +Additional Section + + +Sponsoring Registrar URL: www.pnina.ps +Sponsoring Registrar Address: 4th Floor, Al-Amal Building Al-Wehda Street Gaza +Sponsoring Registrar Phone: 970-8-2861617 +Sponsoring Registrar Fax: 970-8-2861618 + + +TERMS OF USE: You are not authorized to access or query our Whois +database through the use of electronic processes that are high-volume and +automated. Whois database is provided by PNINA as a service to the internet +community on behalf of PNINA and Its Certified Registrars (CR). (http://www.pnina.ps/registrars/registrars-list/) + +The data is for information purposes only. PNINA does not +guarantee its accuracy. By submitting a Whois query, you agree to abide +by the following terms of use: You agree that you may use this Data only +for lawful purposes and that under no circumstances will you use this Data +to: (1) allow, enable, or otherwise support the transmission of mass +unsolicited, commercial advertising or solicitations via e-mail, telephone, +or facsimile; or (2) enable high volume, automated, electronic processes +that apply to PNINA and it's Certified Registrar's (or PNINA or CR computer systems). The +compilation, repackaging, dissemination or other use of this Data is +expressly prohibited. + + +>>> Last update of WHOIS database: 2014-05-23T11:08:01.989Z <<< + diff --git a/test/target_default/nic.ps b/test/target_default/nic.ps new file mode 100644 index 0000000..edb69e4 --- /dev/null +++ b/test/target_default/nic.ps @@ -0,0 +1 @@ +{"status": ["ok"], "contacts": {"admin": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}, "tech": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}, "registrant": {"city": "GAZA", "fax": "970-8-2861618", "handle": "24124-PS", "name": "Palestinian National Internet Naming Authority", "phone": "970-8-2861617", "street": "El Wehda St.- El Amal Building - Gaza", "country": "PS"}, "billing": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}}, "nameservers": ["ns1.pnina.ps", "ns2.pnina.ps"], "expiration_date": ["2014-07-28T22:00:00"], "creation_date": ["2004-07-28T22:00:00"], "raw": ["Domain Name: nic.ps\nDomain ID: 24353-PS\nWHOIS Server: Palestine PS/Felasteen ccTLD Registry\nReferral URL: \nCreation Date: 2004-07-28T22:00:00.000Z\nRegistry Expiry Date: 2014-07-28T22:00:00.000Z\nSponsoring Registrar: Palestinian National Internet Naming Authority (PNINA)\nSponsoring Registrar IANA ID: \nDomain Status: ok\n\nRegistrant ID: 24124-PS\nRegistrant Name: Palestinian National Internet Naming Authority\nRegistrant Street: El Wehda St.- El Amal Building - Gaza\nRegistrant City: GAZA\nRegistrant State/Province: \nRegistrant Postal Code: \nRegistrant Country: PS\nRegistrant Phone: 970-8-2861617\nRegistrant Phone Ext: \nRegistrant Fax: 970-8-2861618\nRegistrant Fax Ext: \n\nAdmin ID: 24164-PS\nAdmin Name: Marwan Radwan\nAdmin Street: El Wehda St.- El Amal Building\nAdmin City: Gaza\nAdmin State/Province: \nAdmin Postal Code: \nAdmin Country: PS\nAdmin Phone: 972-08-2861617\nAdmin Phone Ext: 059-781440\nAdmin Fax: 972-08-2861618\nAdmin Fax Ext: \n\nBilling ID: 24164-PS\nBilling Name: Marwan Radwan\nBilling Street: El Wehda St.- El Amal Building\nBilling City: Gaza\nBilling State/Province: \nBilling Postal Code: \nBilling Country: PS\nBilling Phone: 972-08-2861617\nBilling Phone Ext: 059-781440\nBilling Fax: 972-08-2861618\nBilling Fax Ext: \n\nTech ID: 24164-PS\nTech Name: Marwan Radwan\nTech Street: El Wehda St.- El Amal Building\nTech City: Gaza\nTech State/Province: \nTech Postal Code: \nTech Country: PS\nTech Phone: 972-08-2861617\nTech Phone Ext: 059-781440\nTech Fax: 972-08-2861618\nTech Fax Ext: \n\nName Server: ns1.pnina.ps\nName Server: ns2.pnina.ps\n\nDNSSEC: unsigned\n\n\nAdditional Section\n\n\nSponsoring Registrar URL: www.pnina.ps\nSponsoring Registrar Address: 4th Floor, Al-Amal Building Al-Wehda Street Gaza\nSponsoring Registrar Phone: 970-8-2861617\nSponsoring Registrar Fax: 970-8-2861618\n\n\nTERMS OF USE: You are not authorized to access or query our Whois\ndatabase through the use of electronic processes that are high-volume and\nautomated. Whois database is provided by PNINA as a service to the internet\ncommunity on behalf of PNINA and Its Certified Registrars (CR). (http://www.pnina.ps/registrars/registrars-list/)\n\nThe data is for information purposes only. PNINA does not\nguarantee its accuracy. By submitting a Whois query, you agree to abide\nby the following terms of use: You agree that you may use this Data only\nfor lawful purposes and that under no circumstances will you use this Data\nto: (1) allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via e-mail, telephone,\nor facsimile; or (2) enable high volume, automated, electronic processes\nthat apply to PNINA and it's Certified Registrar's (or PNINA or CR computer systems). The\ncompilation, repackaging, dissemination or other use of this Data is\nexpressly prohibited.\n\n\n>>> Last update of WHOIS database: 2014-05-23T11:08:01.989Z <<<\n\n"], "whois_server": ["Palestine PS/Felasteen ccTLD Registry"], "registrar": ["Palestinian National Internet Naming Authority (PNINA)"], "id": ["24353-PS"]} \ No newline at end of file diff --git a/test/target_normalized/nic.ps b/test/target_normalized/nic.ps new file mode 100644 index 0000000..e253cbc --- /dev/null +++ b/test/target_normalized/nic.ps @@ -0,0 +1 @@ +{"status": ["ok"], "contacts": {"admin": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}, "tech": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}, "registrant": {"city": "Gaza", "fax": "970-8-2861618", "handle": "24124-PS", "name": "Palestinian National Internet Naming Authority", "phone": "970-8-2861617", "street": "El Wehda St.- El Amal Building - Gaza", "country": "PS"}, "billing": {"city": "Gaza", "fax": "972-08-2861618", "handle": "24164-PS", "name": "Marwan Radwan", "phone": "972-08-2861617 ext. 059-781440", "street": "El Wehda St.- El Amal Building", "country": "PS"}}, "nameservers": ["ns1.pnina.ps", "ns2.pnina.ps"], "expiration_date": ["2014-07-28T22:00:00"], "creation_date": ["2004-07-28T22:00:00"], "raw": ["Domain Name: nic.ps\nDomain ID: 24353-PS\nWHOIS Server: Palestine PS/Felasteen ccTLD Registry\nReferral URL: \nCreation Date: 2004-07-28T22:00:00.000Z\nRegistry Expiry Date: 2014-07-28T22:00:00.000Z\nSponsoring Registrar: Palestinian National Internet Naming Authority (PNINA)\nSponsoring Registrar IANA ID: \nDomain Status: ok\n\nRegistrant ID: 24124-PS\nRegistrant Name: Palestinian National Internet Naming Authority\nRegistrant Street: El Wehda St.- El Amal Building - Gaza\nRegistrant City: GAZA\nRegistrant State/Province: \nRegistrant Postal Code: \nRegistrant Country: PS\nRegistrant Phone: 970-8-2861617\nRegistrant Phone Ext: \nRegistrant Fax: 970-8-2861618\nRegistrant Fax Ext: \n\nAdmin ID: 24164-PS\nAdmin Name: Marwan Radwan\nAdmin Street: El Wehda St.- El Amal Building\nAdmin City: Gaza\nAdmin State/Province: \nAdmin Postal Code: \nAdmin Country: PS\nAdmin Phone: 972-08-2861617\nAdmin Phone Ext: 059-781440\nAdmin Fax: 972-08-2861618\nAdmin Fax Ext: \n\nBilling ID: 24164-PS\nBilling Name: Marwan Radwan\nBilling Street: El Wehda St.- El Amal Building\nBilling City: Gaza\nBilling State/Province: \nBilling Postal Code: \nBilling Country: PS\nBilling Phone: 972-08-2861617\nBilling Phone Ext: 059-781440\nBilling Fax: 972-08-2861618\nBilling Fax Ext: \n\nTech ID: 24164-PS\nTech Name: Marwan Radwan\nTech Street: El Wehda St.- El Amal Building\nTech City: Gaza\nTech State/Province: \nTech Postal Code: \nTech Country: PS\nTech Phone: 972-08-2861617\nTech Phone Ext: 059-781440\nTech Fax: 972-08-2861618\nTech Fax Ext: \n\nName Server: ns1.pnina.ps\nName Server: ns2.pnina.ps\n\nDNSSEC: unsigned\n\n\nAdditional Section\n\n\nSponsoring Registrar URL: www.pnina.ps\nSponsoring Registrar Address: 4th Floor, Al-Amal Building Al-Wehda Street Gaza\nSponsoring Registrar Phone: 970-8-2861617\nSponsoring Registrar Fax: 970-8-2861618\n\n\nTERMS OF USE: You are not authorized to access or query our Whois\ndatabase through the use of electronic processes that are high-volume and\nautomated. Whois database is provided by PNINA as a service to the internet\ncommunity on behalf of PNINA and Its Certified Registrars (CR). (http://www.pnina.ps/registrars/registrars-list/)\n\nThe data is for information purposes only. PNINA does not\nguarantee its accuracy. By submitting a Whois query, you agree to abide\nby the following terms of use: You agree that you may use this Data only\nfor lawful purposes and that under no circumstances will you use this Data\nto: (1) allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via e-mail, telephone,\nor facsimile; or (2) enable high volume, automated, electronic processes\nthat apply to PNINA and it's Certified Registrar's (or PNINA or CR computer systems). The\ncompilation, repackaging, dissemination or other use of this Data is\nexpressly prohibited.\n\n\n>>> Last update of WHOIS database: 2014-05-23T11:08:01.989Z <<<\n\n"], "whois_server": ["palestine ps/felasteen cctld registry"], "registrar": ["Palestinian National Internet Naming Authority (PNINA)"], "id": ["24353-PS"]} \ No newline at end of file