Merge pull request #38 from joernmerkel/develop

Develop

pythonwhois/parse.py

@@ -235,7 +235,7 @@ registrant_regexes = [
 	"Domain Owner:\n\t(?P<organization>.+)\n\n[\s\S]*?(?:Registrant Contact:\n\t(?P<name>.+))?\n\nRegistrant(?:'s)? (?:a|A)ddress:(?:\n\t(?P<street1>.+)\n(?:\t(?P<street2>.+)\n)?(?:\t(?P<street3>.+)\n)?\t(?P<city>.+)\n\t(?P<postalcode>.+))?\n\t(?P<country>.+)(?:\n\t(?P<phone>.+) \(Phone\)\n\t(?P<fax>.+) \(FAX\)\n\t(?P<email>.+))?\n\n", # .ac.uk - what a mess...
 	"Registrant ID: (?P<handle>.+)\nRegistrant: (?P<name>.+)\nRegistrant Contact Email: (?P<email>.+)", # .cn (CNNIC)
 	"Registrant contact:\n  (?P<name>.+)\n  (?P<street>.*)\n  (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n\n", # Fabulous.com
-	"registrant-name:\s*(?P<name>.+)\nregistrant-type:\s*(?P<type>.+)\nregistrant-address:\s*(?P<street>.+)\nregistrant-postcode:\s*(?P<postalcode>.+)\nregistrant-city:\s*(?P<city>.+)\nregistrant-country:\s*(?P<country>.+)\n(?:registrant-phone:\s*(?P<phone>.+)\n)?(?:registrant-email:\s*(?P<email>.+)\n)?", # Hetzner
+	"registrant-name:\s*(?P<name>.+)\n(registrant-organization:\s*(?P<organization>.*)\n)?registrant-type:\s*(?P<type>.+)\nregistrant-address:\s*(?P<street>.+)\nregistrant-postcode:\s*(?P<postalcode>.+)\nregistrant-city:\s*(?P<city>.+)\nregistrant-country:\s*(?P<country>.+)\n(?:registrant-phone:\s*(?P<phone>.+)\n)?(?:registrant-email:\s*(?P<email>.+)\n)?", # Hetzner
 	"Registrant Contact Information :[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication
 	"Contact Information : For Customer # [0-9]+[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication alternative (private WHOIS) format?
 	"Registrant:\n   Name:           (?P<name>.+)\n   City:           (?P<city>.+)\n   State:          (?P<state>.+)\n   Country:        (?P<country>.+)\n", # Akky (.com.mx)
@@ -271,7 +271,7 @@ tech_contact_regexes = [
 	"Technical Contacts\n  Name:             (?P<name>.+)\n(?:  Organization:     (?P<organization>.+)\n)?  ContactID:        (?P<handle>.+)\n(?:  Address:          (?P<street1>.+)\n(?:                    (?P<street2>.+)\n(?:                    (?P<street3>.+)\n)?)?                    (?P<city>.+)\n                    (?P<postalcode>.+)\n                    (?P<state>.+)\n                    (?P<country>.+)\n)?(?:  Created:          (?P<creationdate>.+)\n)?(?:  Last Update:      (?P<changedate>.+)\n)?", # nic.it  //  NOTE: Why does this say 'Contacts'? Can it have multiple?
 	"Tech Name[.]* (?P<name>.*)\n  Tech Address[.]* (?P<street1>.*)\n  Tech Address[.]* (?P<street2>.*)\n(?:  Tech Address[.]* (?P<street3>.*)\n)?  Tech Address[.]* (?P<city>.*)\n  Tech Address[.]* (?P<postalcode>.*)\n  Tech Address[.]* (?P<state>.*)\n  Tech Address[.]* (?P<country>.*)\n  Tech Email[.]* (?P<email>.*)\n  Tech Phone[.]* (?P<phone>.*)\n  Tech Fax[.]* (?P<fax>.*)", # Melbourne IT
 	"Technical contact:\n(?:  (?P<organization>.+)\n)?  (?P<name>.+)\n  (?P<email>.+)\n  (?P<street>.+)\n  (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n  Phone: (?P<phone>.*)\n  Fax: (?P<fax>.*)\n", # Fabulous.com
-	"tech-c-name:\s*(?P<name>.+)\ntech-c-type:\s*(?P<type>.+)\ntech-c-address:\s*(?P<street>.+)\ntech-c-postcode:\s*(?P<postalcode>.+)\ntech-c-city:\s*(?P<city>.+)\ntech-c-country:\s*(?P<country>.+)\n(?:tech-c-phone:\s*(?P<phone>.+)\n)?(?:tech-c-email:\s*(?P<email>.+)\n)?", # Hetzner
+	"tech-c-name:\s*(?P<name>.+)\n(tech-c-organization:\s*(?P<organization>.*)\n)?tech-c-type:\s*(?P<type>.+)\ntech-c-address:\s*(?P<street>.+)\ntech-c-postcode:\s*(?P<postalcode>.+)\ntech-c-city:\s*(?P<city>.+)\ntech-c-country:\s*(?P<country>.+)\n(?:tech-c-phone:\s*(?P<phone>.+)\n)?(?:tech-c-email:\s*(?P<email>.+)\n)?", # Hetzner
 	"Admin Contact Information :[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication
 	"   Technical contact:\n      (?P<name>.+)\n      (?P<organization>.*)\n      (?P<street>.+)\n      (?P<city>.+) (?P<state>\S+),[ ]+(?P<postalcode>.+)\n      (?P<country>.+)\n      (?P<email>.+)\n      (?P<phone>.*)\n      (?P<fax>.*)", # .am
 	"Technical:\n\s*Name:\s*(?P<name>.*)\n\s*Organisation:\s*(?P<organization>.*)\n\s*Language:.*\n\s*Phone:\s*(?P<phone>.*)\n\s*Fax:\s*(?P<fax>.*)\n\s*Email:\s*(?P<email>.*)\n", # EURid
@@ -304,7 +304,7 @@ admin_contact_regexes = [
 	"Admin Contact\n  Name:             (?P<name>.+)\n(?:  Organization:     (?P<organization>.+)\n)?  ContactID:        (?P<handle>.+)\n(?:  Address:          (?P<street1>.+)\n(?:                    (?P<street2>.+)\n(?:                    (?P<street3>.+)\n)?)?                    (?P<city>.+)\n                    (?P<postalcode>.+)\n                    (?P<state>.+)\n                    (?P<country>.+)\n)?(?:  Created:          (?P<creationdate>.+)\n)?(?:  Last Update:      (?P<changedate>.+)\n)?", # nic.it
 	"Admin Name[.]* (?P<name>.*)\n  Admin Address[.]* (?P<street1>.*)\n  Admin Address[.]* (?P<street2>.*)\n(?:  Admin Address[.]* (?P<street3>.*)\n)?  Admin Address[.]* (?P<city>.*)\n  Admin Address[.]* (?P<postalcode>.*)\n  Admin Address[.]* (?P<state>.*)\n  Admin Address[.]* (?P<country>.*)\n  Admin Email[.]* (?P<email>.*)\n  Admin Phone[.]* (?P<phone>.*)\n  Admin Fax[.]* (?P<fax>.*)", # Melbourne IT
 	"Administrative contact:\n(?:  (?P<organization>.+)\n)?  (?P<name>.+)\n  (?P<email>.+)\n  (?P<street>.+)\n  (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n  Phone: (?P<phone>.*)\n  Fax: (?P<fax>.*)\n", # Fabulous.com
-	"admin-c-name:\s*(?P<name>.+)\nadmin-c-type:\s*(?P<type>.+)\nadmin-c-address:\s*(?P<street>.+)\nadmin-c-postcode:\s*(?P<postalcode>.+)\nadmin-c-city:\s*(?P<city>.+)\nadmin-c-country:\s*(?P<country>.+)\n(?:admin-c-phone:\s*(?P<phone>.+)\n)?(?:admin-c-email:\s*(?P<email>.+)\n)?", # Hetzner
+	"admin-c-name:\s*(?P<name>.+)\n(admin-c-organization:\s*(?P<organization>.*)\n)?admin-c-type:\s*(?P<type>.+)\nadmin-c-address:\s*(?P<street>.+)\nadmin-c-postcode:\s*(?P<postalcode>.+)\nadmin-c-city:\s*(?P<city>.+)\nadmin-c-country:\s*(?P<country>.+)\n(?:admin-c-phone:\s*(?P<phone>.+)\n)?(?:admin-c-email:\s*(?P<email>.+)\n)?", # Hetzner
 	"Tech Contact Information :[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication
 	"   Administrative contact:\n      (?P<name>.+)\n      (?P<organization>.*)\n      (?P<street>.+)\n      (?P<city>.+) (?P<state>\S+),[ ]+(?P<postalcode>.+)\n      (?P<country>.+)\n      (?P<email>.+)\n      (?P<phone>.*)\n      (?P<fax>.*)", # .am
 	"Administrative Contact:\n   Name:           (?P<name>.+)\n   City:           (?P<city>.+)\n   State:          (?P<state>.+)\n   Country:        (?P<country>.+)\n", # Akky (.com.mx)

test/data/luka-netconsult.com

@@ -0,0 +1,73 @@
+
+
+registrar_name:               Hetzner Online AG (IANA ID: 828)
+registrar_url:                www.hetzner.de
+
+domain:                       luka-netconsult.com
+creation_date:                1999-10-30 09:58:41
+expiration_date:              2014-10-30 05:58:41
+last_update:                  2014-07-30 02:39:06
+
+nameserver:                   ns.luka-netconsult.com
+nameserver:                   ns1.first-ns.de
+nameserver:                   robotns2.second-ns.de
+nameserver:                   robotns3.second-ns.com
+nameserver:                   ns.luka.de
+
+registrant-name:              Hartmut Ludwig
+registrant-organization:      Hartmut Ludwig Luka netconsult GbR
+registrant-type:              PERSON
+registrant-address:           Gronauer Str 32
+registrant-postcode:          60385
+registrant-city:              FrankfurtM
+registrant-country:           DE
+
+admin-c-name:                 Christoph Kampe
+admin-c-organization:         LUKA netconsult GmbH
+admin-c-type:                 PERSON
+admin-c-address:              Walter-Kolb-Strasse 5-7
+admin-c-postcode:             60594
+admin-c-city:                 Frankfurt
+admin-c-country:              DE
+admin-c-phone:                +496948000560
+admin-c-fax:                  +496948000570
+admin-c-email:                admin@luka.de
+
+tech-c-name:                  Christoph Kampe
+tech-c-organization:          LUKA netconsult GmbH
+tech-c-type:                  PERSON
+tech-c-address:               Walter-Kolb-Strasse 5-7
+tech-c-postcode:              60594
+tech-c-city:                  Frankfurt
+tech-c-country:               DE
+tech-c-phone:                 +496948000560
+tech-c-fax:                   +496948000570
+tech-c-email:                 admin@luka.de
+
+zone-c-name:                  Christoph Kampe
+zone-c-organization:          LUKA netconsult GmbH
+zone-c-type:                  PERSON
+zone-c-address:               Walter-Kolb-Strasse 5-7
+zone-c-postcode:              60594
+zone-c-city:                  Frankfurt
+zone-c-country:               DE
+zone-c-phone:                 +496948000560
+zone-c-fax:                   +496948000570
+zone-c-email:                 admin@luka.de
+
+
+
+--
+   Domain Name: LUKA-NETCONSULT.COM
+   Registrar: HETZNER ONLINE AG
+   Whois Server: whois.your-server.de
+   Referral URL: http://www.hetzner.de
+   Name Server: NS.LUKA-NETCONSULT.COM
+   Name Server: NS.LUKA.DE
+   Name Server: NS1.FIRST-NS.DE
+   Name Server: ROBOTNS2.SECOND-NS.DE
+   Name Server: ROBOTNS3.SECOND-NS.COM
+   Status: ok
+   Updated Date: 03-apr-2014
+   Creation Date: 30-oct-1999
+   Expiration Date: 30-oct-2014

test/target_default/luka-netconsult.com

@@ -0,0 +1 @@
+{"updated_date": ["2014-07-30T02:39:06"], "status": ["ok"], "contacts": {"admin": {"city": "Frankfurt", "name": "Christoph Kampe", "country": "DE", "phone": "+496948000560", "street": "Walter-Kolb-Strasse 5-7", "postalcode": "60594", "organization": "LUKA netconsult GmbH", "type": "PERSON"}, "tech": {"city": "Frankfurt", "name": "Christoph Kampe", "country": "DE", "phone": "+496948000560", "street": "Walter-Kolb-Strasse 5-7", "postalcode": "60594", "organization": "LUKA netconsult GmbH", "type": "PERSON"}, "registrant": {"city": "FrankfurtM", "name": "Hartmut Ludwig", "country": "DE", "street": "Gronauer Str 32", "postalcode": "60385", "organization": "Hartmut Ludwig Luka netconsult GbR", "type": "PERSON"}, "billing": null}, "nameservers": ["ns.luka-netconsult.com", "ns1.first-ns.de", "robotns2.second-ns.de", "robotns3.second-ns.com", "ns.luka.de"], "expiration_date": ["2014-10-30T05:58:41"], "creation_date": ["1999-10-30T00:00:00"], "raw": ["\n\nregistrar_name:               Hetzner Online AG (IANA ID: 828)\nregistrar_url:                www.hetzner.de\n\ndomain:                       luka-netconsult.com\ncreation_date:                1999-10-30 09:58:41\nexpiration_date:              2014-10-30 05:58:41\nlast_update:                  2014-07-30 02:39:06\n\nnameserver:                   ns.luka-netconsult.com\nnameserver:                   ns1.first-ns.de\nnameserver:                   robotns2.second-ns.de\nnameserver:                   robotns3.second-ns.com\nnameserver:                   ns.luka.de\n\nregistrant-name:              Hartmut Ludwig\nregistrant-organization:      Hartmut Ludwig Luka netconsult GbR\nregistrant-type:              PERSON\nregistrant-address:           Gronauer Str 32\nregistrant-postcode:          60385\nregistrant-city:              FrankfurtM\nregistrant-country:           DE\n\nadmin-c-name:                 Christoph Kampe\nadmin-c-organization:         LUKA netconsult GmbH\nadmin-c-type:                 PERSON\nadmin-c-address:              Walter-Kolb-Strasse 5-7\nadmin-c-postcode:             60594\nadmin-c-city:                 Frankfurt\nadmin-c-country:              DE\nadmin-c-phone:                +496948000560\nadmin-c-fax:                  +496948000570\nadmin-c-email:                admin@luka.de\n\ntech-c-name:                  Christoph Kampe\ntech-c-organization:          LUKA netconsult GmbH\ntech-c-type:                  PERSON\ntech-c-address:               Walter-Kolb-Strasse 5-7\ntech-c-postcode:              60594\ntech-c-city:                  Frankfurt\ntech-c-country:               DE\ntech-c-phone:                 +496948000560\ntech-c-fax:                   +496948000570\ntech-c-email:                 admin@luka.de\n\nzone-c-name:                  Christoph Kampe\nzone-c-organization:          LUKA netconsult GmbH\nzone-c-type:                  PERSON\nzone-c-address:               Walter-Kolb-Strasse 5-7\nzone-c-postcode:              60594\nzone-c-city:                  Frankfurt\nzone-c-country:               DE\nzone-c-phone:                 +496948000560\nzone-c-fax:                   +496948000570\nzone-c-email:                 admin@luka.de\n\n\n", "   Domain Name: LUKA-NETCONSULT.COM\n   Registrar: HETZNER ONLINE AG\n   Whois Server: whois.your-server.de\n   Referral URL: http://www.hetzner.de\n   Name Server: NS.LUKA-NETCONSULT.COM\n   Name Server: NS.LUKA.DE\n   Name Server: NS1.FIRST-NS.DE\n   Name Server: ROBOTNS2.SECOND-NS.DE\n   Name Server: ROBOTNS3.SECOND-NS.COM\n   Status: ok\n   Updated Date: 03-apr-2014\n   Creation Date: 30-oct-1999\n   Expiration Date: 30-oct-2014\n"], "whois_server": ["whois.your-server.de"], "registrar": ["HETZNER ONLINE AG"], "emails": ["admin@luka.de"]}

test/target_normalized/luka-netconsult.com

@@ -0,0 +1 @@
+{"updated_date": ["2014-07-30T02:39:06"], "status": ["ok"], "contacts": {"admin": {"city": "Frankfurt", "name": "Christoph Kampe", "country": "Germany", "phone": "+496948000560", "street": "Walter-Kolb-Strasse 5-7", "postalcode": "60594", "organization": "LUKA netconsult GmbH", "type": "PERSON"}, "tech": {"city": "Frankfurt", "name": "Christoph Kampe", "country": "Germany", "phone": "+496948000560", "street": "Walter-Kolb-Strasse 5-7", "postalcode": "60594", "organization": "LUKA netconsult GmbH", "type": "PERSON"}, "registrant": {"city": "FrankfurtM", "name": "Hartmut Ludwig", "country": "Germany", "street": "Gronauer Str 32", "postalcode": "60385", "organization": "Hartmut Ludwig Luka netconsult GbR", "type": "PERSON"}, "billing": null}, "nameservers": ["ns.luka-netconsult.com", "ns1.first-ns.de", "robotns2.second-ns.de", "robotns3.second-ns.com", "ns.luka.de"], "expiration_date": ["2014-10-30T05:58:41"], "creation_date": ["1999-10-30T00:00:00"], "raw": ["\n\nregistrar_name:               Hetzner Online AG (IANA ID: 828)\nregistrar_url:                www.hetzner.de\n\ndomain:                       luka-netconsult.com\ncreation_date:                1999-10-30 09:58:41\nexpiration_date:              2014-10-30 05:58:41\nlast_update:                  2014-07-30 02:39:06\n\nnameserver:                   ns.luka-netconsult.com\nnameserver:                   ns1.first-ns.de\nnameserver:                   robotns2.second-ns.de\nnameserver:                   robotns3.second-ns.com\nnameserver:                   ns.luka.de\n\nregistrant-name:              Hartmut Ludwig\nregistrant-organization:      Hartmut Ludwig Luka netconsult GbR\nregistrant-type:              PERSON\nregistrant-address:           Gronauer Str 32\nregistrant-postcode:          60385\nregistrant-city:              FrankfurtM\nregistrant-country:           DE\n\nadmin-c-name:                 Christoph Kampe\nadmin-c-organization:         LUKA netconsult GmbH\nadmin-c-type:                 PERSON\nadmin-c-address:              Walter-Kolb-Strasse 5-7\nadmin-c-postcode:             60594\nadmin-c-city:                 Frankfurt\nadmin-c-country:              DE\nadmin-c-phone:                +496948000560\nadmin-c-fax:                  +496948000570\nadmin-c-email:                admin@luka.de\n\ntech-c-name:                  Christoph Kampe\ntech-c-organization:          LUKA netconsult GmbH\ntech-c-type:                  PERSON\ntech-c-address:               Walter-Kolb-Strasse 5-7\ntech-c-postcode:              60594\ntech-c-city:                  Frankfurt\ntech-c-country:               DE\ntech-c-phone:                 +496948000560\ntech-c-fax:                   +496948000570\ntech-c-email:                 admin@luka.de\n\nzone-c-name:                  Christoph Kampe\nzone-c-organization:          LUKA netconsult GmbH\nzone-c-type:                  PERSON\nzone-c-address:               Walter-Kolb-Strasse 5-7\nzone-c-postcode:              60594\nzone-c-city:                  Frankfurt\nzone-c-country:               DE\nzone-c-phone:                 +496948000560\nzone-c-fax:                   +496948000570\nzone-c-email:                 admin@luka.de\n\n\n", "   Domain Name: LUKA-NETCONSULT.COM\n   Registrar: HETZNER ONLINE AG\n   Whois Server: whois.your-server.de\n   Referral URL: http://www.hetzner.de\n   Name Server: NS.LUKA-NETCONSULT.COM\n   Name Server: NS.LUKA.DE\n   Name Server: NS1.FIRST-NS.DE\n   Name Server: ROBOTNS2.SECOND-NS.DE\n   Name Server: ROBOTNS3.SECOND-NS.COM\n   Status: ok\n   Updated Date: 03-apr-2014\n   Creation Date: 30-oct-1999\n   Expiration Date: 30-oct-2014\n"], "whois_server": ["whois.your-server.de"], "registrar": ["Hetzner Online AG"], "emails": ["admin@luka.de"]}