mirror of https://github.com/MISP/mail_to_misp
added better error handling for new variables
parent
299b1ae8ff
commit
b235d5a416
|
@ -128,16 +128,15 @@ if debug:
|
||||||
syslog.syslog(email_subject)
|
syslog.syslog(email_subject)
|
||||||
syslog.syslog(email_data)
|
syslog.syslog(email_data)
|
||||||
|
|
||||||
|
try:
|
||||||
misp_url = config.misp_url
|
misp_url = config.misp_url
|
||||||
misp_key = config.misp_key
|
misp_key = config.misp_key
|
||||||
misp_verifycert = config.misp_verifycert
|
misp_verifycert = config.misp_verifycert
|
||||||
m2m_key = config.m2m_key
|
m2m_key = config.m2m_key
|
||||||
m2m_auto_distribution = config.m2m_auto_distribution
|
m2m_auto_distribution = config.m2m_auto_distribution
|
||||||
m2m_attachment_keyword = config.m2m_attachment_keyword
|
m2m_attachment_keyword = config.m2m_attachment_keyword
|
||||||
|
|
||||||
resolver = dns.resolver.Resolver(configure=False)
|
resolver = dns.resolver.Resolver(configure=False)
|
||||||
resolver.nameservers = config.nameservers
|
resolver.nameservers = config.nameservers
|
||||||
|
|
||||||
excludelist = config.excludelist
|
excludelist = config.excludelist
|
||||||
externallist = config.externallist
|
externallist = config.externallist
|
||||||
internallist = config.internallist
|
internallist = config.internallist
|
||||||
|
@ -154,6 +153,14 @@ stopword = config.stopword
|
||||||
hash_only_tags = config.hash_only_tags
|
hash_only_tags = config.hash_only_tags
|
||||||
forward_identifiers = config.forward_identifiers
|
forward_identifiers = config.forward_identifiers
|
||||||
attach_original_mail = config.attach_original_mail
|
attach_original_mail = config.attach_original_mail
|
||||||
|
except Exception as e:
|
||||||
|
syslog.syslog(str(e))
|
||||||
|
print("There is a problem with the configuration. A mandatory configuration variable is not set."
|
||||||
|
print("Did you just update? mail_to_misp might have new configuration variables."
|
||||||
|
print("Please compare with the configuration example.").
|
||||||
|
print("\nTrace:")
|
||||||
|
print(e)
|
||||||
|
sys.exit(-2)
|
||||||
|
|
||||||
original_email_data = email_data
|
original_email_data = email_data
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue