From a59863ced92b268b5df4de11a8372a2840631abe Mon Sep 17 00:00:00 2001 From: CIRCL Date: Fri, 2 Jun 2017 11:13:48 +0200 Subject: [PATCH] fake_smtp integration modified (-r) for larger files --- mail_to_misp.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mail_to_misp.py b/mail_to_misp.py index c8ec0e1..be00976 100755 --- a/mail_to_misp.py +++ b/mail_to_misp.py @@ -60,10 +60,18 @@ mail_subject = "" if len(sys.argv) == 1: mailcontent = sys.stdin.buffer.read().decode("utf-8", "ignore") else: - mailcontent = sys.argv[1] - syslog.syslog(mailcontent) - if len(sys.argv) >= 3: - mail_subject = sys.argv[2].encode("utf-8", "ignore") + # read from tempfile + if sys.argv[1] == "-r": + tempfilename = sys.argv[2] + tf = open(tempfilename, 'r') + mailcontent = tf.read() + tf.close() + # receive data and subject through arguments + else: + mailcontent = sys.argv[1] + syslog.syslog(mailcontent) + if len(sys.argv) >= 3: + mail_subject = sys.argv[2].encode("utf-8", "ignore") email_data = b'' msg = email.message_from_string(mailcontent) if not mail_subject: