![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/roundup/mailer.py b/roundup/mailer.py
index 9c70852317f36fd6a35f087d65d8d11c482f7b95..729aaeab4d7200fbef196db904d53497f59fbde4 100644 (file)
--- a/roundup/mailer.py
+++ b/roundup/mailer.py
"""Sending Roundup-specific mail over SMTP.
"""
__docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.22 2008-07-21 01:44:58 richard Exp $
import time, quopri, os, socket, smtplib, re, sys, traceback, email
from roundup import __version__
from roundup.date import get_timezone
-from email.Utils import formatdate, formataddr
+from email.Utils import formatdate, formataddr, specialsre, escapesre
from email.Message import Message
from email.Header import Header
from email.MIMEText import MIMEText
orig = msg.get_payload()
encdata = quopri.encodestring(orig)
msg.set_payload(encdata)
+ del msg['Content-Transfer-Encoding']
msg['Content-Transfer-Encoding'] = 'quoted-printable'
+def nice_sender_header(name, address, charset):
+ # construct an address header so it's as human-readable as possible
+ # even in the presence of a non-ASCII name part
+ h = Header(charset=charset)
+ # the important bits of formataddr()
+ if specialsre.search(name):
+ name = '"%s"'%escapesre.sub(r'\\\g<0>', name)
+ try:
+ name.encode('ASCII')
+ h.append(name, 'ASCII')
+ except UnicodeEncodeError:
+ h.append(name)
+ h.append('<%s>'%address, 'ASCII')
+ return str(h)
+
class Mailer:
"""Roundup-specific mail sending."""
def __init__(self, config):
Subject and author are encoded using the EMAIL_CHARSET from the
config (default UTF-8).
- Returns a Message object and body part writer.
+ Returns a Message object.
'''
# encode header values if they need to be
charset = getattr(self.config, 'EMAIL_CHARSET', 'utf-8')
tracker_name = unicode(self.config.TRACKER_NAME, 'utf-8')
if not author:
- author = formataddr((tracker_name, self.config.ADMIN_EMAIL))
+ author = (tracker_name, self.config.ADMIN_EMAIL)
+ name = author[0]
else:
name = unicode(author[0], 'utf-8')
- author = formataddr((name, author[1]))
+ author = nice_sender_header(name, author[1], charset)
if multipart:
message = MIMEMultipart()
else:
- message = Message()
+ message = MIMEText("")
message.set_charset(charset)
- message['Content-Type'] = 'text/plain; charset="%s"'%charset
try:
message['Subject'] = subject.encode('ascii')
except UnicodeError:
message['Subject'] = Header(subject, charset)
message['To'] = ', '.join(to)
- try:
- message['From'] = author.encode('ascii')
- except UnicodeError:
- message['From'] = Header(author, charset)
+ message['From'] = author
message['Date'] = formatdate(localtime=True)
# add a Precedence header so autoresponders ignore us
# finally, an aid to debugging problems
message['X-Roundup-Version'] = __version__
- message['MIME-Version'] = '1.0'
-
return message
def standard_message(self, to, subject, content, author=None):
"""
message = self.get_standard_message(to, subject, author)
message.set_payload(content)
- self.smtp_send(to, str(message))
+ encode_quopri(message)
+ self.smtp_send(to, message.as_string())
def bounce_message(self, bounced_message, to, error,
subject='Failed issue tracker submission'):
elif error_messages_to == "both":
to.append(dispatcher_email)
- message = self.get_standard_message(to, subject)
+ message = self.get_standard_message(to, subject, multipart=True)
# add the error text
- part = MIMEText(error)
+ part = MIMEText('\n'.join(error))
message.attach(part)
# attach the original message to the returned message
+ body = []
+ for header in bounced_message.headers:
+ body.append(header)
try:
bounced_message.rewindbody()
- except IOError, message:
- body.write("*** couldn't include message body: %s ***"
- % bounced_message)
+ except IOError, errmessage:
+ body.append("*** couldn't include message body: %s ***" %
+ errmessage)
else:
- body.write(bounced_message.fp.read())
- part = MIMEText(bounced_message.fp.read())
- part['Content-Disposition'] = 'attachment'
- for header in bounced_message.headers:
- part.write(header)
+ body.append('\n')
+ body.append(bounced_message.fp.read())
+ part = MIMEText(''.join(body))
message.attach(part)
# send
try:
- self.smtp_send(to, str(message))
+ self.smtp_send(to, message.as_string())
except MessageSendError:
# squash mail sending errors when bouncing mail
# TODO this *could* be better, as we could notify admin of the
content = '\n'.join(traceback.format_exception(*sys.exc_info()))
self.standard_message(to, subject, content)
- def smtp_send(self, to, message):
+ def smtp_send(self, to, message, sender=None):
"""Send a message over SMTP, using roundup's config.
Arguments:
- to: a list of addresses usable by rfc822.parseaddr().
- message: a StringIO instance with a full message.
+ - sender: if not 'None', the email address to use as the
+ envelope sender. If 'None', the admin email is used.
"""
+
+ if not sender:
+ sender = self.config.ADMIN_EMAIL
if self.debug:
# don't send - just write to a file
open(self.debug, 'a').write('FROM: %s\nTO: %s\n%s\n' %
- (self.config.ADMIN_EMAIL,
+ (sender,
', '.join(to), message))
else:
# now try to send the message
# send the message as admin so bounces are sent there
# instead of to roundup
smtp = SMTPConnection(self.config)
- smtp.sendmail(self.config.ADMIN_EMAIL, to, message)
+ smtp.sendmail(sender, to, message)
except socket.error, value:
raise MessageSendError("Error: couldn't send email: "
"mailhost %s"%value)
# start the TLS if requested
if config["MAIL_TLS"]:
+ self.ehlo()
self.starttls(config["MAIL_TLS_KEYFILE"],
config["MAIL_TLS_CERTFILE"])