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

python3 changes

pull/4/head
Sascha Rommelfangen 2017-05-24 15:50:05 +02:00
parent 09a4c83772
commit 8992f7557c
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail_to_misp.py
View File

@ -44,6 +44,7 @@ if debug:
target.write("New debug session opened") target.write("New debug session opened")
try: try:
if not sys.stdin.isatty():
email_subject = b'M2M - ' email_subject = b'M2M - '
email_data = b'' email_data = b''
mailcontent = "".join(sys.stdin) mailcontent = "".join(sys.stdin)
@ -62,8 +63,8 @@ except Exception as e:
try: try:
if not stdin_used: if not stdin_used:
email_data = str(sys.argv[1]) email_data = sys.argv[1].encode()
email_subject = str(sys.argv[2]) email_subject = sys.argv[2].encode()
except: except:
if debug: if debug:
target.write("FATAL ERROR: Not all required input received") target.write("FATAL ERROR: Not all required input received")