chg: show error message if connection to MISP server fails

pull/15/head
Christophe Vandeplas 2019-02-07 14:02:55 +01:00
parent 2722cc3975
commit 0015cbb7f7
1 changed files with 6 additions and 3 deletions

View File

@ -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 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 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 from pymisp import PyMISP
import json import json
import os import os
@ -110,7 +110,7 @@ def get_misp_connection(config=None):
if misp_connection: if misp_connection:
return misp_connection return misp_connection
if not config: 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']: if config['MISP_maltego.local.misp_verify'] in ['True', 'true', 1, 'yes', 'Yes']:
misp_verify = True misp_verify = True
else: else:
@ -119,7 +119,10 @@ def get_misp_connection(config=None):
misp_debug = True misp_debug = True
else: else:
misp_debug = False misp_debug = False
try:
misp_connection = PyMISP(config['MISP_maltego.local.misp_url'], config['MISP_maltego.local.misp_key'], misp_verify, 'json', misp_debug) 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 return misp_connection