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

chg: Allow to pass a eml as string to EmailObject

pull/383/head
Raphaël Vinot 2019-04-24 15:37:40 +02:00
parent 921f414e0e
commit 67cb8e9d53
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pymisp/tools/emailobject.py
View File

@ -36,7 +36,10 @@ class EMailObject(AbstractMISPObjectGenerator):
def attachments(self): def attachments(self):
to_return = [] to_return = []
for attachment in self.__email.iter_attachments(): for attachment in self.__email.iter_attachments():
to_return.append((attachment.get_filename(), BytesIO(attachment.get_content()))) content = attachment.get_content()
if isinstance(content, str):
content = content.encode()
to_return.append((attachment.get_filename(), BytesIO(content)))
return to_return return to_return
def generate_attributes(self): def generate_attributes(self):
@ -47,16 +50,16 @@ class EMailObject(AbstractMISPObjectGenerator):
if 'Message-ID' in self.__email: if 'Message-ID' in self.__email:
self.add_attribute('message-id', value=self.__email['Message-ID']) self.add_attribute('message-id', value=self.__email['Message-ID'])
if 'To' in self.__email: if 'To' in self.__email:
for to in self.__email['To'].split(','): to_add = [to.strip() for to in self.__email['To'].split(',')]
self.add_attribute('to', value=to.strip()) self.add_attributes('to', *to_add)
if 'Cc' in self.__email: if 'Cc' in self.__email:
for cc in self.__email['Cc'].split(','): to_add = [to.strip() for to in self.__email['Cc'].split(',')]
self.add_attribute('cc', value=cc.strip()) self.add_attributes('cc', *to_add)
if 'Subject' in self.__email: if 'Subject' in self.__email:
self.add_attribute('subject', value=self.__email['Subject']) self.add_attribute('subject', value=self.__email['Subject'])
if 'From' in self.__email: if 'From' in self.__email:
for e_from in self.__email['From'].split(','): to_add = [to.strip() for to in self.__email['From'].split(',')]
self.add_attribute('from', value=e_from.strip()) self.add_attributes('from', *to_add)
if 'Return-Path' in self.__email: if 'Return-Path' in self.__email:
self.add_attribute('return-path', value=self.__email['Return-Path']) self.add_attribute('return-path', value=self.__email['Return-Path'])
if 'User-Agent' in self.__email: if 'User-Agent' in self.__email: