Fix eNom e-mail address parsing

master
Sven Slootweg 11 years ago
parent a6828733f0
commit 056743370a

@ -274,7 +274,7 @@ def parse_registrants(data):
"Registrant ID:(?P<handle>.+)\nRegistrant Name:(?P<name>.*)\nRegistrant Organization:(?P<organization>.*)\nRegistrant Street1:(?P<street1>.*)\nRegistrant Street2:(?P<street2>.*)\nRegistrant Street3:(?P<street3>.*)\nRegistrant City:(?P<city>.*)\nRegistrant State/Province:(?P<state>.*)\nRegistrant Postal Code:(?P<postalcode>.*)\nRegistrant Country:(?P<country>.*)\nRegistrant Phone:(?P<phone>.*)\nRegistrant Phone Ext.:(?P<phone_ext>.*)\nRegistrant FAX:(?P<fax>.*)\nRegistrant FAX Ext.:(?P<fax_ext>.*)\nRegistrant Email:(?P<email>.*)", # Public Interest Registry (.org)
"Registrant ID:\s*(?P<handle>.+)\nRegistrant Name:\s*(?P<name>.+)\nRegistrant Organization:\s*(?P<organization>.*)\nRegistrant Address1:\s*(?P<street1>.+)\nRegistrant Address2:\s*(?P<street2>.*)\nRegistrant City:\s*(?P<city>.+)\nRegistrant State/Province:\s*(?P<state>.+)\nRegistrant Postal Code:\s*(?P<postalcode>.+)\nRegistrant Country:\s*(?P<country>.+)\nRegistrant Country Code:\s*(?P<country_code>.+)\nRegistrant Phone Number:\s*(?P<phone>.+)\nRegistrant Email:\s*(?P<email>.+)\n", # .CO Internet
"Registrant Contact: (?P<handle>.+)\nRegistrant Organization: (?P<organization>.+)\nRegistrant Name: (?P<name>.+)\nRegistrant Street: (?P<street>.+)\nRegistrant City: (?P<city>.+)\nRegistrant Postal Code: (?P<postalcode>.+)\nRegistrant State: (?P<state>.+)\nRegistrant Country: (?P<country>.+)\nRegistrant Phone: (?P<phone>.*)\nRegistrant Phone Ext: (?P<phone_ext>.*)\nRegistrant Fax: (?P<fax>.*)\nRegistrant Fax Ext: (?P<fax_ext>.*)\nRegistrant Email: (?P<email>.*)\n", # Key-Systems GmbH
"Registrant Name: (?P<name>.+)\nRegistrant Organization: (?P<organization>.*)\nRegistrant Street: (?P<street1>.+)\n(?:Registrant Street: (?P<street2>.+)\n)?Registrant City: (?P<city>.+)\nRegistrant State\/Province: (?P<state>.+)\nRegistrant Postal Code: (?P<postalcode>.+)\nRegistrant Country: (?P<country>.+)\n(?:Registrant Phone: (?P<phone>.+)\n)?(?:Registrant Phone Ext: (?P<phone_ext>.*)\n)?(?:Registrant Fax: (?P<fax>.+)\n)?(?:Registrant Fax Ext: (?P<fax_ext>.*)\n)?(?:Registrant Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap
"Registrant Name: (?P<name>.*)\nRegistrant Organization: (?P<organization>.*)\nRegistrant Street: (?P<street1>.+)\n(?:Registrant Street: (?P<street2>.+)\n)?Registrant City: (?P<city>.+)\nRegistrant State\/Province: (?P<state>.+)\nRegistrant Postal Code: (?P<postalcode>.+)\nRegistrant Country: (?P<country>.+)\n(?:Registrant Phone: (?P<phone>.*)\n)?(?:Registrant Phone Ext: (?P<phone_ext>.*)\n)?(?:Registrant Fax: (?P<fax>.*)\n)?(?:Registrant Fax Ext:\s*?(?P<fax_ext>.*)\n)?(?:Registrant Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom
"Registrant\n (?P<name>.+)\n Email:(?P<email>.+)\n (?P<street1>.+)\n(?: (?P<street2>.+)\n)? (?P<postalcode>.+) (?P<city>.+)\n (?P<country>.+)\n Tel: (?P<phone>.+)\n\n", # internet.bs
"Holder of domain name:\n(?P<name>[\S\s]+)\n(?P<street>.+)\n(?P<postalcode>[A-Z0-9-]+)\s+(?P<city>.+)\n(?P<country>.+)\nContractual Language", # nic.ch
"\n\n(?:Owner)?\s+: (?P<name>.*)\n(?:\s+: (?P<organization>.*)\n)?\s+: (?P<street>.*)\n\s+: (?P<city>.*)\n\s+: (?P<state>.*)\n\s+: (?P<country>.*)\n", # nic.io
@ -287,7 +287,7 @@ def parse_registrants(data):
"Tech ID:(?P<handle>.+)\nTech Name:(?P<name>.*)\nTech Organization:(?P<organization>.*)\nTech Street1:(?P<street1>.*)\nTech Street2:(?P<street2>.*)\nTech Street3:(?P<street3>.*)\nTech City:(?P<city>.*)\nTech State/Province:(?P<state>.*)\nTech Postal Code:(?P<postalcode>.*)\nTech Country:(?P<country>.*)\nTech Phone:(?P<phone>.*)\nTech Phone Ext.:(?P<phone_ext>.*)\nTech FAX:(?P<fax>.*)\nTech FAX Ext.:(?P<fax_ext>.*)\nTech Email:(?P<email>.*)", # Public Interest Registry (.org)
"Technical Contact ID:\s*(?P<handle>.+)\nTechnical Contact Name:\s*(?P<name>.+)\nTechnical Contact Organization:\s*(?P<organization>.*)\nTechnical Contact Address1:\s*(?P<street1>.+)\nTechnical Contact Address2:\s*(?P<street2>.*)\nTechnical Contact City:\s*(?P<city>.+)\nTechnical Contact State/Province:\s*(?P<state>.+)\nTechnical Contact Postal Code:\s*(?P<postalcode>.+)\nTechnical Contact Country:\s*(?P<country>.+)\nTechnical Contact Country Code:\s*(?P<country_code>.+)\nTechnical Contact Phone Number:\s*(?P<phone>.+)\nTechnical Contact Email:\s*(?P<email>.+)\n", # .CO Internet
"Tech Contact: (?P<handle>.+)\nTech Organization: (?P<organization>.+)\nTech Name: (?P<name>.+)\nTech Street: (?P<street>.+)\nTech City: (?P<city>.+)\nTech Postal Code: (?P<postalcode>.+)\nTech State: (?P<state>.+)\nTech Country: (?P<country>.+)\nTech Phone: (?P<phone>.*)\nTech Phone Ext: (?P<phone_ext>.*)\nTech Fax: (?P<fax>.*)\nTech Fax Ext: (?P<fax_ext>.*)\nTech Email: (?P<email>.*)\n", # Key-Systems GmbH
"Tech Name: (?P<name>.+)\nTech Organization: (?P<organization>.*)\nTech Street: (?P<street1>.+)\n(?:Tech Street: (?P<street2>.+)\n)?Tech City: (?P<city>.+)\nTech State\/Province: (?P<state>.+)\nTech Postal Code: (?P<postalcode>.+)\nTech Country: (?P<country>.+)\n(?:Tech Phone: (?P<phone>.+)\n)?(?:Tech Phone Ext: (?P<phone_ext>.*)\n)?(?:Tech Fax: (?P<fax>.+)\n)?(?:Tech Fax Ext: (?P<fax_ext>.*)\n)?(?:Tech Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap
"Tech Name: (?P<name>.*)\nTech Organization: (?P<organization>.*)\nTech Street: (?P<street1>.+)\n(?:Tech Street: (?P<street2>.+)\n)?Tech City: (?P<city>.+)\nTech State\/Province: (?P<state>.+)\nTech Postal Code: (?P<postalcode>.+)\nTech Country: (?P<country>.+)\n(?:Tech Phone: (?P<phone>.*)\n)?(?:Tech Phone Ext: (?P<phone_ext>.*)\n)?(?:Tech Fax: (?P<fax>.*)\n)?(?:Tech Fax Ext:\s*?(?P<fax_ext>.*)\n)?(?:Tech Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom
"Technical Contact\n (?P<name>.+)\n Email:(?P<email>.+)\n (?P<street1>.+)\n(?: (?P<street2>.+)\n)? (?P<postalcode>.+) (?P<city>.+)\n (?P<country>.+)\n Tel: (?P<phone>.+)\n\n", # internet.bs
"Technical contact:\n(?P<name>[\S\s]+)\n(?P<street>.+)\n(?P<postalcode>[A-Z0-9-]+)\s+(?P<city>.+)\n(?P<country>.+)\n\n" # nic.ch
]
@ -297,7 +297,7 @@ def parse_registrants(data):
"Admin ID:(?P<handle>.+)\nAdmin Name:(?P<name>.*)\nAdmin Organization:(?P<organization>.*)\nAdmin Street1:(?P<street1>.*)\nAdmin Street2:(?P<street2>.*)\nAdmin Street3:(?P<street3>.*)\nAdmin City:(?P<city>.*)\nAdmin State/Province:(?P<state>.*)\nAdmin Postal Code:(?P<postalcode>.*)\nAdmin Country:(?P<country>.*)\nAdmin Phone:(?P<phone>.*)\nAdmin Phone Ext.:(?P<phone_ext>.*)\nAdmin FAX:(?P<fax>.*)\nAdmin FAX Ext.:(?P<fax_ext>.*)\nAdmin Email:(?P<email>.*)", # Public Interest Registry (.org)
"Administrative Contact ID:\s*(?P<handle>.+)\nAdministrative Contact Name:\s*(?P<name>.+)\nAdministrative Contact Organization:\s*(?P<organization>.*)\nAdministrative Contact Address1:\s*(?P<street1>.+)\nAdministrative Contact Address2:\s*(?P<street2>.*)\nAdministrative Contact City:\s*(?P<city>.+)\nAdministrative Contact State/Province:\s*(?P<state>.+)\nAdministrative Contact Postal Code:\s*(?P<postalcode>.+)\nAdministrative Contact Country:\s*(?P<country>.+)\nAdministrative Contact Country Code:\s*(?P<country_code>.+)\nAdministrative Contact Phone Number:\s*(?P<phone>.+)\nAdministrative Contact Email:\s*(?P<email>.+)\n", # .CO Internet
"Admin Contact: (?P<handle>.+)\nAdmin Organization: (?P<organization>.+)\nAdmin Name: (?P<name>.+)\nAdmin Street: (?P<street>.+)\nAdmin City: (?P<city>.+)\nAdmin State: (?P<state>.+)\nAdmin Postal Code: (?P<postalcode>.+)\nAdmin Country: (?P<country>.+)\nAdmin Phone: (?P<phone>.*)\nAdmin Phone Ext: (?P<phone_ext>.*)\nAdmin Fax: (?P<fax>.*)\nAdmin Fax Ext: (?P<fax_ext>.*)\nAdmin Email: (?P<email>.*)\n", # Key-Systems GmbH
"Admin Name: (?P<name>.+)\nAdmin Organization: (?P<organization>.*)\nAdmin Street: (?P<street1>.+)\n(?:Admin Street: (?P<street2>.+)\n)?Admin City: (?P<city>.+)\nAdmin State\/Province: (?P<state>.+)\nAdmin Postal Code: (?P<postalcode>.+)\nAdmin Country: (?P<country>.+)\n(?:Admin Phone: (?P<phone>.+)\n)?(?:Admin Phone Ext: (?P<phone_ext>.*)\n)?(?:Admin Fax: (?P<fax>.+)\n)?(?:Admin Fax Ext: (?P<fax_ext>.*)\n)?(?:Admin Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap
"Admin Name: (?P<name>.*)\nAdmin Organization: (?P<organization>.*)\nAdmin Street: (?P<street1>.+)\n(?:Admin Street: (?P<street2>.+)\n)?Admin City: (?P<city>.+)\nAdmin State\/Province: (?P<state>.+)\nAdmin Postal Code: (?P<postalcode>.+)\nAdmin Country: (?P<country>.+)\n(?:Admin Phone: (?P<phone>.*)\n)?(?:Admin Phone Ext: (?P<phone_ext>.*)\n)?(?:Admin Fax: (?P<fax>.*)\n)?(?:Admin Fax Ext:\s*?(?P<fax_ext>.*)\n)?(?:Admin Email: (?P<email>.+)\n)?", # WildWestDomains, GoDaddy, Namecheap/eNom
"Administrative Contact\n (?P<name>.+)\n Email:(?P<email>.+)\n (?P<street1>.+)\n(?: (?P<street2>.+)\n)? (?P<postalcode>.+) (?P<city>.+)\n (?P<country>.+)\n Tel: (?P<phone>.+)\n\n", # internet.bs
]

