diff --git a/main.py b/main.py index b57c2114b48a17fec730c2d8023d08c56201fb58..70e3a9b71336dc842aa7965d2365bf626cbb0c39 100644 --- a/main.py +++ b/main.py @@ -22,8 +22,12 @@ split_from_regex = re.compile('(?P<from_label>.*)<(?P<from_address>.*)>$') address_domain_regex = re.compile('.*@(?P<domain>[\.\w-]+)') +def normalizeRawFromHeader(value): + return value.replace('\n', '').replace('\r', '').strip() + + 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) result = { '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.""" if field.lower() == 'from': logger.debug(f"({self.id}) Got \"From:\" header raw value: '{value}'") - value = value.strip('\n').strip() + value = normalizeRawFromHeader(value) if value == '': logger.info(f"Got empty from header value! WTF! Skipping.") return Milter.CONTINUE