Added bounce tests. Updated bounce recognizers to pick up a few more.

1 files changed, 311 insertions, 0 deletions

diff --git a/tests/bounces/dsn_13.txt b/tests/bounces/dsn_13.txt
new file mode 100644
index 00000000..c9156f3a
--- /dev/null
+++ b/tests/bounces/dsn_13.txt
@@ -0,0 +1,311 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from smtp.cardhealth.com (smtp.cardhealth.com [12.20.127.122])
+	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2MKk3oC010630
+	(version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL)
+	for <wed_ride-bounces@grizz.org>; Wed, 22 Mar 2006 12:46:04 -0800
+Received: from dubconn01.cahapps.net ([143.98.158.201])
+	by smtp.cardhealth.com with ESMTP; 22 Mar 2006 15:45:25 -0500
+X-IronPort-AV: i="4.03,119,1141621200"; 
+	d="scan'208,217"; a="85182036:sNHT4636551304"
+Content-Type: multipart/mixed; boundary="54yQd.43vjuhqdb.1v2/Po.1DfUMdh"
+thread-index: AcZN8UUquG7RRuNcRMi8iWyyngQ2bQ==
+Importance: normal
+Priority: normal
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1506
+From: <postmaster@cardinal.com>
+To: <wed_ride-bounces@grizz.org>
+Date: Wed, 22 Mar 2006 15:43:26 -0500
+MIME-Version: 1.0
+X-DSNContext: 335a7efd - 4460 - 00000001 - 80040546
+Message-ID: <yORps7Tdj00009030@DUBCONN01.cahapps.net>
+Subject: Delivery Status Notification (Failure)
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+--54yQd.43vjuhqdb.1v2/Po.1DfUMdh
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Class: urn:content-classes:message
+Content-Type: multipart/report;
+	boundary="9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp";
+	report-type=delivery-status
+
+--9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain;
+	charset="unicode-1-1-utf-7"
+
+This is an automatically generated Delivery Status Notification.
+
+Delivery to the following recipients failed.
+
+       marcooherbst@cardinal.com
+
+
+
+
+--9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp
+Content-Transfer-Encoding: 7bit
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns;DUBCONN01.cahapps.net
+Received-From-MTA: dns;smtp.cardhealth.com
+Arrival-Date: Wed, 22 Mar 2006 15:43:26 -0500
+
+Final-Recipient: rfc822;marcooherbst@cardinal.com
+Action: failed
+Status: 5.1.1
+
+--9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp
+Content-Transfer-Encoding: 7bit
+Content-Type: message/rfc822
+
+thread-index: AcZN8UUmtkmHCxAbRoiJEsv5oNLqjQ==
+Content-Transfer-Encoding: 7bit
+Content-Class: urn:content-classes:message
+Importance: normal
+Priority: normal
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1506
+Received: from smtp.cardhealth.com ([143.98.167.31]) by DUBCONN01.cahapps.net
+	with Microsoft SMTPSVC(5.0.2195.6713);
+	Wed, 22 Mar 2006 15:43:26 -0500
+Received: from sb7.songbird.com ([208.184.79.137]) by smtp.cardhealth.com with
+	ESMTP/TLS/AES256-SHA; 22 Mar 2006 15:43:09 -0500
+X-BrightmailFiltered: true
+X-Brightmail-Tracker: AAAAAQAAA+k=
+X-IronPort-AV: i="4.03,119,1141621200"; d="scan'208,217";
+	a="85180828:sNHT33494874"
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1]) by
+	sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2MKhO3d010225
+	for <marcooherbst@cardinal.com>; Wed, 22 Mar 2006 12:43:24 -0800
+Subject: Re: Duhod86 news
+From: <wed_ride-owner@grizz.org>
+To: <marcooherbst@cardinal.com>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="===============0094818700=="
+Message-ID: <mailman.8262.1143060203.1568.wed_ride@grizz.org>
+Date: Wed, 22 Mar 2006 12:43:23 -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
+Return-Path: <wed_ride-bounces@grizz.org>
+X-OriginalArrivalTime: 22 Mar 2006 20:43:26.0876 (UTC)
+	FILETIME=[451F15C0:01C64DF1]
+
+This is a multi-part message in MIME format.
+
+--===============0094818700==
+Content-Type: text/plain;
+	charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+You are not allowed to post to this mailing list, and your message has
+been automatically rejected.  If you think that your messages are
+being rejected in error, contact the mailing list owner at
+wed_ride-owner@grizz.org.
+
+
+--===============0094818700==
+Content-Transfer-Encoding: 7bit
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <marcooherbst@cardinal.com>
+Received: from cardinal.com (co-217-129-109-80.netvisao.pt [217.129.109.80]
+	(may be forged))
+	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2MKhEj4010189
+	for <wed_ride@grizz.org>; Wed, 22 Mar 2006 12:43:15 -0800
+Message-ID: <000001c64df1$1d48df90$4eb2a8c0@pzi68>
+Reply-To: "Marco Herbst" <marcooherbst@cardinal.com>
+From: "Marco Herbst" <marcooherbst@cardinal.com>
+To: wed_ride@grizz.org
+Subject: Re: Duhod86 news
+Date: Wed, 22 Mar 2006 15:42:20 -0500
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C64DC7.3472D790"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: marcooherbst@cardinal.com
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0001_01C64DC7.3472D790
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+=20
+d C w I w A g L u I d S
+z V l A l L b I w U b M
+e V x I n A x G w R u A
+=20
+B qb uy your z M d e r d f i w c u a t t b i r o w n o sh nline at half
+r p c r y i a c p e http://www.seterekever.com
+<http://www.seterekever.com>=20
+
+------=_NextPart_000_0001_01C64DC7.3472D790
+Content-Type: text/html;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Dus-ascii">
+<META content=3D"MSHTML 6.00.2800.1106" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
+<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
+float
+:right
+"> d </SPAN>C<SPAN style=3D"
+float
+:right
+"> w </SPAN>I<SPAN style=3D"
+float
+:right
+"> w </SPAN>A<SPAN style=3D"
+float
+:right
+"> g </SPAN>L<SPAN style=3D"
+float
+:right
+"> u </SPAN>I<SPAN style=3D"
+float
+:right
+"> d </SPAN>S</FONT></DIV>
+<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
+float
+:right
+"> z </SPAN>V<SPAN style=3D"
+float
+:right
+"> l </SPAN>A<SPAN style=3D"
+float
+:right
+"> l </SPAN>L<SPAN style=3D"
+float
+:right
+"> b </SPAN>I<SPAN style=3D"
+float
+:right
+"> w </SPAN>U<SPAN style=3D"
+float
+:right
+"> b </SPAN>M</FONT></DIV>
+<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
+float
+:right
+"> e </SPAN>V<SPAN style=3D"
+float
+:right
+"> x </SPAN>I<SPAN style=3D"
+float
+:right
+"> n </SPAN>A<SPAN style=3D"
+float
+:right
+"> x </SPAN>G<SPAN style=3D"
+float
+:right
+"> w </SPAN>R<SPAN style=3D"
+float
+:right
+"> u </SPAN>A</FONT></DIV>
+<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
+<DIV><FONT face=3DArial size=3D2>B<SPAN style=3D"
+float
+:right
+"> qb </SPAN>uy your <SPAN style=3D"
+float
+:right
+"> z </SPAN>M<SPAN style=3D"
+float
+:right
+"> d </SPAN>e<SPAN style=3D"
+float
+:right
+"> r </SPAN>d<SPAN style=3D"
+float
+:right
+"> f </SPAN>i<SPAN style=3D"
+float
+:right
+"> w </SPAN>c<SPAN style=3D"
+float
+:right
+"> u </SPAN>a<SPAN style=3D"
+float
+:right
+"> t </SPAN>t<SPAN style=3D"
+float
+:right
+"> b </SPAN>i<SPAN style=3D"
+float
+:right
+"> r </SPAN>o<SPAN style=3D"
+float
+:right
+"> w </SPAN>n o<SPAN style=3D"
+float
+:right
+"> sh </SPAN>nline at half <SPAN style=3D"
+float
+:right
+"> r </SPAN>p<SPAN style=3D"
+float
+:right
+"> c </SPAN>r<SPAN style=3D"
+float
+:right
+"> y </SPAN>i<SPAN style=3D"
+float
+:right
+"> a </SPAN>c<SPAN style=3D"
+float
+:right
+"> p </SPAN>e <A href=3D"http://www.seterekever.com"><FONT face=3DArial =
+size=3D2>http://www.seterekever.com</FONT></A></FONT></DIV></BODY></HTML>
+------=_NextPart_000_0001_01C64DC7.3472D790--
+
+
+
+
+--===============0094818700==--
+
+
+--9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp--
+--54yQd.43vjuhqdb.1v2/Po.1DfUMdh
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+
+Working together.  For life.(sm)
+_________________________________________________
+
+This message is for the designated recipient only and may contain privilege=
+d, proprietary, or otherwise private information. If you have received it i=
+n error, please notify the sender immediately and delete the original. Any =
+other use of the email by you is prohibited.
+
+Dansk - Deutsch - Espanol - Francais - Italiano - Japanese - Nederlands - N=
+orsk - Portuguese - Svenska: www.cardinalhealth.com/legal/email
+--54yQd.43vjuhqdb.1v2/Po.1DfUMdh--