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

switch policy SMTPUTF8 back to SMTP because headers are not encoded

Browse Source
This commit is contained in:
Thomas Oettli
2021-10-13 16:09:49 +02:00
parent 2afb271d8c
commit d080a4d0f5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pyquarantine/__init__.py
View File

@@ -40,7 +40,7 @@ from copy import copy
from email import message_from_binary_file from email import message_from_binary_file
from email.header import Header, decode_header, make_header from email.header import Header, decode_header, make_header
from email.headerregistry import AddressHeader, _default_header_map from email.headerregistry import AddressHeader, _default_header_map
from email.policy import SMTPUTF8 from email.policy import SMTP
from io import BytesIO from io import BytesIO
from netaddr import IPNetwork, AddrFormatError from netaddr import IPNetwork, AddrFormatError
@@ -297,7 +297,7 @@ class QuarantineMilter(Milter.Base):
# is read/modified by actions # is read/modified by actions
self.fp.seek(0) self.fp.seek(0)
self.msg = message_from_binary_file( self.msg = message_from_binary_file(
self.fp, _class=MilterMessage, policy=SMTPUTF8.clone( self.fp, _class=MilterMessage, policy=SMTP.clone(
refold_source='none')) refold_source='none'))
self.msginfo = { self.msginfo = {
"mailfrom": self.mailfrom, "mailfrom": self.mailfrom,

4
pyquarantine/modify.py
View File

@@ -28,7 +28,7 @@ from bs4 import BeautifulSoup
from collections import defaultdict from collections import defaultdict
from copy import copy from copy import copy
from email.message import MIMEPart from email.message import MIMEPart
from email.policy import SMTPUTF8 from email.policy import SMTP
from html import escape from html import escape
from urllib.parse import quote from urllib.parse import quote
@@ -203,7 +203,7 @@ def _inject_body(milter):
def _wrap_message(milter): def _wrap_message(milter):
attachment = MIMEPart(policy=SMTPUTF8) attachment = MIMEPart(policy=SMTP)
attachment.set_content(milter.msg_as_bytes(), attachment.set_content(milter.msg_as_bytes(),
maintype="plain", subtype="text", maintype="plain", subtype="text",
disposition="attachment", disposition="attachment",

4
pyquarantine/storage.py
View File

@@ -25,7 +25,7 @@ import os
from calendar import timegm from calendar import timegm
from datetime import datetime from datetime import datetime
from email import message_from_bytes from email import message_from_bytes
from email.policy import SMTPUTF8 from email.policy import SMTP
from glob import glob from glob import glob
from time import gmtime from time import gmtime
@@ -362,7 +362,7 @@ class FileMailStorage(BaseMailStorage):
msg = message_from_bytes( msg = message_from_bytes(
self.get_mail_bytes(storage_id), self.get_mail_bytes(storage_id),
_class=MilterMessage, _class=MilterMessage,
policy=SMTPUTF8.clone(refold_source='none')) policy=SMTP.clone(refold_source='none'))
return (metadata, msg) return (metadata, msg)