github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

construct smtp.py email wrap long lines 

RFC 5322 2.1.1 requires <=998 chars per line.
If matches are included, and are very long lines,
the email will be rejected. Constructing the mail
as a message instead of a subpart (mimetext) fixes this
pull/4006/head
pzl 2025-05-20 14:55:03 -04:00
parent f7aaaf50b8
commit a5d7127109
No known key found for this signature in database
GPG Key ID: D02DF5211139C048
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/action.d/smtp.py
View File

@ -19,7 +19,8 @@
import socket import socket
import smtplib import smtplib
from email.mime.text import MIMEText import email.policy
from email.message import EmailMessage
from email.utils import formatdate, formataddr from email.utils import formatdate, formataddr
from fail2ban.server.actions import ActionBase, CallingMap from fail2ban.server.actions import ActionBase, CallingMap
@ -151,7 +152,8 @@ class SMTPAction(ActionBase):
See Python `smtplib` for full list of other possible See Python `smtplib` for full list of other possible
exceptions. exceptions.
""" """
msg = MIMEText(text) msg = EmailMessage(policy=email.policy.SMTP)
msg.set_content(text)
msg['Subject'] = subject msg['Subject'] = subject
msg['From'] = formataddr((self.fromname, self.fromaddr)) msg['From'] = formataddr((self.fromname, self.fromaddr))
msg['To'] = self.toaddr msg['To'] = self.toaddr