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

Big refactoring, getaddresses() is unreliable. :-(

This commit is contained in:
Jan Philipp Timme 2019-12-20 12:16:26 +01:00
parent 7312afd8c4
commit 436c7db707
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
main.py
View File

@ -23,7 +23,8 @@ handler.setFormatter(formatter)
logger.addHandler(handler) logger.addHandler(handler)
# Rough regex to fetch domain values from address-like text # Rough regex to fetch domain values from address-like text
address_domain_regex = re.compile('.*@(?P<domain>[\.\w-]+)') # Not matching the part in front of @ because greedy and stuff :(
address_domain_regex = re.compile('\@(?P<domain>[\.\w-]+)')
def get_decoded_header(value): def get_decoded_header(value):
@ -61,43 +62,42 @@ class SuspiciousFrom(Milter.Base):
self.final_result = Milter.ACCEPT self.final_result = Milter.ACCEPT
self.new_headers = [] self.new_headers = []
def set_suspicious_headers(self, is_suspicious, reason):
str_okay = "PASS" if not is_suspicious else "FAIL"
str_suspicious = "YES" if is_suspicious else "NO"
self.new_headers.append({'name': 'X-From-Checked', 'value': f"{str_okay} - {reason}"})
self.new_headers.append({'name': 'X-From-Suspicious', 'value': str_suspicious})
def header(self, field, value): def header(self, field, value):
"""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}) \"From:\" raw: '{value}'")
value = normalizeRawFromHeader(value) value = normalizeRawFromHeader(value)
logger.info(f"({self.id}) \"From:\" cleaned: '{value}'")
if value == '': if value == '':
logger.warn(f"Got empty from header value! WTF! Skipping.") logger.warning(f"\"From:\" header empty! WTF, but nothing to do. OK for now.")
return Milter.CONTINUE self.set_suspicious_headers(False, "EMPTY FROM HEADER - WTF")
decoded_from = get_decoded_header(value)
logger.debug(f"({self.id}) Decoded from as a whole: '{decoded_from}'")
data = getaddresses([decoded_from])[0]
logger.info(f"({self.id}) Label: '{data[0]}', Address: '{data[1]}'")
if data[0] == '':
logger.info(f"({self.id}) No label in from header, should be OK!")
if decoded_from.count('@') > 1:
logger.info(f"({self.id}) Raw decoded from header contains multiple '@'-charecters - investigating!")
self.new_headers.append({'name': 'X-From-Checked', 'value': 'OK - No label specified'})
self.new_headers.append({'name': 'X-From-Suspicious', 'value': 'NO'})
else: else:
label_domain = getDomainFromValue(data[0]) decoded_from = get_decoded_header(value)
address_domain = getDomainFromValue(data[1]) logger.debug(f"({self.id}) \"From:\" decoded raw: '{value}'")
logger.info(f"({self.id}) Extracted label_domain '{label_domain}' and address_domain '{address_domain}'") decoded_from = normalizeRawFromHeader(decoded_from)
if label_domain is not None: logger.info(f"({self.id}) \"From:\" decoded cleaned: '{decoded_from}'")
logger.debug(f"({self.id}) Label '{data[0]}' contains an address with domain '{label_domain}'.") all_domains = address_domain_regex.findall(decoded_from)
if label_domain.lower() == address_domain.lower(): if len(all_domains) == 0:
logger.info(f"({self.id}) Label domain '{label_domain}' matches address domain '{address_domain}'. Good!") logger.warning(f"({self.id}) No domain in decoded \"From:\" - WTF! OK, though")
self.new_headers.append({'name': 'X-From-Checked', 'value': 'OK - Label domain matches address domain'}) self.set_suspicious_headers(False, "No domains in decoded FROM")
self.new_headers.append({'name': 'X-From-Suspicious', 'value': 'NO'}) elif len(all_domains) == 1:
else: logger.debug(f"({self.id}) Only one domain in decoded \"From:\": '{all_domains[0]}' - OK")
logger.info(f"({self.id}) Label domain '{label_domain}' did NOT match address domain '{address_domain}'. BAD!") self.set_suspicious_headers(False, "Only one domain in decoded FROM")
self.new_headers.append({'name': 'X-From-Checked', 'value': 'FAIL - Label domain does NOT match address domain'})
self.new_headers.append({'name': 'X-From-Suspicious', 'value': 'YES'})
else: else:
logger.info(f"({self.id}) No domain found in label. Good!") logger.info(f"({self.id}) Raw decoded from header contains multiple domains: '{all_domains}' - Checking")
self.new_headers.append({'name': 'X-From-Checked', 'value': 'OK - No domain found in label.'}) if len(set(all_domains)) > 1:
self.new_headers.append({'name': 'X-From-Suspicious', 'value': 'NO'}) logger.info(f"({self.id}) Multiple different domains in decoded \"From:\". - NOT OK")
# Use continue here, so we can reach eom hook. self.set_suspicious_headers(True, "Multiple domains in decoded FROM are different")
else:
logger.info(f"({self.id}) All domains in decoded \"From:\" are identical - OK")
self.set_suspicious_headers(False, "Multiple domains in decoded FROM match properly")
# CONTINUE so we reach eom hook.
# TODO: Log and react if multiple From-headers are found? # TODO: Log and react if multiple From-headers are found?
return Milter.CONTINUE return Milter.CONTINUE