spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix file loading and improve quarantine logic

Browse Source
This commit is contained in:
Thomas Oettli
2021-10-04 19:03:55 +02:00
parent 5c9ec5037e
commit 3220fcbf2c
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pyquarantine/notify.py
View File

@@ -121,20 +121,21 @@ class EMailNotification(BaseNotification):
self.from_header = from_header
self.subject = subject
try:
self.template = open(template, "r").read()
with open(template, "r") as fh:
self.template = fh.read()
self.embed_imgs = []
for img_path in embed_imgs:
img = MIMEImage(open(img_path, "rb").read())
with open(img_path, "rb") as fh:
img = MIMEImage(fh.read())
filename = basename(img_path)
img.add_header("Content-ID", f"<{filename}>")
self.embed_imgs.append(img)
self.replacement_img = repl_img
self.strip_images = strip_imgs
if not strip_imgs and repl_img:
self.replacement_img = MIMEImage(
open(repl_img, "rb").read())
with open(repl_img, "rb") as fh:
self.replacement_img = MIMEImage(fh.read())
self.replacement_img.add_header(
"Content-ID", "<removed_for_security_reasons>")