From 2f5e700224adf67e8414d7d49954979c07df2eb3 Mon Sep 17 00:00:00 2001 From: Christian Koepp Date: Fri, 28 Feb 2014 19:29:08 +0100 Subject: [PATCH] full regexpr support for .de domains and updated test-cases for prq.se + nic.ru --- pythonwhois/parse.py | 7 ++++--- test/target_default/bäckerei.de | 2 +- test/target_default/nic.ru | 2 +- test/target_default/prq.se | 2 +- test/target_default/test.de | 2 +- test/target_normalized/bäckerei.de | 2 +- test/target_normalized/nic.ru | 2 +- test/target_normalized/prq.se | 2 +- test/target_normalized/test.de | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 6d6fc36..9a0c51f 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -64,12 +64,11 @@ grammar = { 'Domain Last Updated Date\s?[.]*:\s?(?P.+)', 'Record last updated\s?[.]*:\s?(?P.+)', 'Modified\s?[.]*:\s?(?P.+)', - 'changed:\s*(?P.+)', + '(C|c)hanged:\s*(?P.+)', 'Last Update\s?[.]*:\s?(?P.+)', 'Last updated on (?P.+) [a-z]{3,4}', 'Last updated:\s*(?P.+)', - 'Last update of whois database:\s?[a-z]{3}, (?P.+) [a-z]{3,4}', - 'Changed:\s*(?P.+)'], + 'Last update of whois database:\s?[a-z]{3}, (?P.+) [a-z]{3,4}'], 'registrar': ['registrar:\s*(?P.+)', 'Registrar:\s*(?P.+)', 'Sponsoring Registrar Organization:\s*(?P.+)', @@ -493,6 +492,7 @@ def parse_registrants(data): "Technical contact:\n(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+), (?P.+) (?P.+) (?P.+)\n Phone: (?P.*)\n Fax: (?P.*)\n", # Fabulous.com "Admin Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication " Technical contact:\n (?P.+)\n (?P.*)\n (?P.+)\n (?P.+) (?P\S+),[ ]+(?P.+)\n (?P.+)\n (?P.+)\n (?P.*)\n (?P.*)", # .am + "\[Zone-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\+.]+)\nFax: (?P[0-9\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC ] admin_contact_regexes = [ @@ -512,6 +512,7 @@ def parse_registrants(data): "Administrative contact:\n(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+), (?P.+) (?P.+) (?P.+)\n Phone: (?P.*)\n Fax: (?P.*)\n", # Fabulous.com "Tech Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication " Administrative contact:\n (?P.+)\n (?P.*)\n (?P.+)\n (?P.+) (?P\S+),[ ]+(?P.+)\n (?P.+)\n (?P.+)\n (?P.*)\n (?P.*)", # .am + "\[Tech-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\+.]+)\nFax: (?P[0-9\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC ] billing_contact_regexes = [ diff --git a/test/target_default/bäckerei.de b/test/target_default/bäckerei.de index 706962a..dda5536 100644 --- a/test/target_default/bäckerei.de +++ b/test/target_default/bäckerei.de @@ -1 +1 @@ -{"status": ["connect"], "updated_date": ["2013-04-03T00:14:26", "2008-05-27T16:56:58"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns1.parkingcrew.net", "ns2.parkingcrew.net"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: b\u00e4ckerei.de\nDomain-Ace: xn--bckerei-5wa.de\nNserver: ns1.parkingcrew.net\nNserver: ns2.parkingcrew.net\nStatus: connect\nChanged: 2013-04-03T00:14:26+02:00\n\n[Tech-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n[Zone-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n"], "emails": ["jens@mechelke.de"]} \ No newline at end of file +{"status": ["connect"], "updated_date": ["2013-04-03T00:14:26", "2008-05-27T16:56:58"], "contacts": {"admin": {"city": "Lilienthal", "fax": "+49.4298939488", "name": "Mechelke Jens", "country": "DE", "changed": "2008-05-27T16:56:58+02:00", "phone": "+49.4298939487", "street": "Heidberger Strasse 1a", "postalcode": "28865", "type": "PERSON", "email": "jens@mechelke.de"}, "tech": {"city": "Lilienthal", "fax": "+49.4298939488", "name": "Mechelke Jens", "country": "DE", "changed": "2008-05-27T16:56:58+02:00", "phone": "+49.4298939487", "street": "Heidberger Strasse 1a", "postalcode": "28865", "type": "PERSON", "email": "jens@mechelke.de"}, "registrant": null, "billing": null}, "nameservers": ["ns1.parkingcrew.net", "ns2.parkingcrew.net"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: b\u00e4ckerei.de\nDomain-Ace: xn--bckerei-5wa.de\nNserver: ns1.parkingcrew.net\nNserver: ns2.parkingcrew.net\nStatus: connect\nChanged: 2013-04-03T00:14:26+02:00\n\n[Tech-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n[Zone-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n"]} \ No newline at end of file diff --git a/test/target_default/nic.ru b/test/target_default/nic.ru index 139f96d..939733e 100644 --- a/test/target_default/nic.ru +++ b/test/target_default/nic.ru @@ -1 +1 @@ -{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "JSC 'RU-CENTER'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["RU-CENTER-REG-RIPN"]} \ No newline at end of file +{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "JSC 'RU-CENTER'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2", "ns5.nic.ru", "ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100", "ns6.nic.ru", "ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100", "ns7.nic.ru", "ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100", "ns8-cloud.nic.ru", "ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["RU-CENTER-REG-RIPN"]} \ No newline at end of file diff --git a/test/target_default/prq.se b/test/target_default/prq.se index fe7caf7..6f2c835 100644 --- a/test/target_default/prq.se +++ b/test/target_default/prq.se @@ -1 +1 @@ -{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns2.prq.se"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]} \ No newline at end of file +{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns.prq.se 193.104.214.194", "ns2.prq.se", "ns2.prq.se 88.80.30.194"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]} \ No newline at end of file diff --git a/test/target_default/test.de b/test/target_default/test.de index 8623077..1c5a30b 100644 --- a/test/target_default/test.de +++ b/test/target_default/test.de @@ -1 +1 @@ -{"status": ["connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"], "emails": ["webmaster@stiftung-warentest.de", "support@iwelt.de"]} \ No newline at end of file +{"status": ["connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": {"city": "Berlin", "fax": "+49.3026312342", "name": "Christian Zantop", "country": "DE", "changed": "2013-03-19T14:16:18+01:00", "phone": "+49.3026312604", "street": "Luetzowplatz 11-13", "postalcode": "10785", "organization": "Stiftung Warentest", "type": "PERSON", "email": "webmaster@stiftung-warentest.de"}, "tech": {"city": "Eibelstadt", "fax": "+49.9303982879", "name": "Domainservice", "country": "DE", "changed": "2013-08-05T11:43:45+02:00", "phone": "+49.9303982860", "street": "Mainparkring 4", "postalcode": "97246", "organization": "iWelt AG", "type": "ROLE", "email": "support@iwelt.de"}, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"]} \ No newline at end of file diff --git a/test/target_normalized/bäckerei.de b/test/target_normalized/bäckerei.de index d38e491..63f4cff 100644 --- a/test/target_normalized/bäckerei.de +++ b/test/target_normalized/bäckerei.de @@ -1 +1 @@ -{"status": ["Connect"], "updated_date": ["2013-04-03T00:14:26", "2008-05-27T16:56:58"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns1.parkingcrew.net", "ns2.parkingcrew.net"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: b\u00e4ckerei.de\nDomain-Ace: xn--bckerei-5wa.de\nNserver: ns1.parkingcrew.net\nNserver: ns2.parkingcrew.net\nStatus: connect\nChanged: 2013-04-03T00:14:26+02:00\n\n[Tech-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n[Zone-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n"], "emails": ["jens@mechelke.de"]} \ No newline at end of file +{"status": ["Connect"], "updated_date": ["2013-04-03T00:14:26", "2008-05-27T16:56:58"], "contacts": {"admin": {"city": "Lilienthal", "fax": "+49.4298939488", "name": "Mechelke Jens", "country": "DE", "changed": "2008-05-27T16:56:58+02:00", "phone": "+49.4298939487", "street": "Heidberger Strasse 1a", "postalcode": "28865", "type": "PERSON", "email": "jens@mechelke.de"}, "tech": {"city": "Lilienthal", "fax": "+49.4298939488", "name": "Mechelke Jens", "country": "DE", "changed": "2008-05-27T16:56:58+02:00", "phone": "+49.4298939487", "street": "Heidberger Strasse 1a", "postalcode": "28865", "type": "PERSON", "email": "jens@mechelke.de"}, "registrant": null, "billing": null}, "nameservers": ["ns1.parkingcrew.net", "ns2.parkingcrew.net"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: b\u00e4ckerei.de\nDomain-Ace: xn--bckerei-5wa.de\nNserver: ns1.parkingcrew.net\nNserver: ns2.parkingcrew.net\nStatus: connect\nChanged: 2013-04-03T00:14:26+02:00\n\n[Tech-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n[Zone-C]\nType: PERSON\nName: Mechelke Jens\nAddress: Heidberger Strasse 1a\nPostalCode: 28865\nCity: Lilienthal\nCountryCode: DE\nPhone: +49.4298939487\nFax: +49.4298939488\nEmail: jens@mechelke.de\nChanged: 2008-05-27T16:56:58+02:00\n\n"]} \ No newline at end of file diff --git a/test/target_normalized/nic.ru b/test/target_normalized/nic.ru index ac14124..512bbfe 100644 --- a/test/target_normalized/nic.ru +++ b/test/target_normalized/nic.ru @@ -1 +1 @@ -{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Jsc 'ru-center'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["Ru-center-reg-ripn"]} \ No newline at end of file +{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Jsc 'ru-center'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2", "ns5.nic.ru", "ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100", "ns6.nic.ru", "ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100", "ns7.nic.ru", "ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100", "ns8-cloud.nic.ru", "ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["Ru-center-reg-ripn"]} \ No newline at end of file diff --git a/test/target_normalized/prq.se b/test/target_normalized/prq.se index 8ee2bfc..45c697a 100644 --- a/test/target_normalized/prq.se +++ b/test/target_normalized/prq.se @@ -1 +1 @@ -{"status": ["Active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns2.prq.se"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]} \ No newline at end of file +{"status": ["Active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns.prq.se 193.104.214.194", "ns2.prq.se", "ns2.prq.se 88.80.30.194"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]} \ No newline at end of file diff --git a/test/target_normalized/test.de b/test/target_normalized/test.de index c403680..3d76fe0 100644 --- a/test/target_normalized/test.de +++ b/test/target_normalized/test.de @@ -1 +1 @@ -{"status": ["Connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"], "emails": ["webmaster@stiftung-warentest.de", "support@iwelt.de"]} \ No newline at end of file +{"status": ["Connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": {"city": "Berlin", "fax": "+49.3026312342", "name": "Christian Zantop", "country": "DE", "changed": "2013-03-19T14:16:18+01:00", "phone": "+49.3026312604", "street": "Luetzowplatz 11-13", "postalcode": "10785", "organization": "Stiftung Warentest", "type": "PERSON", "email": "webmaster@stiftung-warentest.de"}, "tech": {"city": "Eibelstadt", "fax": "+49.9303982879", "name": "Domainservice", "country": "DE", "changed": "2013-08-05T11:43:45+02:00", "phone": "+49.9303982860", "street": "Mainparkring 4", "postalcode": "97246", "organization": "iWelt AG", "type": "ROLE", "email": "support@iwelt.de"}, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"]} \ No newline at end of file