Merge branch 'mlimonci/unicode' into 'main'

Catch unicode decode errors

See merge request kernel-firmware/linux-firmware!37
This commit is contained in:
Josh Boyer 2023-10-24 11:20:07 +00:00
commit 5f560c1e0d
1 changed files with 9 additions and 5 deletions

View File

@ -44,11 +44,15 @@ def classify_content(content):
for part in msg.walk(): for part in msg.walk():
if part.get_content_type() == "text/plain": if part.get_content_type() == "text/plain":
body = part.get_payload(decode=True).decode("utf-8") try:
for key in content_types.keys(): body = part.get_payload(decode=True).decode("utf-8")
if key in body: for key in content_types.keys():
return content_types[key] if key in body:
break return content_types[key]
break
except UnicodeDecodeError as e:
logging.warning("Failed to decode email: %s, treating as SPAM" % e)
break
return ContentType.SPAM return ContentType.SPAM