@ -0,0 +1,120 @@
Domain Name: DAEMONRAGE.NET
Creation Date: 2009-10-02 21:37:00Z
Registrar Registration Expiration Date: 2014-10-02 21:37:48Z
Registrar: ENOM, INC.
Reseller: NAMECHEAP.COM
Registrant Name:
Registrant Organization: WORLDFORMEE
Registrant Street: 257 MONKS ROAD
Registrant City: LINCOLN
Registrant State/Province: LINCOLNSHIRE
Registrant Postal Code: LN25JX
Registrant Country: GB
Admin Name: PAUL WEBSTER
Admin Organization:
Admin Street: WORLDFORMEE
Admin Street: 257 MONKS ROAD
Admin City: LINCOLN
Admin State/Province: LINCOLNSHIRE
Admin Postal Code: LN25JX
Admin Country: GB
Admin Phone: 01522718954
Admin Phone Ext:
Admin Fax:
Admin Fax Ext:
Admin Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM
Tech Name: PAUL WEBSTER
Tech Organization:
Tech Street: WORLDFORMEE
Tech Street: 257 MONKS ROAD
Tech City: LINCOLN
Tech State/Province: LINCOLNSHIRE
Tech Postal Code: LN25JX
Tech Country: GB
Tech Phone: 01522718954
Tech Phone Ext:
Tech Fax:
Tech Fax Ext:
Tech Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM
Name Server: NS1.HE.NET
Name Server: NS2.HE.NET
Name Server: NS3.HE.NET
Name Server: NS4.HE.NET
Name Server: NS5.HE.NET
The data in this whois database is provided to you for information
purposes only, that is, to assist you in obtaining information about or
related to a domain name registration record. We make this information
available "as is," and do not guarantee its accuracy. By submitting a
whois query, you agree that you will use this data only for lawful
purposes and that, under no circumstances will you use this data to: (1)
enable high volume, automated, electronic processes that stress or load
this whois database system providing you this information; or (2) allow,
enable, or otherwise support the transmission of mass unsolicited,
commercial advertising or solicitations via direct mail, electronic
mail, or by telephone. The compilation, repackaging, dissemination or
other use of this data is expressly prohibited without prior written
consent from us.
We reserve the right to modify these terms at any time. By submitting
this query, you agree to abide by these terms.
Version 6.3 4/3/2002
--
Whois Server Version 2.0
Domain names in the .com and .net domains can now be registered
with many different competing registrars. Go to http://www.internic.net
for detailed information.
Domain Name: DAEMONRAGE.NET
Registrar: ENOM, INC.
Whois Server: whois.enom.com
Referral URL: http://www.enom.com
Name Server: NS1.HE.NET
Name Server: NS2.HE.NET
Name Server: NS3.HE.NET
Name Server: NS4.HE.NET
Name Server: NS5.HE.NET
Status: clientTransferProhibited
Updated Date: 18-oct-2013
Creation Date: 02-oct-2009
Expiration Date: 02-oct-2014
>>> Last update of whois database: Thu, 21 Nov 2013 04:08:18 UTC <<<
NOTICE: The expiration date displayed in this record is the date the
registrar's sponsorship of the domain name registration in the registry is
currently set to expire. This date does not necessarily reflect the expiration
date of the domain name registrant's agreement with the sponsoring
registrar. Users may consult the sponsoring registrar's Whois database to
view the registrar's reported date of expiration for this registration.
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 except as reasonably necessary to register domain names or
modify existing registrations; the Data in VeriSign Global Registry
Services' ("VeriSign") Whois database is provided by VeriSign for
information purposes only, and to assist persons in obtaining information
about or related to a domain name registration record. VeriSign 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 VeriSign (or its computer systems). The compilation,
repackaging, dissemination or other use of this Data is expressly
prohibited without the prior written consent of VeriSign. You agree not to
use electronic processes that are automated and high-volume to access or
query the Whois database except as reasonably necessary to register
domain names or modify existing registrations. VeriSign reserves the right
to restrict your access to the Whois database in its sole discretion to ensure
operational stability. VeriSign may restrict or terminate your access to the
Whois database for failure to abide by these terms of use. VeriSign
reserves the right to modify these terms at any time.
The Registry database contains ONLY .COM, .NET, .EDU domains and
Registrars.
Loading…
Cancel
Save