More bounce recognition improvements.

6 files changed, 336 insertions, 4 deletions

diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index 068dc45c..bd7124b6 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -88,7 +88,7 @@ PATTERNS = [
      _c('--- Original message follows\.'),
      _c('<(?P<addr>[^>]*)>:')),
     # googlemail.com
-    (_c('Delivery to the following recipient failed'),
+    (_c('Delivery to the following recipient(s)? failed'),
      _c('----- Original message -----'),
      _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
     # kundenserver.de, mxlogic.net
@@ -99,13 +99,13 @@ PATTERNS = [
     (_c('A message that you( have)? sent could not be delivered'),
      _c('^---'),
      _c('^(?P<addr>[^\s@]+@[^\s@:]+):')),
-    # thehartford.com
-    (_c('Delivery to the following recipients failed'),
+    # thehartford.com and amenworld.com
+    (_c('Del(i|e)very to the following recipient(s)? (failed|was aborted)'),
      # this one may or may not have the original message, but there's nothing
      # unique to stop on, so stop on the first line of at least 3 characters
      # that doesn't start with 'D' (to not stop immediately) and has no '@'.
      _c('^[^D][^@]{2,}$'),
-     _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
+     _c('^\s*(. )?(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
     # and another thehartfod.com/hartfordlife.com
     (_c('^Your message\s*$'),
      _c('^because:'),
diff --git a/tests/bounces/simple_30.txt b/tests/bounces/simple_30.txt
new file mode 100644
index 00000000..3f4293d7
--- /dev/null
+++ b/tests/bounces/simple_30.txt
@@ -0,0 +1,72 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from rs-so-b2.amenworld.com (rs-so-b2.amenworld.com [62.193.206.27])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k9H6S7E3014456
+	for <gpc-talk-bounces@grizz.org>; Mon, 16 Oct 2006 23:28:07 -0700
+Received: from av3.amenworld.com (av3.amenworld.com [62.193.206.46])
+	by rs-so-b2.amenworld.com (Postfix) with ESMTP id 93A72655806
+	for <gpc-talk-bounces@grizz.org>; Tue, 17 Oct 2006 08:33:33 +0200 (CEST)
+Date: Tue, 17 Oct 2006 08:27:49 +0200
+From: Mail Delivery System <Mail.Delivery.System@sb7.songbird.com>
+To: gpc-talk-bounces@grizz.org
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+	boundary="------------I305M09060309060P_013011610664690"
+Message-Id: <20061017063333.93A72655806@rs-so-b2.amenworld.com>
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_013011610664690
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+      This is an automatically generated Delivery Status Notification.      
+
+Delivery to the following recipients failed permanently:
+
+   * wmnqicorpat@nqicorp.com
+
+
+============================================================================
+                             Technical details:                             
+
+SMTP:RCPT host 62.193.203.102: 553 5.3.0 <wmnqicorpat@nqicorp.com>... No such user here
+
+
+============================================================================
+
+
+--------------I305M09060309060P_013011610664690
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k9H62Ktt011069
+	for <wmnqicorpat@nqicorp.com>; Mon, 16 Oct 2006 23:02:20 -0700
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: wmnqicorpat@nqicorp.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============0123257981=="
+Message-ID: <mailman.10165.1161064939.1567.gpc-talk@grizz.org>
+Date: Mon, 16 Oct 2006 23:02:19 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+--------------I305M09060309060P_013011610664690--
+
diff --git a/tests/bounces/simple_31.txt b/tests/bounces/simple_31.txt
new file mode 100644
index 00000000..94b229da
--- /dev/null
+++ b/tests/bounces/simple_31.txt
@@ -0,0 +1,106 @@
+Return-Path: <>
+Received: from rs-so-b1.amenworld.com (rs-so-b1.amenworld.com [62.193.206.26])
+	by alan.rezo.net (Postfix) with ESMTP id 0E7913B02A3
+	for <immigration.jetable-bounces@rezo.net>;
+	Fri, 20 Jun 2008 20:24:00 +0200 (CEST)
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+	by rs-so-b1.amenworld.com (Postfix) with ESMTP id 5A7EA55884
+	for <immigration.jetable-bounces@rezo.net>;
+	Fri, 20 Jun 2008 20:38:06 +0200 (CEST)
+Date: Fri, 20 Jun 2008 20:23:54 +0200
+From: Mail Delivery System <>
+To: immigration.jetable-bounces@rezo.net
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+	boundary="------------I305M09060309060P_788012139862340"
+Message-Id: <20080620183806.5A7EA55884@rs-so-b1.amenworld.com>
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_788012139862340
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+      This is an automatically generated Delivery Status Notification.      
+
+Delivery to the following recipients failed permanently:
+
+   * nmorel@actisce.fr
+
+
+
+--------------I305M09060309060P_788012139862340
+Content-Type: message/delivery-status; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+
+Reporting-MTA: dns; av2.amenworld.com [62.193.206.40]
+Received-From-MTA: dns; alan.rezo.net [217.24.84.2]
+Arrival-Date: Fri, 20 Jun 2008 20:23:54 +0200
+
+--------------I305M09060309060P_788012139862340
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1])
+	by alan.rezo.net (Postfix) with ESMTP id 5BC1D3B02BC;
+	Fri, 20 Jun 2008 20:23:58 +0200 (CEST)
+Received: from localhost (localhost.rezo.net [127.0.0.1])
+	by alan.rezo.net (Postfix) with ESMTP id AB2183B02BE
+	for <immigration.jetable@rezo.net>;
+	Fri, 20 Jun 2008 20:23:54 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at rezo.net
+X-Spam-Score: 0.66
+X-Spam-Level: 
+X-Spam-Status: No, score=0.66 tagged_above=-100 required=5 tests=[AWL=-0.507, 
+	BAYES_00=-2.599, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_POST=1.708,
+	HTML_50_60=0.134, HTML_MESSAGE=0.001, SUBJECT_ENCODED_TWICE=1.723]
+Received: from alan.rezo.net ([127.0.0.1])
+	by localhost (alan.rezo.net [127.0.0.1]) (amavisd-new, port 10024)
+	with LMTP id jkfSPXMXefwG for <immigration.jetable@rezo.net>;
+	Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
+Received: from neuf-infra-smtp-out-sp604006av.neufgp.fr
+	(neuf-infra-smtp-out-sp604006av.neufgp.fr [84.96.92.121])
+	by alan.rezo.net (Postfix) with ESMTP id 6FD2D3B02A3
+	for <immigration.jetable@rezo.net>;
+	Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
+Received: from neuf-infra-smtp-out-sp604001av.neufgp.fr ([10.110.56.120])
+	by neuf-infra-smtp-out-sp604006av.neufgp.fr with neuf telecom
+	id g8W91Z0022bdnoS06JPk5X; Fri, 20 Jun 2008 20:23:45 +0200
+Received: from [192.168.1.2] ([84.101.242.132])
+	by neuf-infra-smtp-out-sp604001av.neufgp.fr with neuf telecom
+	id gJPk1Z00R2s6HG401JPk5j; Fri, 20 Jun 2008 20:23:45 +0200
+Mime-Version: 1.0 (Apple Message framework v753.1)
+To: "Liste de travail du collectif Uni(e)s contre une immigration jetable"
+	<immigration.jetable@rezo.net>
+Message-Id: <8EB18665-4233-4916-9E9C-29D6039167BA@wanadoo.fr>
+References: <559327.5591.qm@web25704.mail.ukl.yahoo.com>
+From: Stephen Suffern <suffern.avocat@wanadoo.fr>
+Date: Fri, 20 Jun 2008 20:23:43 +0200
+X-Mailer: Apple Mail (2.753.1)
+Subject: [Immigration.jetable] =?iso-8859-1?q?Fwd=3A_=5BGisti-membres=5D_P?=
+	=?iso-8859-1?q?lainte_du_Minist=E8re_de_l=27Int=E9rieur_contre_le_collect?=
+	=?iso-8859-1?q?if_de_soutien_aux_sans_papiers_de_RENNES?=
+X-BeenThere: immigration.jetable@rezo.net
+X-Mailman-Version: 2.1.11rc1
+Precedence: list
+Reply-To: "Liste de travail du collectif Uni\(e\)s contre une immigration
+	jetable" <immigration.jetable@rezo.net>
+List-Id: "Liste de travail du collectif Uni\(e\)s contre une immigration
+	jetable" <immigration.jetable.rezo.net>
+List-Unsubscribe: <http://listes.rezo.net/mailman/options/immigration.jetable>, 
+	<mailto:immigration.jetable-request@rezo.net?subject=unsubscribe>
+List-Archive: <http://listes.rezo.net/mailman/private/immigration.jetable>
+List-Post: <mailto:immigration.jetable@rezo.net>
+List-Help: <mailto:immigration.jetable-request@rezo.net?subject=help>
+List-Subscribe: <http://listes.rezo.net/mailman/listinfo/immigration.jetable>, 
+	<mailto:immigration.jetable-request@rezo.net?subject=subscribe>
+Content-Type: multipart/mixed; boundary="===============1384174044=="
+Sender: immigration.jetable-bounces@rezo.net
+Errors-To: immigration.jetable-bounces@rezo.net
+
+
+
+--------------I305M09060309060P_788012139862340--
+
diff --git a/tests/bounces/simple_32.txt b/tests/bounces/simple_32.txt
new file mode 100644
index 00000000..be040178
--- /dev/null
+++ b/tests/bounces/simple_32.txt
@@ -0,0 +1,77 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from rs-so-b2.amenworld.com (rs-so-b2.amenworld.com [62.193.206.27])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k9JJA48E031825
+	for <gpc-talk-bounces@grizz.org>; Thu, 19 Oct 2006 12:10:04 -0700
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+	by rs-so-b2.amenworld.com (Postfix) with ESMTP id A928C65499F
+	for <gpc-talk-bounces@grizz.org>; Thu, 19 Oct 2006 21:15:48 +0200 (CEST)
+Date: Thu, 19 Oct 2006 21:09:45 +0200
+From: Mail Delivery System <Mail.Delivery.System@sb7.songbird.com>
+To: gpc-talk-bounces@grizz.org
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+	boundary="------------I305M09060309060P_160911612849850"
+Message-Id: <20061019191548.A928C65499F@rs-so-b2.amenworld.com>
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_160911612849850
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+      This is an automatically generated Delivery Status Notification.      
+
+Delevery to the following recipients was aborted after 5.0 hour(s):
+
+  * teteyn@agence-forbin.com
+
+
+============================================================================
+                             Technical details:                             
+
+Routing: Could not find a gateway for teteyn@agence-forbin.com
+
+
+============================================================================
+
+
+--------------I305M09060309060P_160911612849850
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com ([208.184.79.137])
+	by av2.amenworld.com with AMEN
+	id c6tn1V00i2xlHa80000000
+	for teteyn@agence-forbin.com; Thu, 19 Oct 2006 08:53:57 +0200
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k9J6rxFD032578
+	for <teteyn@agence-forbin.com>; Wed, 18 Oct 2006 23:53:59 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: teteyn@agence-forbin.com
+Message-ID: <mailman.27302.1161240838.1568.gpc-talk@grizz.org>
+Date: Wed, 18 Oct 2006 23:53:58 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+--------------I305M09060309060P_160911612849850--
+
diff --git a/tests/bounces/simple_33.txt b/tests/bounces/simple_33.txt
new file mode 100644
index 00000000..291cbe61
--- /dev/null
+++ b/tests/bounces/simple_33.txt
@@ -0,0 +1,73 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from rs-so-b1.amenworld.com (rs-so-b1.amenworld.com [62.193.206.26])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	kBH8s3Gg013386
+	for <wed_ride-bounces@grizz.org>; Sun, 17 Dec 2006 00:54:04 -0800
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+	by rs-so-b1.amenworld.com (Postfix) with ESMTP id A808154655
+	for <wed_ride-bounces@grizz.org>; Sun, 17 Dec 2006 09:55:47 +0100 (CET)
+Date: Sun, 17 Dec 2006 09:53:50 +0100
+From: Mail Delivery System <Mail.Delivery.System@sb7.songbird.com>
+To: wed_ride-bounces@grizz.org
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+	boundary="------------I305M09060309060P_699011663456300"
+Message-Id: <20061217085547.A808154655@rs-so-b1.amenworld.com>
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_699011663456300
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+      This is an automatically generated Delivery Status Notification.      
+
+Delevery to the following recipients failed permanently:
+
+   * hmu@extralumin.com
+
+
+============================================================================
+                             Technical details:                             
+
+SMTP:RCPT host 62.193.203.20: 553 5.3.0 <hmu@extralumin.com>... No such user here
+
+
+============================================================================
+
+
+--------------I305M09060309060P_699011663456300
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id kBH8rlWO013350
+	for <hmu@extralumin.com>; Sun, 17 Dec 2006 00:53:47 -0800
+Subject: reconstitute
+From: wed_ride-owner@grizz.org
+To: hmu@extralumin.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1426064790=="
+Message-ID: <mailman.39762.1166345626.1568.wed_ride@grizz.org>
+Date: Sun, 17 Dec 2006 00:53:46 -0800
+Precedence: bulk
+X-BeenThere: wed_ride@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: GPC Wednesday Ride List <wed_ride.grizz.org>
+X-List-Administrivia: yes
+Sender: wed_ride-bounces@grizz.org
+Errors-To: wed_ride-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: wed_ride-bounces@grizz.org
+
+--------------I305M09060309060P_699011663456300--
+
+
diff --git a/tests/test_bounces.py b/tests/test_bounces.py
index f9b2fdc9..ae28161c 100644
--- a/tests/test_bounces.py
+++ b/tests/test_bounces.py
@@ -67,6 +67,10 @@ class BounceTest(unittest.TestCase):
         ('SimpleMatch', 'simple_26.txt', ['reilizavet@lar.ieo.it']),
         ('SimpleMatch', 'simple_27.txt', ['kulp@webmail.pla.net.py']),
         ('SimpleMatch', 'simple_29.txt', ['thilakayi_bing@landshire.com']),
+        ('SimpleMatch', 'simple_30.txt', ['wmnqicorpat@nqicorp.com']),
+        ('SimpleMatch', 'simple_31.txt', ['nmorel@actisce.fr']),
+        ('SimpleMatch', 'simple_32.txt', ['teteyn@agence-forbin.com']),
+        ('SimpleMatch', 'simple_33.txt', ['hmu@extralumin.com']),
         ('SimpleMatch', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']),
         ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']),
         # SimpleWarning