Merge pull request #4006 from pzl/smtp-py-wrap

Line-wrap long messages in smtp.py
pull/3993/merge
Sergey G. Brester 2025-06-02 12:40:45 +02:00 committed by GitHub
commit afe9bc08ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions

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