merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -19,7 +19,7 @@ Fixed:
   popups (sf bug 1211800)
 - handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
 - handle missing Subject lines better (sf bug 1198729)
-- sort/group by missing values correctly (sf bug 1198623)
+- sort/group by missing values correctly (sf bugs 1198623, 1176897)
 - discard, don't bounce messages to the mailgw when the messages's sender
   is invalid (ie. when we try to bounce, we get a 550 "unknown user
   account" response from the SMTP server) (sf bug 1190906)

doc/index.txt

@@ -151,6 +151,7 @@ Martin Uzak,
 Darryl VanDorp,
 J Vickroy,
 William (Wilk),
+Matt Wilbert,
 Chris Withers.
 
 

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.5 2005-06-24 06:48:17 richard Exp $
+$Id: mailgw.py,v 1.159.2.6 2005-06-24 07:17:08 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -81,7 +81,7 @@ class node. Any parts of other types are each stored in separate files
 import traceback, MimeWriter, rfc822
 
 from roundup import hyperdb, date, password, rfc2822, exceptions
-from roundup.mailer import Mailer
+from roundup.mailer import Mailer, MessageSendError
 
 SENDMAILDEBUG = os.environ.get('SENDMAILDEBUG', '')
 
@@ -546,7 +546,19 @@ def handle_Message(self, message):
             # just inform the user that he is not authorized
             m = ['']
             m.append(str(value))
-            self.mailer.bounce_message(message, [sendto[0][1]], m)
+            try:
+                self.mailer.bounce_message(message, [sendto[0][1]], m)
+            except MessageSendError, error:
+                # if the only reason the bounce failed is because of
+                # invalid addresses to bounce the message back to, then
+                # just discard the message - it's just not worth bothering
+                # with (most likely spam / otherwise forged)
+                invalid = True
+                for address, (code, reason) in error.keys():
+                    if code != 550:
+                        invalid = False
+                if not invalid:
+                    raise
         except IgnoreMessage:
             # do not take any action
             # this exception is thrown when email should be ignored