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

preparation for spamtrap

pull/4/head
CIRCL 2017-06-01 12:16:32 +02:00
parent 34bf5e5ae9
commit 545a9c35c6
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mail_to_misp.py
View File

@ -82,18 +82,29 @@ except Exception as e:
try: try:
if not stdin_used: if not stdin_used:
email_data = sys.argv[1] email_data = sys.argv[1]
email_subject = sys.argv[2] if len(sys.argv) < 3:
#email_subject = "(No Subject)"
msg = email.message_from_string(email_data)
email_subject = msg.get('Subject').encode("utf-8", "ignore")
else:
email_subject = sys.argv[2]
except: except:
if debug: if debug:
syslog.syslog("FATAL ERROR: Not all required input received") syslog.syslog("FATAL ERROR: Not all required input received")
sys.exit(1) sys.exit(1)
if debug: #if debug:
syslog.syslog("Encoding of subject: {0}".format(ftfy.guess_bytes(email_subject)[1])) # syslog.syslog("Encoding of subject: {0}".format(ftfy.guess_bytes(email_subject)[1]))
syslog.syslog("Encoding of body: {0}".format(ftfy.guess_bytes(email_data)[1])) # syslog.syslog("Encoding of body: {0}".format(ftfy.guess_bytes(email_data)[1]))
email_data = ftfy.fix_text(email_data.decode("utf-8", "ignore")) try:
email_subject = ftfy.fix_text(email_subject.decode("utf-8", "ignore")) email_data = ftfy.fix_text(email_data.decode("utf-8", "ignore"))
except:
email_data = ftfy.fix_text(email_data)
try:
email_subject = ftfy.fix_text(email_subject.decode("utf-8", "ignore"))
except:
email_subject = ftfy.fix_text(email_subject)
if debug: if debug:
syslog.syslog(email_subject) syslog.syslog(email_subject)