ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-08 03:30:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[PR #7740/671b7ab1 backport][stable-8] mail module: add Message-ID header (#7764)

Browse source 
mail module: add Message-ID header (#7740)

* mail module: add Message-ID header

* Update plugins/modules/mail.py

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 671b7ab149)

Co-authored-by: Sébastien Bocahu <sebastien+github@bocahu.name>
This commit is contained in:
patchback[bot] 2023-12-27 16:00:13 +01:00 • committed by GitHub
parent 5dc20d9028
commit 21a7159472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/7740-add-message-id-header-to-mail-module.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- mail - add ``Message-ID`` header; which is required by some mail servers (https://github.com/ansible-collections/community.general/pull/7740).

7
plugins/modules/mail.py
View file

@ -222,7 +222,7 @@ import smtplib
import ssl import ssl
import traceback import traceback
from email import encoders from email import encoders
from email.utils import parseaddr, formataddr, formatdate from email.utils import parseaddr, formataddr, formatdate, make_msgid
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText
@ -349,6 +349,11 @@ def main():
msg['From'] = formataddr((sender_phrase, sender_addr)) msg['From'] = formataddr((sender_phrase, sender_addr))
msg['Date'] = formatdate(localtime=True) msg['Date'] = formatdate(localtime=True)
msg['Subject'] = Header(subject, charset) msg['Subject'] = Header(subject, charset)
try:
msg['Message-ID'] = make_msgid(domain='ansible')
except TypeError:
# `domain` is only available in Python 3
msg['Message-ID'] = make_msgid()
msg.preamble = "Multipart message" msg.preamble = "Multipart message"
for header in headers: for header in headers: