# HG changeset patch # User joan # Date 1513291709 -3600 # Node ID 08133c057eedbda2eaef2fbcc3fffbda34fa495a # Parent 7899fbfe9fe07c3743130ee5c4f70da9d1b2609c Add checks for .bg, .de, .ad tlds diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/expected/abv.bg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/expected/abv.bg Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,1 @@ +{"domain_name": "abv.bg", "expiration_date": "see at www.register.bg", "updated_date": null, "creation_date": null, "status": "Registered"} \ No newline at end of file diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/expected/web.de --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/expected/web.de Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,1 @@ +{"domain_name": "web.de", "expiration_date": null, "updated_date": null, "creation_date": null, "status": "connect"} \ No newline at end of file diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/expected/willhaben.at --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/expected/willhaben.at Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,1 @@ +{"domain_name": "willhaben.at", "expiration_date": null, "updated_date": null, "creation_date": null, "status": null} \ No newline at end of file diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/whois/abv.bg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/whois/abv.bg Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,53 @@ + +DOMAIN NAME: abv.bg +requested on: see at www.register.bg +processed from: see at www.register.bg +activated on: see at www.register.bg +expires at: see at www.register.bg +registration status: Registered + +REGISTRANT: +Darik Net EAD + bul. Hristofor Kolumb 41, et. 6 + SOFIA, 1592 + BULGARIA + +ADMINISTRATIVE CONTACT: + Toni Enchev + noc@netinfo.bg + Darik Net EAD + bul. Hristofor Kolumb 41, et. 6 + SOFIA, 1592 + BULGARIA + tel: +359 2 960 3162 + fax: + NIC handle: TE230426 + +TECHNICAL CONTACT(S): + + Milen Evtimov + milen@netinfo.bg + Net Info.BG JSCo + bul. "Cherni vrah" 1-3, Sofiya 1463 + SOFIA, 1421 + BULGARIA + tel: +359 2 9603100 + fax: +359 2 9604179 + NIC handle: ME26909 + + Biser Grigorov + biser@netinfo.bg + Net Info.BG JSCo + bul. "Cherni vrah" 1-3, Sofiya 1463 + SOFIA, 1421 + BULGARIA + tel: +359 2 9603100 + fax: +359 2 9604179 + NIC handle: BG26908 + +NAME SERVER INFORMATION: +ns.netinfo.bg +ns2.netinfo.bg + +DNSSEC: Inactive + diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/whois/web.de --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/whois/web.de Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,68 @@ +% Copyright (c) 2010 by DENIC +% Version: 2.0 +% +% Restricted rights. +% +% Terms and Conditions of Use +% +% The data in this record is provided by DENIC for informational purposes only. +% DENIC does not guarantee its accuracy and cannot, under any circumstances, +% be held liable in case the stored information would prove to be wrong, +% incomplete or not accurate in any sense. +% +% All the domain data that is visible in the whois service is protected by law. +% It is not permitted to use it for any purpose other than technical or +% administrative requirements associated with the operation of the Internet. +% It is explicitly forbidden to extract, copy and/or use or re-utilise in any +% form and by any means (electronically or not) the whole or a quantitatively +% or qualitatively substantial part of the contents of the whois database +% without prior and explicit written permission by DENIC. +% It is prohibited, in particular, to use it for transmission of unsolicited +% and/or commercial and/or advertising by phone, fax, e-mail or for any similar +% purposes. +% +% By maintaining the connection you assure that you have a legitimate interest +% in the data and that you will only use it for the stated purposes. You are +% aware that DENIC maintains the right to initiate legal proceedings against +% you in the event of any breach of this assurance and to bar you from using +% its whois service. +% +% The DENIC whois service on port 43 never discloses any information concerning +% the domain holder/administrative contact. Information concerning the domain +% holder/administrative contact can be obtained through use of our web-based +% whois service available at the DENIC website: +% http://www.denic.de/en/domains/whois-service/web-whois.html +% + +Domain: web.de +Nserver: ns-webde.ui-dns.biz +Nserver: ns-webde.ui-dns.com +Nserver: ns-webde.ui-dns.de +Nserver: ns-webde.ui-dns.org +Dnskey: 257 3 8 AwEAAcBs30zgmOeYcUYzJetRzRYGQXlnXpv2gO3KWf5BYRn9OqFtUBzFOqO16Ow2XPqR8SWqpAVpnToQICICZyf58SHaefGn94fTj+PlwJi4HhoCbim2U3G5sYtl5xoNfUCaDXDQFJp+HnZlaA9afHutOVFtqCmMHV+2ApSyOFFETQNmq4YoxLxiJoxSjvQAaaiJKVoA4wykjXALMyCmbXGH4aMVbW2m0Fuqe+nKU8myW14nCASBo0mDO6cBNsBwu7IiL4SxxnflDCSTkn/FnCKtzf7aVzzrRM4SqTe4NOm7wPmCZiAGoxOL15PZ7YQSt9BEXU6gMdGxCGVBdtgM13NfziM= +Status: connect +Changed: 2016-04-11T11:09:54+02:00 + +[Tech-C] +Type: PERSON +Name: Hostmaster of the day +Address: Elgendorfer Str. 57 +PostalCode: 56410 +City: Montabaur +CountryCode: DE +Phone: +49-721-9600 +Fax: +49-721-91374-215 +Email: ui-hostmaster@1and1.com +Changed: 2011-08-10T17:09:10+02:00 + +[Zone-C] +Type: PERSON +Name: Hostmaster of the day +Address: Elgendorfer Str. 57 +PostalCode: 56410 +City: Montabaur +CountryCode: DE +Phone: +49-721-9600 +Fax: +49-721-91374-215 +Email: ui-hostmaster@1and1.com +Changed: 2011-08-10T17:09:10+02:00 diff -r 7899fbfe9fe0 -r 08133c057eed test/samples/whois/willhaben.at --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/samples/whois/willhaben.at Thu Dec 14 23:48:29 2017 +0100 @@ -0,0 +1,58 @@ +% Copyright (c)2017 by NIC.AT (1) +% +% Restricted rights. +% +% Except for agreed Internet operational purposes, no part of this +% information may be reproduced, stored in a retrieval system, or +% transmitted, in any form or by any means, electronic, mechanical, +% recording, or otherwise, without prior permission of NIC.AT on behalf +% of itself and/or the copyright holders. Any use of this material to +% target advertising or similar activities is explicitly forbidden and +% can be prosecuted. +% +% It is furthermore strictly forbidden to use the Whois-Database in such +% a way that jeopardizes or could jeopardize the stability of the +% technical systems of NIC.AT under any circumstances. In particular, +% this includes any misuse of the Whois-Database and any use of the +% Whois-Database which disturbs its operation. +% +% Should the user violate these points, NIC.AT reserves the right to +% deactivate the Whois-Database entirely or partly for the user. +% Moreover, the user shall be held liable for any and all damage +% arising from a violation of these points. + +domain: willhaben.at +registrant: WISG8002269-NICAT +admin-c: SISG4765752-NICAT +tech-c: SISG4765752-NICAT +nserver: srvkkl-dns01.styria.com +nserver: srvsgr-dns02.styria.com +nserver: srvvie-dns03.styria.com +changed: 20141204 14:57:44 +source: AT-DOM + +personname: Mirjam Techt +organization: willhaben internet service GmbH & Co KG +street address: Landstrasser Hauptstrasse 97-101 +postal code: 1030 +city: Wien +country: Austria +phone: +4312055000 +e-mail: domain@styria-it.com +nic-hdl: WISG8002269-NICAT +changed: 20140422 10:08:35 +source: AT-DOM + +personname: Uwe Holzer +organization: Styria IT Solutions GmbH & Co KG +street address: Gadollaplatz 1 +postal code: 8010 +city: Graz +country: Austria +phone: +434635800304 +fax-no: +434635800296 +e-mail: domain@styria-it.com +nic-hdl: SISG4765752-NICAT +changed: 20151021 16:23:11 +source: AT-DOM + diff -r 7899fbfe9fe0 -r 08133c057eed whois/parser.py --- a/whois/parser.py Tue Dec 12 23:37:28 2017 +0100 +++ b/whois/parser.py Thu Dec 14 23:48:29 2017 +0100 @@ -819,6 +819,8 @@ """Whois parser for .bg domains """ regex = { + 'domain_name': 'DOMAIN NAME: *(.+)\n', + 'status': 'registration status: s*(.+)', 'expiration_date': 'expires at: *(.+)', } @@ -835,6 +837,8 @@ """Whois parser for .de domains """ regex = { + 'domain_name': 'Domain: *(.+)', + 'status': 'Status: *(.+)', 'name': 'name: *(.+)', 'org': 'Organisation: *(.+)', 'address': 'Address: *(.+)', @@ -857,6 +861,7 @@ """Whois parser for .at domains """ regex = { + 'domain_name': 'domain: *(.+)', 'name': 'personname: *(.+)', 'org': 'organization: *(.+)', 'address': 'street address: *(.+)',