Mercurial Repository: p/roundup/code: roundup/mailgw.py comparison

comparison roundup/mailgw.py @ 3813:23470ece29de

Modified subject line parser in mail gateway. Tries to be more forgiving and allows both multiple Re/Ang/Sv and [mailing-list-id].

author	Erik Forsberg <forsberg@users.sourceforge.net>
date	Sun, 28 Jan 2007 13:49:21 +0000
parents	ccd55dc53410
children	2b63b1689cef

comparison

equal deleted inserted replaced

-:27b589d3b79d
+:23470ece29de
 set() method to add the message to the item's spool; in the second case we
 are calling the create() method to create a new node). If an auditor raises
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
-$Id: mailgw.py,v 1.182 2007-01-21 18:08:31 forsberg Exp $
+$Id: mailgw.py,v 1.183 2007-01-28 13:49:13 forsberg Exp $
 """
 __docformat__ = 'restructuredtext'
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
 import time, random, sys, logging
 #                    nodeid = issue.group('nodeid')
 #                    break
 # Matches subjects like:
 # Re: "[issue1234] title of issue [status=resolved]"
-open, close = config['MAILGW_SUBJECT_SUFFIX_DELIMITERS']
-delim_open = re.escape(open)
+tmpsubject = subject # We need subject untouched for later use
+# in error messages
+sd_open, sd_close = config['MAILGW_SUBJECT_SUFFIX_DELIMITERS']
+delim_open = re.escape(sd_open)
 if delim_open in '[(': delim_open = '\\' + delim_open
-delim_close = re.escape(close)
+delim_close = re.escape(sd_close)
 if delim_close in '[(': delim_close = '\\' + delim_close
-subject_re = r'''
-(?P<refwd>\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W\s*)*\s*   # Re:
+matches = dict.fromkeys(['refwd', 'quote', 'classname',
-(?P<quote>")?                                 # Leading "
+'nodeid', 'title', 'args',
-(%s(?P<classname>[^\d\s]+)                    # [issue..
+'argswhole'])
-(?P<nodeid>\d+)?                           # ..1234]
-%s)?\s*
-(?P<title>[^%s]+)?                             # issue title
+# Look for Re: et. al. Used later on for MAILGW_SUBJECT_CONTENT_MATCH
-"?                                            # Trailing "
+re_re = r'''(?P<refwd>(\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W)+)\s*'''
-(?P<argswhole>%s(?P<args>.+?)%s)?             # [prop=value]
+m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE)
-'''%(delim_open, delim_close, delim_open, delim_open, delim_close)
+if m:
-subject_re = re.compile(subject_re, re.IGNORECASE|re.VERBOSE)
+matches.update(m.groupdict())
+tmpsubject = tmpsubject[len(matches['refwd']):] # Consume Re:
+# Look for Leading "
+m = re.match(r'''(?P<quote>\s*")''', tmpsubject,
+re.IGNORECASE|re.VERBOSE)
+if m:
+matches.update(m.groupdict())
+tmpsubject = tmpsubject[len(matches['quote']):] # Consume quote
+class_re = r'''%s(?P<classname>(%s))+(?P<nodeid>\d+)?%s''' % \
+(delim_open, "|".join(self.db.getclasses()), delim_close)
+# Note: re.search, not re.match as there might be garbage
+# (mailing list prefix, etc.) before the class identifier
+m = re.search(class_re, tmpsubject, re.IGNORECASE|re.VERBOSE)
+if m:
+matches.update(m.groupdict())
+# Skip to the end of the class identifier, including any
+# garbage before it.
+tmpsubject = tmpsubject[m.end():]
+m = re.match(r'''(?P<title>[^%s]+)''' % delim_open, tmpsubject,
+re.IGNORECASE|re.VERBOSE)
+if m:
+matches.update(m.groupdict())
+tmpsubject = tmpsubject[len(matches['title']):] # Consume title
+args_re = r'''(?P<argswhole>%s(?P<args>.+?)%s)?''' % (delim_open, delim_close)
+m = re.search(args_re, tmpsubject, re.IGNORECASE|re.VERBOSE)
+if m:
+matches.update(m.groupdict())
 # figure subject line parsing modes
 pfxmode = config['MAILGW_SUBJECT_PREFIX_PARSING']
 sfxmode = config['MAILGW_SUBJECT_SUFFIX_PARSING']
-# check for well-formed subject line
+# check for registration OTK
-m = subject_re.match(subject)
+# or fallback on the default class
-if m:
+if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
-# check for registration OTK
+otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
-# or fallback on the default class
+otk = otk_re.search(matches['title'] or '')
-if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+if otk:
-otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
+self.db.confirm_registration(otk.group('otk'))
-otk = otk_re.search(m.group('title') or '')
+subject = 'Your registration to %s is complete' % \
-if otk:
+config['TRACKER_NAME']
-self.db.confirm_registration(otk.group('otk'))
+sendto = [from_list[0][1]]
-subject = 'Your registration to %s is complete' % \
+self.mailer.standard_message(sendto, subject, '')
-config['TRACKER_NAME']
+return
-sendto = [from_list[0][1]]
+# get the classname
-self.mailer.standard_message(sendto, subject, '')
+if pfxmode == 'none':
-return
+classname = None
-# get the classname
+else:
-if pfxmode == 'none':
+classname = matches['classname']
-classname = None
+if classname is None:
+if self.default_class:
+classname = self.default_class
 else:
-classname = m.group('classname')
+classname = config['MAILGW_DEFAULT_CLASS']
-if classname is None:
+if not classname:
-if self.default_class:
+# fail
-classname = self.default_class
+m = None
-else:
-classname = config['MAILGW_DEFAULT_CLASS']
+if not classname and pfxmode == 'strict':
-if not classname:
-# fail
-m = None
-if not m and pfxmode == 'strict':
 raise MailUsageError, _("""
 The message you sent to roundup did not contain a properly formed subject
 line. The subject must contain a class name or designator to indicate the
 'topic' of the message. For example:
 Subject: [issue] This is a new issue
 # get the optional nodeid
 if pfxmode == 'none':
 nodeid = None
 else:
