From 0015cbb7f7aee33ffde0b9da3b620febf3517f3b Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Thu, 7 Feb 2019 14:02:55 +0100 Subject: [PATCH] chg: show error message if connection to MISP server fails --- src/MISP_maltego/transforms/common/util.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/MISP_maltego/transforms/common/util.py b/src/MISP_maltego/transforms/common/util.py index d22bc40..f56407c 100644 --- a/src/MISP_maltego/transforms/common/util.py +++ b/src/MISP_maltego/transforms/common/util.py @@ -1,6 +1,6 @@ from canari.maltego.entities import Unknown, Hash, Domain, IPv4Address, URL, DNSName, AS, Website, NSRecord, PhoneNumber, EmailAddress, File, Person, Hashtag, Location, Company, Alias, Port, Twitter from MISP_maltego.transforms.common.entities import MISPEvent, MISPObject, MISPGalaxy -from canari.maltego.message import UIMessageType, UIMessage, Label, LinkStyle +from canari.maltego.message import UIMessageType, UIMessage, Label, LinkStyle, MaltegoException from pymisp import PyMISP import json import os @@ -110,7 +110,7 @@ def get_misp_connection(config=None): if misp_connection: return misp_connection if not config: - raise Exception("ERROR: MISP connection not yet established, and config not provided as parameter.") + raise MaltegoException("ERROR: MISP connection not yet established, and config not provided as parameter.") if config['MISP_maltego.local.misp_verify'] in ['True', 'true', 1, 'yes', 'Yes']: misp_verify = True else: @@ -119,7 +119,10 @@ def get_misp_connection(config=None): misp_debug = True else: misp_debug = False - misp_connection = PyMISP(config['MISP_maltego.local.misp_url'], config['MISP_maltego.local.misp_key'], misp_verify, 'json', misp_debug) + try: + misp_connection = PyMISP(config['MISP_maltego.local.misp_url'], config['MISP_maltego.local.misp_key'], misp_verify, 'json', misp_debug) + except Exception: + raise MaltegoException("ERROR: Cannot connect to MISP server. Please verify your MISP_Maltego.conf settings") return misp_connection