From d57088b1f30a1ffaebe4b9c1d24ffd290aa9fcf1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 6 Mar 2019 19:13:15 +0000 Subject: [PATCH] Modified one call and one exception point related to on_behalf_of() use for email sending. - Legacy-Id: 16008 --- ietf/secr/announcement/views.py | 4 ++-- ietf/utils/mail.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py index 660374360..7364bbae0 100644 --- a/ietf/secr/announcement/views.py +++ b/ietf/secr/announcement/views.py @@ -8,7 +8,7 @@ from ietf.message.models import AnnouncementFrom from ietf.ietfauth.utils import has_role from ietf.secr.announcement.forms import AnnounceForm from ietf.secr.utils.decorators import check_for_cancel -from ietf.utils.mail import send_mail_text, on_behalf_of +from ietf.utils.mail import send_mail_text, maybe_on_behalf_of # ------------------------------------------------- # Helper Functions @@ -83,7 +83,7 @@ def confirm(request): extra = {'Reply-To':message.reply_to} send_mail_text(None, message.to, - on_behalf_of(message.frm), + maybe_on_behalf_of(message.frm), message.subject, message.body, cc=message.cc, diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py index 9bafa20c9..40737ff0d 100644 --- a/ietf/utils/mail.py +++ b/ietf/utils/mail.py @@ -191,7 +191,8 @@ def on_behalf_of(frm): name, addr = parseaddr(frm) domain = addr.rsplit('@', 1)[-1] if domain in settings.UTILS_FROM_EMAIL_DOMAINS: - raise ValueError("Using send_mail_on_behalf_of() with an address (%s) in %s is misleading. Please use send_mail()" % (addr, settings.UTILS_FROM_EMAIL_DOMAINS)) + unreachable('2019-03-06') + return frm if not name: name = addr name = "Datatracker on behalf of %s" % name