![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py
index a12948005cad0795429c3bc985b50d65f64a2a8c..5ba6b4512e03952a1b458f36b03053a01392dafc 100644 (file)
--- a/roundup/roundupdb.py
+++ b/roundup/roundupdb.py
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#
-# $Id: roundupdb.py,v 1.139 2008-08-07 06:31:16 richard Exp $
"""Extending hyperdb with types specific to issue-tracking.
"""
__docformat__ = 'restructuredtext'
import re, os, smtplib, socket, time, random
-import cStringIO, base64, quopri, mimetypes
+import cStringIO, base64, mimetypes
import os.path
import logging
-
-from rfc2822 import encode_header
+from email import Encoders
+from email.Utils import formataddr
+from email.Header import Header
+from email.MIMEText import MIMEText
+from email.MIMEBase import MIMEBase
from roundup import password, date, hyperdb
from roundup.i18n import _
# MessageSendError is imported for backwards compatibility
-from roundup.mailer import Mailer, straddr, MessageSendError
+from roundup.mailer import Mailer, MessageSendError, encode_quopri, \
+ nice_sender_header
class Database:
def log_debug(self, msg, *args, **kwargs):
"""Log a message with level DEBUG."""
-
+
logger = self.get_logger()
logger.debug(msg, *args, **kwargs)
-
+
def log_info(self, msg, *args, **kwargs):
"""Log a message with level INFO."""
-
+
logger = self.get_logger()
logger.info(msg, *args, **kwargs)
-
+
def get_logger(self):
"""Return the logger for this database."""
-
+
# Because getting a logger requires acquiring a lock, we want
# to do it only once.
if not hasattr(self, '__logger'):
self.__logger = logging.getLogger('hyperdb')
-
+
return self.__logger
seen_message[recipient] = 1
def add_recipient(userid, to):
- # make sure they have an address
+ """ make sure they have an address """
address = self.db.user.get(userid, 'address')
if address:
to.append(address)
recipients.append(userid)
def good_recipient(userid):
- # Make sure we don't send mail to either the anonymous
- # user or a user who has already seen the message.
+ """ Make sure we don't send mail to either the anonymous
+ user or a user who has already seen the message.
+ Also check permissions on the message if not a system
+ message: A user must have view permission on content and
+ files to be on the receiver list. We do *not* check the
+ author etc. for now.
+ """
+ allowed = True
+ if msgid:
+ for prop in 'content', 'files':
+ if prop in self.db.msg.properties:
+ allowed = allowed and self.db.security.hasPermission(
+ 'View', userid, 'msg', prop, msgid)
return (userid and
(self.db.user.get(userid, 'username') != 'anonymous') and
- not seen_message.has_key(userid))
+ allowed and not seen_message.has_key(userid))
# possibly send the message to the author, as long as they aren't
# anonymous
authaddr = users.get(authid, 'address', '')
if authaddr and self.db.config.MAIL_ADD_AUTHOREMAIL:
- authaddr = " <%s>" % straddr( ('',authaddr) )
+ authaddr = " <%s>" % formataddr( ('',authaddr) )
elif authaddr:
authaddr = ""
if msgid :
for fileid in messages.get(msgid, 'files') :
# check the attachment size
- filename = self.db.filename('file', fileid, None)
- filesize = os.path.getsize(filename)
+ filesize = self.db.filesize('file', fileid, None)
if filesize <= self.db.config.NOSY_MAX_ATTACHMENT_SIZE:
message_files.append(fileid)
else:
if self.db.config.EMAIL_SIGNATURE_POSITION == 'bottom':
m.append(self.email_signature(nodeid, msgid))
- # encode the content as quoted-printable
+ # figure the encoding
charset = getattr(self.db.config, 'EMAIL_CHARSET', 'utf-8')
- m = '\n'.join(m)
- if charset != 'utf-8':
- m = unicode(m, 'utf-8').encode(charset)
- content = cStringIO.StringIO(m)
- content_encoded = cStringIO.StringIO()
- quopri.encode(content, content_encoded, 0)
- content_encoded = content_encoded.getvalue()
+
+ # construct the content and convert to unicode object
+ body = unicode('\n'.join(m), 'utf-8').encode(charset)
# make sure the To line is always the same (for testing mostly)
sendto.sort()
else:
sendto = [sendto]
+ # tracker sender info
+ tracker_name = unicode(self.db.config.TRACKER_NAME, 'utf-8')
+ tracker_name = nice_sender_header(tracker_name, from_address,
+ charset)
+
# now send one or more messages
# TODO: I believe we have to create a new message each time as we
# can't fiddle the recipients in the message ... worth testing
for sendto in sendto:
# create the message
mailer = Mailer(self.db.config)
- message, writer = mailer.get_standard_message(sendto, subject,
- author)
+
+ message = mailer.get_standard_message(sendto, subject, author,
+ multipart=message_files)
# set reply-to to the tracker
- tracker_name = self.db.config.TRACKER_NAME
- if charset != 'utf-8':
- tracker = unicode(tracker_name, 'utf-8').encode(charset)
- tracker_name = encode_header(tracker_name, charset)
- writer.addheader('Reply-To', straddr((tracker_name, from_address)))
+ message['Reply-To'] = tracker_name
# message ids
if messageid:
- writer.addheader('Message-Id', messageid)
+ message['Message-Id'] = messageid
if inreplyto:
- writer.addheader('In-Reply-To', inreplyto)
+ message['In-Reply-To'] = inreplyto
# Generate a header for each link or multilink to
# a class that has a name attribute
continue
values = [cl.get(v, 'name') for v in values]
values = ', '.join(values)
- writer.addheader("X-Roundup-%s-%s" % (self.classname, propname),
- values)
+ header = "X-Roundup-%s-%s"%(self.classname, propname)
+ try:
+ message[header] = values.encode('ascii')
+ except UnicodeError:
+ message[header] = Header(values, charset)
+
if not inreplyto:
# Default the reply to the first message
msgs = self.get(nodeid, 'messages')
if msgs and msgs[0] != nodeid:
inreplyto = messages.get(msgs[0], 'messageid')
if inreplyto:
- writer.addheader('In-Reply-To', inreplyto)
+ message['In-Reply-To'] = inreplyto
# attach files
if message_files:
- part = writer.startmultipartbody('mixed')
- part = writer.nextpart()
- part.addheader('Content-Transfer-Encoding', 'quoted-printable')
- body = part.startbody('text/plain; charset=%s'%charset)
- body.write(content_encoded)
+ # first up the text as a part
+ part = MIMEText(body)
+ encode_quopri(part)
+ message.attach(part)
+
for fileid in message_files:
name = files.get(fileid, 'name')
mime_type = files.get(fileid, 'type')
content = files.get(fileid, 'content')
- part = writer.nextpart()
if mime_type == 'text/plain':
- part.addheader('Content-Disposition',
- 'attachment;\n filename="%s"'%name)
try:
content.decode('ascii')
except UnicodeError:
# the content cannot be 7bit-encoded.
# use quoted printable
- part.addheader('Content-Transfer-Encoding',
- 'quoted-printable')
- body = part.startbody('text/plain')
- body.write(quopri.encodestring(content))
+ # XXX stuffed if we know the charset though :(
+ part = MIMEText(content)
+ encode_quopri(part)
else:
- part.addheader('Content-Transfer-Encoding', '7bit')
- body = part.startbody('text/plain')
- body.write(content)
+ part = MIMEText(content)
+ part['Content-Transfer-Encoding'] = '7bit'
else:
# some other type, so encode it
if not mime_type:
mime_type = mimetypes.guess_type(name)[0]
if mime_type is None:
mime_type = 'application/octet-stream'
- part.addheader('Content-Disposition',
- 'attachment;\n filename="%s"'%name)
- part.addheader('Content-Transfer-Encoding', 'base64')
- body = part.startbody(mime_type)
- body.write(base64.encodestring(content))
- writer.lastpart()
+ main, sub = mime_type.split('/')
+ part = MIMEBase(main, sub)
+ part.set_payload(content)
+ Encoders.encode_base64(part)
+ part['Content-Disposition'] = 'attachment;\n filename="%s"'%name
+ message.attach(part)
+
else:
- writer.addheader('Content-Transfer-Encoding',
- 'quoted-printable')
- body = writer.startbody('text/plain; charset=%s'%charset)
- body.write(content_encoded)
+ message.set_payload(body)
+ encode_quopri(message)
if first:
- mailer.smtp_send(sendto + bcc_sendto, message)
+ mailer.smtp_send(sendto + bcc_sendto, message.as_string())
else:
- mailer.smtp_send(sendto, message)
+ mailer.smtp_send(sendto, message.as_string())
first = False
def email_signature(self, nodeid, msgid):
web = base + self.classname + nodeid
# ensure the email address is properly quoted
- email = straddr((self.db.config.TRACKER_NAME,
+ email = formataddr((self.db.config.TRACKER_NAME,
self.db.config.TRACKER_EMAIL))
line = '_' * max(len(web)+2, len(email))