diff options
| -rw-r--r-- | Mailman/Bouncers/SimpleMatch.py | 4 | ||||
| -rw-r--r-- | Mailman/Bouncers/SimpleWarning.py | 6 | ||||
| -rw-r--r-- | tests/bounces/simple_35.txt | 88 | ||||
| -rw-r--r-- | tests/bounces/simple_36.txt | 61 | ||||
| -rw-r--r-- | tests/test_bounces.py | 2 |
5 files changed, 160 insertions, 1 deletions
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index 67e3a7f8..a6a952a2 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -170,6 +170,10 @@ PATTERNS = [ (_c('The following recipient.*could not be reached'), _c('bogus stop pattern'), _c('^(?P<addr>[^\s@]+@[^\s@]+)\s*$')), + # lttf.com + (_c('Could not deliver message to'), + _c('^\s*--'), + _c('^Failed Recipient:\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), # Next one goes here... ] diff --git a/Mailman/Bouncers/SimpleWarning.py b/Mailman/Bouncers/SimpleWarning.py index 34690625..ab8d6aa2 100644 --- a/Mailman/Bouncers/SimpleWarning.py +++ b/Mailman/Bouncers/SimpleWarning.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2009 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -53,6 +53,10 @@ patterns = [ (_c('THIS IS A WARNING MESSAGE ONLY'), _c('Message will be retried'), _c(r'\s*(?P<addr>\S+@\S+)\s*')), + # RS ver 1.0.95vs ? - see comments for MessageSwitch + (_c('We will continue to try to deliver'), + _c('.+'), + _c('(?P<addr>.+)')), # Next one goes here... ] diff --git a/tests/bounces/simple_35.txt b/tests/bounces/simple_35.txt new file mode 100644 index 00000000..ee43aa3e --- /dev/null +++ b/tests/bounces/simple_35.txt @@ -0,0 +1,88 @@ +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +MIME-Version: 1.0 +Content-Type: text/plain; + charset="iso-8859-1" +Content-Transfer-Encoding: quoted-printable +Subject: Mail Delivery Warning +Date: Thu, 19 Feb 2009 16:12:07 -0800 +Message-ID: <200902200012.n1K0C71m032486@xxx.com> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +From: <Postmaster\@xxx.com@xxx.com> +To: <huntads-bounces@xxx.com> + +This is an advisory-only email. Please do not reply to it. + =09 +Delivery of email to this address + =09 +"calvin@xxx.com" + =09 +has been postponed due to a full mailbox. + =09 +We will continue to try to deliver your message over the next few days. + =09 +The first 50 lines of your original message follow:> Received: from = +mx105.stngva01.us.mxservers.net (198.173.112.42) +> by mail35b.att-webhosting.com (RS ver 1.0.95vs) with SMTP id = +1-084358326 +> for <calvin@xxx.com>; Thu, 19 Feb 2009 19:05:26 -0500 (EST) +> Received: from unknown [72.166.138.3] (EHLO xxx) +> by va1-mx105.stngva01.us.mxservers.net (mxl_mta-3.1.0-05) +> with ESMTP id = +f93fd994.2809027488.147598.00-011.va1-mx105.stngva01.us.mxservers.net = +(envelope-from <huntads-bounces@xxx.com>); +> Thu, 19 Feb 2009 19:04:47 -0500 (EST) +> Received: from localhost.xxx.com (unknown [127.0.0.1]) +> by xxx.com (Postfix) with ESMTP id 623F823FDE4; +> Thu, 19 Feb 2009 15:56:58 -0800 (PST) +> X-Original-To: huntads@xxx.com +> Delivered-To: huntads@xxx.com +> Received: from exchange.xxx.com (unknown [192.168.168.8]) +> by xxx.com (Postfix) with ESMTP id 4542723FDC5 +> for <huntads@xxx.com>; Thu, 19 Feb 2009 15:56:23 -0800 = +(PST) +> Received: from [192.168.168.219] ([192.168.168.219]) by = +xxx.com +> with Microsoft SMTPSVC(6.0.3790.1830);=20 +> Thu, 19 Feb 2009 15:57:06 -0800 +> User-Agent: Microsoft-Entourage/10.1.4.030702.0 +> Date: Thu, 19 Feb 2009 15:56:21 -0800 +> To: "Hunt Ads (New)" <huntads@xxx.com> +> Message-ID: <C5C331A6.8C81%karlw@xxx.com> +> Mime-version: 1.0 +> X-OriginalArrivalTime: 19 Feb 2009 23:57:07.0051 (UTC) +> FILETIME=3D[C538D3B0:01C992ED] +> From: Turners Huntads <huntads@xxx.com> +> Subject: [Huntads] February 20 - February 26 +> X-BeenThere: huntads@xxx.com +> X-Mailman-Version: 2.1.12rc2 +> Precedence: list +> Reply-To: newsletter@xxx.com +> List-Id: Turners Huntads <huntads.xxx.com> +> List-Unsubscribe: = +<mailto:huntads-request@xxx.com?subject=3Dunsubscribe> +> List-Help: <mailto:huntads-request@xxx.com?subject=3Dhelp> +> List-Subscribe: = +<mailto:huntads-request@xxx.com?subject=3Dsubscribe> +> Content-Type: multipart/mixed; = +boundary=3D"=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D= +" +> Sender: huntads-bounces@xxx.com +> Errors-To: huntads-bounces@xxx.com +> X-Spam: [F=3D0.3170731707; B=3D0.500(0); S=3D0.200(2009020301); = +MH=3D0.650(2009021931)] +> X-MAIL-FROM: <huntads-bounces@xxx.com> +> X-SOURCE-IP: [72.166.138.3] +> X-SF-Loop: 1 +>=20 +> > This message is in MIME format. Since your mail reader does not = +understand +> this format, some or all of this message may not be legible. +>=20 +> --=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D +> Content-type: multipart/related; boundary=3D"B_3317903782_1289380" +>=20 +> > This message is in MIME format. Since your mail reader does not = +understand + diff --git a/tests/bounces/simple_36.txt b/tests/bounces/simple_36.txt new file mode 100644 index 00000000..68d47cba --- /dev/null +++ b/tests/bounces/simple_36.txt @@ -0,0 +1,61 @@ +X-MimeOLE: Produced By Microsoft Exchange V6.5 +Content-class: urn:content-classes:message +MIME-Version: 1.0 +Content-Type: text/plain; + charset="iso-8859-1" +Content-Transfer-Encoding: quoted-printable +Subject: Delivery Failure +Date: Thu, 19 Feb 2009 16:19:28 -0800 +Message-ID: <633706571685360000@mx10.lttf.com> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +From: <"System Administrator"@xxx.com> +To: <huntads-bounces@xxx.com> + + +Could not deliver message to the following recipient(s): + +Failed Recipient: garyt@xxx.com +Reason: Remote host said: 550 unknown user <garyt@xxx.com> + + -- The header and top 20 lines of the message follows -- + +Received: from xxx.com [72.166.138.3] by mx10.lttf.com with = +SMTP; + Thu, 19 Feb 2009 16:19:20 -0800 +Received: from localhost.xxx.com (unknown [127.0.0.1]) + by xxx.com (Postfix) with ESMTP id A2E78240229 + for <garyt@xxx.com>; Thu, 19 Feb 2009 16:19:22 -0800 = +(PST) +MIME-Version: 1.0 +Content-Type: text/plain; charset=3D"us-ascii" +Content-Transfer-Encoding: 7bit +From: huntads-request@xxx.com +To: garyt@xxx.com +Subject: confirm 05a7bc89604da1745a562d4bed327490f5022bb2 +Message-ID: <mailman.45.1235089120.2581.huntads@xxx.com> +Date: Thu, 19 Feb 2009 16:18:40 -0800 +Precedence: bulk +X-BeenThere: huntads@xxx.com +X-Mailman-Version: 2.1.12rc2 +List-Id: Turners Huntads <huntads.xxx.com> +X-List-Administrivia: yes +Sender: huntads-bounces@xxx.com +Errors-To: huntads-bounces@xxx.com + +Your membership in the mailing list Huntads has been disabled due to +excessive bounces The last bounce received from you was dated +19-Feb-2009. You will not get any more messages from this list until +you re-enable your membership. You will receive 2 more reminders like +this before your membership in the list is deleted. + +To re-enable your membership, you can simply respond to this message +(leaving the Subject: line intact). + +If you have any questions or problems, you can contact the list owner +at + + huntads-owner@xxx.com + + + diff --git a/tests/test_bounces.py b/tests/test_bounces.py index 981465ad..7986c7d4 100644 --- a/tests/test_bounces.py +++ b/tests/test_bounces.py @@ -72,6 +72,7 @@ class BounceTest(unittest.TestCase): ('SimpleMatch', 'simple_32.txt', ['teteyn@agence-forbin.com']), ('SimpleMatch', 'simple_33.txt', ['hmu@extralumin.com']), ('SimpleMatch', 'simple_34.txt', ['roland@xxx.com']), + ('SimpleMatch', 'simple_36.txt', ['garyt@xxx.com']), ('SimpleMatch', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']), ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']), # SimpleWarning @@ -79,6 +80,7 @@ class BounceTest(unittest.TestCase): ('SimpleWarning', 'simple_21.txt', Stop), ('SimpleWarning', 'simple_22.txt', Stop), ('SimpleWarning', 'simple_28.txt', Stop), + ('SimpleWarning', 'simple_35.txt', Stop), # GroupWise ('GroupWise', 'groupwise_01.txt', ['thoff@MAINEX1.ASU.EDU']), # This one really sucks 'cause it's text/html. Just make sure it |