vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Remove newlines from filename in email attachment (#35151)

Browse source
This commit is contained in:
Corentin Forler 2025-12-29 11:48:13 +01:00 • committed by GitHub
parent 1bec823bb1
commit ad443013ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/email/email_body.py
View file

@ -241,7 +241,8 @@ class EMail:
part = MIMEText(message, _subtype=subtype, policy=policy.SMTP)
if as_attachment:
part.add_header("Content-Disposition", "attachment", filename=filename)
clean_filename = re.sub("[\r\n]", "", str(filename))
part.add_header("Content-Disposition", "attachment", filename=clean_filename)
self.msg_root.attach(part)
@ -476,7 +477,8 @@ def add_attachment(fname, fcontent, content_type=None, parent=None, content_id=N
# Set the filename parameter
if fname:
attachment_type = "inline" if inline else "attachment"
part.add_header("Content-Disposition", attachment_type, filename=str(fname))
clean_filename = re.sub("[\r\n]", "", str(fname))
part.add_header("Content-Disposition", attachment_type, filename=clean_filename)
if content_id:
part.add_header("Content-ID", f"<{content_id}>")