JPT
/
pymilter-suspicious-from
mirror of https://lab.it.hs-hannover.de/misc/pymilter-suspicious-from.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix bug that occurs with linebreaks within from header value

This commit is contained in:
Jan Philipp Timme 2019-12-18 16:41:55 +01:00
parent e538d99abd
commit 50f0b7983e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.py
View File

@ -22,8 +22,12 @@ split_from_regex = re.compile('(?P<from_label>.*)<(?P<from_address>.*)>$')
address_domain_regex = re.compile('.*@(?P<domain>[\.\w-]+)') address_domain_regex = re.compile('.*@(?P<domain>[\.\w-]+)')
def normalizeRawFromHeader(value):
return value.replace('\n', '').replace('\r', '').strip()
def parseFromHeader(value): def parseFromHeader(value):
"""Split 'From:' header into label and address values.""" """Split 'From:'-header into label and address values."""
match = split_from_regex.match(value) match = split_from_regex.match(value)
result = { result = {
'label': match.group('from_label').strip(), 'label': match.group('from_label').strip(),
@ -59,7 +63,7 @@ class SuspiciousFrom(Milter.Base):
"""Header hook gets called for every header within the email processed.""" """Header hook gets called for every header within the email processed."""
if field.lower() == 'from': if field.lower() == 'from':
logger.debug(f"({self.id}) Got \"From:\" header raw value: '{value}'") logger.debug(f"({self.id}) Got \"From:\" header raw value: '{value}'")
value = value.strip('\n').strip() value = normalizeRawFromHeader(value)
if value == '': if value == '':
logger.info(f"Got empty from header value! WTF! Skipping.") logger.info(f"Got empty from header value! WTF! Skipping.")
return Milter.CONTINUE return Milter.CONTINUE