merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -18,6 +18,7 @@ Fixed:
 - allow specification of pagesize, sorting and filtering in "classhelp"
   popups (sf bug 1211800)
 - handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
+- handle missing Subject lines better (sf bug 1198729)
 
 
 2005-05-02 0.8.3

doc/index.txt

@@ -128,6 +128,7 @@ Roy Rapoport,
 John P. Rouillard,
 Ollie Rutherfurd,
 Toby Sargeant,
+Giuseppe Scelsi,
 Gregor Schmid,
 Florian Schulze,
 Klamer Schutte,

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.159.2.4 2005-02-15 23:42:30 richard Exp $
+$Id: mailgw.py,v 1.159.2.5 2005-06-24 06:48:17 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -579,11 +579,21 @@ def handle_message(self, message):
         if message.getheader('x-roundup-loop', ''):
             raise IgnoreLoop
 
+        # handle the subject line
+        subject = message.getheader('subject', '')
+        if not subject:
+            raise MailUsageError, '''
+Emails to Roundup trackers must include a Subject: line!
+'''
+
         # detect Precedence: Bulk, or Microsoft Outlook autoreplies
         if (message.getheader('precedence', '') == 'bulk'
-            or message.getheader('subject', '').lower().find("autoreply") > 0):
+                or subject.lower().find("autoreply") > 0):
             raise IgnoreBulk
 
+        if subject.strip().lower() == 'help':
+            raise MailUsageHelp
+
         # config is used many times in this method.
         # make local variable for easier access
         config = self.instance.config
@@ -609,20 +619,8 @@ def handle_message(self, message):
         if not from_list:
             from_list = message.getaddrlist('from')
 
-        # handle the subject line
-        subject = message.getheader('subject', '')
-
-        if not subject:
-            raise MailUsageError, '''
-Emails to Roundup trackers must include a Subject: line!
-'''
-
-        if subject.strip().lower() == 'help':
-            raise MailUsageHelp
-
-        m = self.subject_re.match(subject)
-
         # check for well-formed subject line
+        m = self.subject_re.match(subject)
         if m:
             # get the classname
             classname = m.group('classname')

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.73.2.1 2005-02-14 05:55:20 richard Exp $
+# $Id: test_mailgw.py,v 1.73.2.2 2005-06-24 06:48:17 richard Exp $
 
 # TODO: test bcc
 
@@ -21,7 +21,7 @@
 SENDMAILDEBUG = os.environ['SENDMAILDEBUG']
 
 from roundup.mailgw import MailGW, Unauthorized, uidFromAddress, \
-    parseContent, IgnoreLoop, IgnoreBulk
+    parseContent, IgnoreLoop, IgnoreBulk, MailUsageError
 from roundup import init, instance, password, rfc2822, __version__
 
 import db_test_base
@@ -1018,6 +1018,18 @@ def testAutoReplyEmailsAreIgnored(self):
 Subject: Re: [issue] Out of office AutoReply: Back next week
 
 Hi, I'm back in the office next week
+''')
+
+    def testNoSubject(self):
+        self.assertRaises(MailUsageError, self._handle_mail,
+            '''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Cc: richard@test
+Reply-To: [email protected]
+Message-Id: <dummy_test_message_id>
+
 ''')
 
 def test_suite():