Update import: uwhois -> uwhoisd

Package uwhois is renamed to uwhoisd. Moreover, Uwhois function is now named UWhois
pull/124/head
To-om 2017-05-15 13:41:31 +02:00
parent a510098b10
commit 49e44961aa
1 changed files with 6 additions and 3 deletions

View File

@ -2,9 +2,9 @@
import json import json
try: try:
from uwhois import Uwhois from uwhoisd import UWhois
except ImportError: except ImportError:
print("uwhois module not installed.") UWhois = None
misperrors = {'error': 'Error'} misperrors = {'error': 'Error'}
mispattributes = {'input': ['domain', 'ip-src', 'ip-dst'], 'output': ['freetext']} mispattributes = {'input': ['domain', 'ip-src', 'ip-dst'], 'output': ['freetext']}
@ -18,6 +18,9 @@ moduleconfig = ['server', 'port']
def handler(q=False): def handler(q=False):
if q is False: if q is False:
return False return False
if UWhois is None:
misperrors['error'] = "uwhoisd module not installed."
return misperrors
request = json.loads(q) request = json.loads(q)
if request.get('domain'): if request.get('domain'):
toquery = request['domain'] toquery = request['domain']
@ -33,7 +36,7 @@ def handler(q=False):
misperrors['error'] = 'EUPI authentication is missing' misperrors['error'] = 'EUPI authentication is missing'
return misperrors return misperrors
uwhois = Uwhois(request['config']['server'], int(request['config']['port'])) uwhois = UWhois(request['config']['server'], int(request['config']['port']))
if 'event_id' in request: if 'event_id' in request:
return handle_expansion(uwhois, toquery) return handle_expansion(uwhois, toquery)