-nodeid = m.group('nodeid')
+nodeid = matches['nodeid']
 # try in-reply-to to match the message if there's no nodeid
 inreplyto = message.getheader('in-reply-to') or ''
 if nodeid is None and inreplyto:
 l = self.db.getclass('msg').stringFind(messageid=inreplyto)
 if l:
 nodeid = cl.filter(None, {'messages':l})[0]
 # title is optional too
-title = m.group('title')
+title = matches['title']
 if title:
 title = title.strip()
 else:
 title = ''
 # strip off the quotes that dumb emailers put around the subject, like
 #      Re: "[issue1] bla blah"
-if m.group('quote') and title.endswith('"'):
+if matches['quote'] and title.endswith('"'):
 title = title[:-1]
 # but we do need either a title or a nodeid...
 if nodeid is None and not title:
 raise MailUsageError, _("""
 # use the _last_ one matched (since that'll _usually_ be the most
 # recent...). The subject_content_match config may specify an
 # additional restriction based on the matched node's creation or
 # activity.
 tmatch_mode = config['MAILGW_SUBJECT_CONTENT_MATCH']
-if tmatch_mode != 'never' and nodeid is None and m.group('refwd'):
+if tmatch_mode != 'never' and nodeid is None and matches['refwd']:
 l = cl.stringFind(title=title)
 limit = None
 if (tmatch_mode.startswith('creation') or
 tmatch_mode.startswith('activity')):
 limit, interval = tmatch_mode.split(' ', 1)
 # handle the subject argument list
 #
 # figure what the properties of this Class are
 properties = cl.getprops()
 props = {}
-args = m.group('args')
+args = matches['args']
-argswhole = m.group('argswhole')
+argswhole = matches['argswhole']
 if args:
 if sfxmode == 'none':
 title += ' ' + argswhole
 else:
 errors, props = setPropArrayFromString(self, cl, args, nodeid)

Mercurial > p > roundup > code

comparison roundup/mailgw.py @ 3813:23470ece29de