MISP
/
mail_to_misp
mirror of https://github.com/MISP/mail_to_misp
2
0
Fork 0
Code Issues Releases Wiki Activity

fixed wrong exception handling 

Except block handles 'BaseException'
pull/38/head
begunrom 2019-11-17 09:45:12 +01:00
parent 26ef177d58
commit 6070d6428c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail2misp/mail2misp.py
View File

@ -62,8 +62,10 @@ class Mail2MISP():
# Remove words from subject
for removeword in self.config.removelist:
self.subject = re.sub(removeword, "", self.subject).strip()
except:
except Exception as ex:
self.subject = "<subject could not be retrieved>"
if self.debug:
syslog.syslog(ex)
# Initialize the MISP event
self.misp_event = MISPEvent()
@ -407,8 +409,8 @@ class Mail2MISP():
def get_attached_emails(self,pseudofile):
syslog.openlog(logoption=syslog.LOG_PID, facility=syslog.LOG_USER)
syslog.syslog("get_attached_emails Job started.")
if self.debug:
syslog.syslog("get_attached_emails Job started.")
forwarded_emails = []
self.pseudofile = pseudofile
@ -416,7 +418,8 @@ class Mail2MISP():
for attachment in self.original_mail.iter_attachments():
attachment_content = attachment.get_content()
filename = attachment.get_filename()
syslog.syslog(f'get_attached_emails: filename = {filename}')
if self.debug:
syslog.syslog(f'get_attached_emails: filename = {filename}')
# Search for email forwarded as attachment
# I could have more than one, attaching everything.
if isinstance(attachment, message.EmailMessage) and os.path.splitext(filename)[1] == '.eml':