From 49e44961aa5324f2e686439d8d4b2dfb3f1e4ece Mon Sep 17 00:00:00 2001 From: To-om Date: Mon, 15 May 2017 13:41:31 +0200 Subject: [PATCH] Update import: uwhois -> uwhoisd Package uwhois is renamed to uwhoisd. Moreover, Uwhois function is now named UWhois --- misp_modules/modules/expansion/whois.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/misp_modules/modules/expansion/whois.py b/misp_modules/modules/expansion/whois.py index 4aec40c..91bc9e6 100755 --- a/misp_modules/modules/expansion/whois.py +++ b/misp_modules/modules/expansion/whois.py @@ -2,9 +2,9 @@ import json try: - from uwhois import Uwhois + from uwhoisd import UWhois except ImportError: - print("uwhois module not installed.") + UWhois = None misperrors = {'error': 'Error'} mispattributes = {'input': ['domain', 'ip-src', 'ip-dst'], 'output': ['freetext']} @@ -18,6 +18,9 @@ moduleconfig = ['server', 'port'] def handler(q=False): if q is False: return False + if UWhois is None: + misperrors['error'] = "uwhoisd module not installed." + return misperrors request = json.loads(q) if request.get('domain'): toquery = request['domain'] @@ -33,7 +36,7 @@ def handler(q=False): misperrors['error'] = 'EUPI authentication is missing' 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: return handle_expansion(uwhois, toquery)