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

Replace wrong encoded characters in header values

Browse Source
This commit is contained in:
Thomas Oettli
2020-01-31 23:02:34 +01:00
parent 2ce6b2350e
commit 9558c23922
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pyheadermilter/__init__.py
View File

@@ -166,7 +166,7 @@ class HeaderMilter(Milter.Base):
@Milter.noreply @Milter.noreply
def header(self, name, value): def header(self, name, value):
self.headers.append((name, value)) self.headers.append((name, value.encode(errors="replace").decode()))
return Milter.CONTINUE return Milter.CONTINUE
def eom(self): def eom(self):
@@ -188,16 +188,20 @@ class HeaderMilter(Milter.Base):
self.addheader(name, value, 1) self.addheader(name, value, 1)
else: else:
if action == "mod": if action == "mod":
old_line = "{}: {}".format(name, self.headers[index][1])
new_line = "{}: {}".format(name, value)
if log: if log:
self.logger.info("{}: modify: header: {}".format(self.queueid, "{}: {}".format(name, self.headers[index][1])[0:50])) self.logger.info("{}: modify: header: {}: {}".format(
self.queueid, old_line[0:40], new_line[0:40]))
else: else:
self.logger.debug("{}: modify: header (occ. {}): {}".format(self.queueid, occurrence, "{}: {}".format(name, self.headers[index][1])[0:50])) self.logger.debug("{}: modify: header (occ. {}): {}: {}: {}".format(
self.queueid, occurrence, name, old_line, new_line))
self.headers[index] = (name, value) self.headers[index] = (name, value)
elif action == "del": elif action == "del":
if log: if log:
self.logger.info("{}: delete: header: {}".format(self.queueid, "{}: {}".format(name, self.headers[index][1])[0:50])) self.logger.info("{}: delete: header: {}".format(self.queueid, "{}: {}".format(name, self.headers[index][1]))[0:50])
else: else:
self.logger.debug("{}: delete: header (occ. {}): {}".format(self.queueid, occurrence, "{}: {}".format(name, self.headers[index][1])[0:50])) self.logger.debug("{}: delete: header (occ. {}): {}".format(self.queueid, occurrence, "{}: {}".format(name, self.headers[index][1]))[0:50])
del self.headers[index] del self.headers[index]
self.chgheader(name, occurrence, value) self.chgheader(name, occurrence, value)
return Milter.ACCEPT return Milter.ACCEPT

2
setup.py
View File

@@ -5,7 +5,7 @@ def read_file(fname):
return f.read() return f.read()
setup(name = "pyheadermilter", setup(name = "pyheadermilter",
version = "0.0.1", version = "0.0.2",
author = "Thomas Oettli", author = "Thomas Oettli",
author_email = "spacefreak@noop.ch", author_email = "spacefreak@noop.ch",
description = "A pymilter based sendmail/postfix pre-queue filter.", description = "A pymilter based sendmail/postfix pre-queue filter.",