Support for LCN.com

pythonwhois/parse.py

@@ -557,6 +557,7 @@ def parse_registrants(data):
 
 	nic_contact_regexes = [
 		"personname:\s*(?P<name>.+)\norganization:\s*(?P<organization>.+)\nstreet address:\s*(?P<street>.+)\npostal code:\s*(?P<postalcode>.+)\ncity:\s*(?P<city>.+)\ncountry:\s*(?P<country>.+)\n(?:phone:\s*(?P<phone>.+)\n)?(?:fax-no:\s*(?P<fax>.+)\n)?(?:e-mail:\s*(?P<email>.+)\n)?nic-hdl:\s*(?P<handle>.+)\nchanged:\s*(?P<changedate>.+)", # nic.at
+		"contact-handle:[ ]*(?P<handle>.+)\ncontact:[ ]*(?P<name>.+)\n(?:organisation:[ ]*(?P<organization>.+)\n)?address:[ ]*(?P<street1>.+)\n(?:address:[ ]*(?P<street2>.+)\n)?(?:address:[ ]*(?P<street3>.+)\n)?(?:address:[ ]*(?P<street4>.+)\n)?address:[ ]*(?P<city>.+)\naddress:[ ]*(?P<state>.+)\naddress:[ ]*(?P<postalcode>.+)\naddress:[ ]*(?P<country>.+)\n(?:phone:[ ]*(?P<phone>.+)\n)?(?:fax:[ ]*(?P<fax>.+)\n)?(?:email:[ ]*(?P<email>.+)\n)?", # LCN.com
 		"person:\s*(?P<name>.+)\nnic-hdl:\s*(?P<handle>.+)\n", # .ie
 		"nic-hdl:\s*(?P<handle>.+)\ntype:\s*(?P<type>.+)\ncontact:\s*(?P<name>.+)\n(?:.+\n)*?(?:address:\s*(?P<street1>.+)\naddress:\s*(?P<street2>.+)\naddress:\s*(?P<street3>.+)\naddress:\s*(?P<country>.+)\n)?(?:phone:\s*(?P<phone>.+)\n)?(?:fax-no:\s*(?P<fax>.+)\n)?(?:.+\n)*?(?:e-mail:\s*(?P<email>.+)\n)?(?:.+\n)*?changed:\s*(?P<changedate>[0-9]{2}\/[0-9]{2}\/[0-9]{4}).*\n", # AFNIC madness without country field
 		"nic-hdl:\s*(?P<handle>.+)\ntype:\s*(?P<type>.+)\ncontact:\s*(?P<name>.+)\n(?:.+\n)*?(?:address:\s*(?P<street1>.+)\n)?(?:address:\s*(?P<street2>.+)\n)?(?:address:\s*(?P<street3>.+)\n)?(?:phone:\s*(?P<phone>.+)\n)?(?:fax-no:\s*(?P<fax>.+)\n)?(?:.+\n)*?(?:e-mail:\s*(?P<email>.+)\n)?(?:.+\n)*?changed:\s*(?P<changedate>[0-9]{2}\/[0-9]{2}\/[0-9]{4}).*\n", # AFNIC madness any country -at all-
@@ -567,17 +568,21 @@ def parse_registrants(data):
 	nic_contact_references = {
 		"registrant": [
 			"registrant:\s*(?P<handle>.+)", # nic.at
+			"owner-contact:\s*(?P<handle>.+)", # LCN.com
 			"holder-c:\s*(?P<handle>.+)", # AFNIC
 			"holder:\s*(?P<handle>.+)", # iis.se (they apparently want to be difficult, and won't give you contact info for the handle over their WHOIS service)
 		],
 		"tech": [
 			"tech-c:\s*(?P<handle>.+)", # nic.at, AFNIC, iis.se
+			"technical-contact:\s*(?P<handle>.+)", # LCN.com
 		],
 		"admin": [
 			"admin-c:\s*(?P<handle>.+)", # nic.at, AFNIC, iis.se
+			"admin-contact:\s*(?P<handle>.+)", # LCN.com
 		],
 		"billing": [
-			"billing-c:\s*(?P<handle>.+)" # iis.se
+			"billing-c:\s*(?P<handle>.+)", # iis.se
+			"billing-contact:\s*(?P<handle>.+)", # LCN.com
 		]
 	}
 
@@ -634,8 +639,8 @@ def parse_registrants(data):
 				match = re.search(regex, segment)
 				if match is not None:
 					data_reference = match.groupdict()
-					if data_reference["handle"] == "-":
-						pass  # Blank
+					if data_reference["handle"] == "-" or re.match("https?:\/\/", data_reference["handle"]) is not None:
+						pass  # Reference was either blank or a URL; the latter is to deal with false positives for nic.ru
 					else:
 						for contact in handle_contacts:
 							if contact["handle"] == data_reference["handle"]:

test/data/globallatedeals.com

@@ -0,0 +1,142 @@
+Domain Registration Service Provided By: LCN.com
+
+The Data in LCN.com's WHOIS database is provided by LCN.com for information
+purposes, and to assist persons in obtaining information about or related to a
+domain name registration record. LCN.com does not guarantee its accuracy.
+
+By submitting a WHOIS query, you agree that you will use the data obtained only
+for lawful purposes and that, under no circumstances will you use this data to:
+
+(a) allow, enable, or otherwise support the transmission by e-mail, telephone,
+or facsimile of mass, unsolicited, commercial advertising or solicitations to
+entities other than the data recipient's own existing customers; or (b) enable
+high volume, automated, electronic processes that send queries or data to the
+systems of LCN.com, except as reasonably necessary to register domain names or
+modify existing registrations.
+
+By submitting this query, you agree to abide by this policy.
+
+LCN.com reserves the right to modify these terms at any time.
+
+
+
+domain:            globallatedeals.com
+
+nameserver:        ns1.stellatravel.co.uk 
+nameserver:        ns2.stellatravel.co.uk 
+nameserver:        ns3.stellatravel.co.uk 
+
+owner-contact:     LCN-816093
+admin-contact:     LCN-816093
+technical-contact: AI-300624
+billing-contact:   AI-300624
+
+created:           2002-04-04 04:13:20
+expires:           2016-04-04 08:13:20
+changed:           2014-03-14 02:52:43.17135
+
+contact-handle:    LCN-816093
+contact:           Paul Edwards
+organisation:      The Global Travel Group Limited
+address:           Ground Floor East, Bowling Mill
+address:           Dean Clough
+address:           West Yorkshire
+address:           HX3 5AX
+address:           GB
+phone:             +44.1274422167
+email:             paul.edwards@sunmaster.co.uk
+
+contact-handle:    AI-300624
+contact:           Hostmaster
+address:           Units H, J, K
+address:           Gateway 1000
+address:           Whittle Way
+address:           Stevenage
+address:           England
+address:           SG1 2FP
+address:           GB
+phone:             +44.1438342490
+fax:               +44.1438300137
+email:             support@lcn.com
+
+ *****************************************************************************
+*******************************************************************************
+**                                                                           **
+**             Domain Registration Service Provided By: LCN.com              **
+**             ------------------------------------------------              **
+**                                                                           **
+**                                                                           **
+**    - For award winning domain name services visit:                        **
+**                                                                           **
+**        http://www.lcn.com/domain_names                                    **
+**                                                                           **
+**    - For powerful & reliable web hosting backed by a 30 day money         **
+**      backed guarantee visit:                                              **
+**                                                                           **
+**        http://www.lcn.com/web_hosting                                     **
+**                                                                           **
+**    - For support visit:                                                   **
+**                                                                           **
+**        http://www.lcn.com/contact_us                                      **
+**                                                                           **
+*******************************************************************************
+ *****************************************************************************
+
+
+--
+
+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: GLOBALLATEDEALS.COM
+   Registrar: LCN.COM LTD.
+   Whois Server: whois.lcn.com
+   Referral URL: http://www.lcn.com
+   Name Server: NS1.STELLATRAVEL.CO.UK
+   Name Server: NS2.STELLATRAVEL.CO.UK
+   Name Server: NS3.STELLATRAVEL.CO.UK
+   Status: clientDeleteProhibited
+   Status: clientTransferProhibited
+   Status: clientUpdateProhibited
+   Updated Date: 13-mar-2014
+   Creation Date: 04-apr-2002
+   Expiration Date: 04-apr-2016
+
+>>> Last update of whois database: Tue, 29 Apr 2014 08:47:33 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.