diff options
23 files changed, 392 insertions, 11 deletions
diff --git a/Mailman/Bouncers/DSN.py b/Mailman/Bouncers/DSN.py index e4d2f486..2eacd0f4 100644 --- a/Mailman/Bouncers/DSN.py +++ b/Mailman/Bouncers/DSN.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 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 @@ -89,6 +89,13 @@ def check(msg): def process(msg): + # We've seen some fairly bogus DSNs, allegedly from postfix that are + # multipart/mixed with 3 subparts - a text/plain postfix like part, a + # message/delivery-status part and a message/rfc822 part with the original + # message. Deal with it as follows. + if (msg.is_multipart() and len(msg.get_payload()) == 3 and + msg.get_payload()[1].get_content_type() == 'message/delivery-status'): + return check(msg.get_payload()[1]) # A DSN has been seen wrapped with a "legal disclaimer" by an outgoing MTA # in a multipart/mixed outer part. if msg.is_multipart() and msg.get_content_subtype() == 'mixed': diff --git a/Mailman/Bouncers/GroupWise.py b/Mailman/Bouncers/GroupWise.py index 7ef31256..74116135 100644 --- a/Mailman/Bouncers/GroupWise.py +++ b/Mailman/Bouncers/GroupWise.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 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 @@ -46,6 +46,8 @@ def find_textplain(msg): def process(msg): if msg.get_type() <> 'multipart/mixed' or not msg['x-mailer']: return None + if msg['x-mailer'][:3].lower() not in ('nov', 'ntm', 'int'): + return None addrs = {} # find the first text/plain part in the message textplain = find_textplain(msg) diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index 2e9c23b1..068dc45c 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 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 @@ -91,12 +91,12 @@ PATTERNS = [ (_c('Delivery to the following recipient failed'), _c('----- Original message -----'), _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), - # kundenserver.de - (_c('A message that you sent could not be delivered'), + # kundenserver.de, mxlogic.net + (_c('A message that you( have)? sent could not be delivered'), _c('^---'), _c('<(?P<addr>[^>]*)>')), # another kundenserver.de - (_c('A message that you sent could not be delivered'), + (_c('A message that you( have)? sent could not be delivered'), _c('^---'), _c('^(?P<addr>[^\s@]+@[^\s@:]+):')), # thehartford.com @@ -126,9 +126,9 @@ PATTERNS = [ (_c('^Invalid final delivery userid:'), _c('^Original message follows.'), _c('\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), - # E500_SMTP_Mail_Service@lerctr.org - (_c('------ Failed Recipients ------'), - _c('-------- Returned Mail --------'), + # E500_SMTP_Mail_Service@lerctr.org and similar + (_c('---- Failed Recipients ----'), + _c(' Mail ----'), _c('<(?P<addr>[^>]*)>')), # cynergycom.net (_c('A message that you sent could not be delivered'), @@ -196,7 +196,7 @@ def process(msg, patterns=None): if mo: addr = mo.group('addr') if addr: - addrs[mo.group('addr')] = 1 + addrs[addr.strip('<>')] = 1 elif ecre.search(line): break if addrs: @@ -61,7 +61,7 @@ Here is a history of user visible changes to Mailman. - Fixed a problem in Decorate.py that could result in a multipart message with no part headers for the original body part (1991348). - - Added bounce recognition for googlemail delayed warning. + - Improved recognition of some bounce messages. Miscellaneous diff --git a/tests/bounces/dsn_15.txt b/tests/bounces/dsn_15.txt index 1e3c62de..1e3c62de 100755..100644 --- a/tests/bounces/dsn_15.txt +++ b/tests/bounces/dsn_15.txt diff --git a/tests/bounces/dsn_16.txt b/tests/bounces/dsn_16.txt new file mode 100644 index 00000000..b1f9b9ec --- /dev/null +++ b/tests/bounces/dsn_16.txt @@ -0,0 +1,213 @@ +Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) + by strategicnetwork.org (Postfix) with ESMTP id E71AC73423D + for <hishealinghand@pastors.com>; Sat, 17 May 2008 11:15:50 -0600 (MDT) +From: "Mail Delivery System" <MAILER-DAEMON@strategicnetwork.org> +To: <mailman-bounces@strategicnetwork.org> +Subject: Undelivered Mail Returned to Sender +Date: Sun, 18 May 2008 01:15:51 +0800 +Message-ID: <20080517171551.6EBAB734E3A@strategicnetwork.org> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_0092_01C8B8BF.529D6450" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Aci4Qafw1YeAmx2mRI2jVZKbY8YZ5A== + +This is a multipart message in MIME format. + +------=_NextPart_000_0092_01C8B8BF.529D6450 +Content-Type: text/plain; + boundary="E71AC73423D.1211044551/strategicnetwork.org"; + charset="iso-8859-1"; + report-type=delivery-status +Content-Transfer-Encoding: 7bit + +This is the Postfix program at host strategicnetwork.org. + +I'm sorry to have to inform you that your message could not +be delivered to one or more recipients. It's attached below. + +For further assistance, please send mail to <postmaster> + +If you do so, please include this problem report. You can +delete your own text from the attached returned message. + + The Postfix program + +<hishealinghand@pastors.com>: host mx.pastors.com[70.183.18.160] said: 550 + unknown user <hishealinghand@pastors.com> (in reply to RCPT TO command) + +------=_NextPart_000_0092_01C8B8BF.529D6450 +Content-Type: message/delivery-status; + name="details.txt" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="details.txt" + +Reporting-MTA: dns; strategicnetwork.org +X-Postfix-Queue-ID: E71AC73423D +X-Postfix-Sender: rfc822; mailman-bounces@strategicnetwork.org +Arrival-Date: Sat, 17 May 2008 11:15:50 -0600 (MDT) + +Final-Recipient: rfc822; hishealinghand@pastors.com +Action: failed +Status: 5.0.0 +Diagnostic-Code: X-Postfix; host mx.pastors.com[70.183.18.160] said: 550 + unknown user <hishealinghand@pastors.com> (in reply to RCPT TO command) + +------=_NextPart_000_0092_01C8B8BF.529D6450 +Content-Type: message/rfc822 +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment + +Received: from nt-server.mmv.int (unknown [81.17.109.140]) + by ipx14075.ipxserver.de (Postfix) with ESMTP id 24DA5E28456 + for <prayer-needs-bounces@strategicnetwork.org>; + Sat, 17 May 2008 19:15:46 +0200 (CEST) +From: <mailman-bounces@strategicnetwork.org> +To: <prayer-needs-owner@strategicnetwork.org> +Subject: Uncaught bounce notification +Date: Sun, 18 May 2008 01:15:50 +0800 +Message-ID: <mailman.331.1211044550.3366.prayer-needs@strategicnetwork.org> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_008E_01C8B8BF.529D6450" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Aci4QadXUNJ/Y2gvR9+59kbk4uSejw== + +This is a multipart message in MIME format. + +------=_NextPart_000_008E_01C8B8BF.529D6450 +Content-Type: text/plain; + boundary="===============0013193983=="; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + +The attached message was received as a bounce, but either the bounce +format was not recognized, or no member addresses could be extracted +from it. This mailing list has been configured to send all +unrecognized bounce messages to the list administrator(s). + +For more information see: +http://strategicnetwork.org/mailman/admin/prayer-needs/bounce + + +------=_NextPart_000_008E_01C8B8BF.529D6450 +Content-Type: message/rfc822 +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment + +Received: from strategicnetwork.org ([66.35.39.241]) by nt-server.mmv.int with + Microsoft SMTPSVC(6.0.3790.3959); Sat, 17 May 2008 07:14:58 +0200 +Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by + strategicnetwork.org (Postfix) with ESMTP id 6B793734E95 for + <oNlore.marr-bieger@michael-mueller-verlag.de>; + Fri, 16 May 2008 23:09:37 -0600 (MDT) +From: <postmaster@michael-mueller-verlag.de> +To: <prayer-needs-bounces@strategicnetwork.org> +Subject: =?utf-7?Q?Benachrichtigung__zum__ +ANw-bermitt?= + =?utf-7?Q?lungsstatus__=28Verz+APY-gerung=29?= +Date: Sun, 18 May 2008 01:21:01 +0800 +Message-ID: <vCWO6hm8U00000059@nt-server.mmv.int> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_008A_01C8B8BF.5298A960" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Aci4QaYm8cki4UrMStOQ1CvDilgOdw== + +This is a multipart message in MIME format. + +------=_NextPart_000_008A_01C8B8BF.5298A960 +Content-Type: text/plain; + boundary="9B095B5ADSN=_01C8B2602C2F6AEE0007F371nt?server.mmv.in"; + charset="utf-7"; + report-type=delivery-status +Content-Transfer-Encoding: quoted-printable + +Dies ist eine automatisch erstellte Benachrichtigung +APw-ber den = +Zustellstatus. + +DIES IST NUR EINE WARNUNG. + +SIE M+ANw-SSEN DIE NACHRICHT NICHT ERNEUT SENDEN. + ++ANw-bermittlung an folgende Empf+AOQ-nger wurde verz+APY-gert. + + spam+AEA-michael-mueller-verlag.de + + + + +------=_NextPart_000_008A_01C8B8BF.5298A960 +Content-Type: message/delivery-status; + name="details.txt" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="details.txt" + +Reporting-MTA: dns;nt-server.mmv.int +Received-From-MTA: dns;strategicnetwork.org +Arrival-Date: Sat, 17 May 2008 07:14:58 +0200 + +Final-Recipient: rfc822;spam@michael-mueller-verlag.de +Action: delayed +Status: 4.4.7 +Will-Retry-Until: Mon, 19 May 2008 07:15:00 +0200 +X-Display-Name: Spam + +------=_NextPart_000_008A_01C8B8BF.5298A960 +Content-Type: message/rfc822 +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment + +Return-Path: <prayer-needs-bounces@strategicnetwork.org> +Reply-To: <prayer-needs-request@strategicnetwork.org> +From: <prayer-needs-request@strategicnetwork.org> +Sender: <prayer-needs-bounces@strategicnetwork.org> +To: <oNlore.marr-bieger@michael-mueller-verlag.de> +Subject: confirm 3804b2ed9538e463f662ee4b2c3676ffec2658be +Date: Sat, 17 May 2008 13:09:36 +0800 +Message-ID: <mailman.21740.1211000976.3367.prayer-needs@strategicnetwork.org> +MIME-Version: 1.0 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Aci33PPN66MaDZVxS0+jRAs9I4FtWw== +Content-Class: urn:content-classes:message + +Mailing list subscription confirmation notice for mailing list +Prayer-needs + +We have received a request from +onlore.marr-bieger@michael-mueller-verlag.de for subscription of your +email address, "oNlore.marr-bieger@michael-mueller-verlag.de", to the +prayer-needs@strategicnetwork.org mailing list. To confirm that you +want to be added to this mailing list, simply reply to this message, +keeping the Subject: header intact. Or visit this web page: + + +http://strategicnetwork.org/mailman/confirm/prayer-needs/3804b2ed9538e463f66 +2ee4b2c3676ffec2658be + + +Or include the following line -- and only the following line -- in a +message to prayer-needs-request@strategicnetwork.org: + + confirm 3804b2ed9538e463f662ee4b2c3676ffec2658be + +Note that simply sending a `reply' to this message should work from +most mail readers, since that usually leaves the Subject: line in the +right form (additional "Re:" text in the Subject: is okay). + +If you do not wish to be subscribed to this list, please simply +disregard this message. If you think you are being maliciously +subscribed to the list, or have any other questions, send them to +prayer-needs-owner@strategicnetwork.org. + + +------=_NextPart_000_008A_01C8B8BF.5298A960-- + +------=_NextPart_000_008E_01C8B8BF.529D6450-- + +------=_NextPart_000_0092_01C8B8BF.529D6450-- + diff --git a/tests/bounces/dsn_17.txt b/tests/bounces/dsn_17.txt new file mode 100644 index 00000000..2fc60838 --- /dev/null +++ b/tests/bounces/dsn_17.txt @@ -0,0 +1,101 @@ +From: "Mail Delivery System" <MAILER-DAEMON@be37.mail.saunalahti.fi> +To: <pray4-team-bounces@strategicnetwork.org> +Subject: Delayed Mail (still being retried) +Date: Sun, 4 May 2008 13:30:10 +0800 +Message-ID: <20080504053010.83D5413301A@be37.mail.saunalahti.fi> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_00B7_01C8B0E9.3E667630" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Acitp+yPLzjU0sphReGZRtBo3Ns6bg== + +This is a multipart message in MIME format. + +------=_NextPart_000_00B7_01C8B0E9.3E667630 +Content-Type: text/plain; + report-type=delivery-status; + boundary="ED106133145.1209879010/be37.mail.saunalahti.fi"; + charset="US-ASCII" +Content-Transfer-Encoding: 7bit + +This is the mail system at host be37.mail.saunalahti.fi. + +#################################################################### +# THIS IS A WARNING ONLY. YOU DO NOT NEED TO RESEND YOUR MESSAGE. # +#################################################################### + +Your message could not be delivered for more than 15 minutes. +It will be retried until it is 24 hours old. + +For further assistance, please contact your postmaster. + +If you do so, please include this problem report. You can +delete your own text from the attached returned message. + + The mail system + +<kb3543.50@be37.mail.saunalahti.fi> (expanded from + <kb3543@be37.mail.saunalahti.fi>): temporary failure. Command output: +Quota + exceeded message delivery failed to /mail/mbx/p/5/kb3543/INBOX + +------=_NextPart_000_00B7_01C8B0E9.3E667630 +Content-Type: message/delivery-status; + name="details.txt" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="details.txt" + +Reporting-MTA: dns; be37.mail.saunalahti.fi +X-Postfix-Queue-ID: ED106133145 +X-Postfix-Sender: rfc822; pray4-team-bounces@strategicnetwork.org +Arrival-Date: Sun, 4 May 2008 05:51:07 +0300 (EEST) + +Final-Recipient: rfc822; kb3543.50@be37.mail.saunalahti.fi +Original-Recipient: rfc822;christine.barsas@sivarikeskus.fi +Action: delayed +Status: 4.3.0 +Diagnostic-Code: x-unix; Quota exceeded message delivery failed to + /mail/mbx/p/5/kb3543/INBOX +Will-Retry-Until: Mon, 5 May 2008 05:51:07 +0300 (EEST) + +------=_NextPart_000_00B7_01C8B0E9.3E667630 +Content-Type: text/rfc822-headers; + name="Undelivered Message Headers.txt" +Content-Transfer-Encoding: quoted-printable +Content-Disposition: attachment; + filename="Undelivered Message Headers.txt" + +Received: from emh07.mail.saunalahti.fi (emh07.mail.saunalahti.fi = +[62.142.5.117]) + by be37.mail.saunalahti.fi (Postfix) with ESMTP id ED106133145 + for <kb3543@be37.mail.saunalahti.fi>; Sun, 4 May 2008 05:51:07 +0300 = +(EEST) +Received: from strategicnetwork.org (strategicnetwork.org = +[66.35.39.241]) + by emh07.mail.saunalahti.fi (Postfix) with ESMTP id D3C661C639E + for <christine.barsas@sivarikeskus.fi>; Sun, 4 May 2008 05:51:06 +0300 = +(EEST) +Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) + by strategicnetwork.org (Postfix) with ESMTP id 27DF4734B75 + for <christine.barsas@sivarikeskus.fi>; Sat, 3 May 2008 20:51:05 -0600 = +(MDT) +MIME-Version: 1.0 +Content-Type: text/plain; charset=3D"us-ascii" +Content-Transfer-Encoding: 7bit +From: pray4-team-request@strategicnetwork.org +To: christine.barsas@sivarikeskus.fi +Subject: confirm d35a398026f31a7462cc90622a1e6180cd63ba60 +Reply-To: pray4-team-request@strategicnetwork.org +Message-ID: = +<mailman.150418.1209869464.31038.pray4-team@strategicnetwork.org> +Date: Sat, 03 May 2008 20:51:04 -0600 +Precedence: bulk +X-BeenThere: pray4-team@strategicnetwork.org +X-Mailman-Version: 2.1.5 +List-Id: pray4-team.strategicnetwork.org +X-List-Administrivia: yes +Sender: pray4-team-bounces@strategicnetwork.org +Errors-To: pray4-team-bounces@strategicnetwork.org + +------=_NextPart_000_00B7_01C8B0E9.3E667630-- diff --git a/tests/bounces/qmail_04.txt b/tests/bounces/qmail_04.txt index 035d74d6..035d74d6 100755..100644 --- a/tests/bounces/qmail_04.txt +++ b/tests/bounces/qmail_04.txt diff --git a/tests/bounces/qmail_05.txt b/tests/bounces/qmail_05.txt index 84362025..84362025 100755..100644 --- a/tests/bounces/qmail_05.txt +++ b/tests/bounces/qmail_05.txt diff --git a/tests/bounces/simple_17.txt b/tests/bounces/simple_17.txt index 4d4cbfa8..4d4cbfa8 100755..100644 --- a/tests/bounces/simple_17.txt +++ b/tests/bounces/simple_17.txt diff --git a/tests/bounces/simple_18.txt b/tests/bounces/simple_18.txt index 6f642a46..6f642a46 100755..100644 --- a/tests/bounces/simple_18.txt +++ b/tests/bounces/simple_18.txt diff --git a/tests/bounces/simple_19.txt b/tests/bounces/simple_19.txt index 54ea96c9..54ea96c9 100755..100644 --- a/tests/bounces/simple_19.txt +++ b/tests/bounces/simple_19.txt diff --git a/tests/bounces/simple_20.txt b/tests/bounces/simple_20.txt index 84991148..84991148 100755..100644 --- a/tests/bounces/simple_20.txt +++ b/tests/bounces/simple_20.txt diff --git a/tests/bounces/simple_21.txt b/tests/bounces/simple_21.txt index dde9c444..dde9c444 100755..100644 --- a/tests/bounces/simple_21.txt +++ b/tests/bounces/simple_21.txt diff --git a/tests/bounces/simple_22.txt b/tests/bounces/simple_22.txt index 99b0cc5b..99b0cc5b 100755..100644 --- a/tests/bounces/simple_22.txt +++ b/tests/bounces/simple_22.txt diff --git a/tests/bounces/simple_23.txt b/tests/bounces/simple_23.txt index 7399315a..7399315a 100755..100644 --- a/tests/bounces/simple_23.txt +++ b/tests/bounces/simple_23.txt diff --git a/tests/bounces/simple_24.txt b/tests/bounces/simple_24.txt index 447a2201..447a2201 100755..100644 --- a/tests/bounces/simple_24.txt +++ b/tests/bounces/simple_24.txt diff --git a/tests/bounces/simple_25.txt b/tests/bounces/simple_25.txt index 1973ca3a..1973ca3a 100755..100644 --- a/tests/bounces/simple_25.txt +++ b/tests/bounces/simple_25.txt diff --git a/tests/bounces/simple_26.txt b/tests/bounces/simple_26.txt index 4c868946..4c868946 100755..100644 --- a/tests/bounces/simple_26.txt +++ b/tests/bounces/simple_26.txt diff --git a/tests/bounces/simple_27.txt b/tests/bounces/simple_27.txt index ad1abf2c..ad1abf2c 100755..100644 --- a/tests/bounces/simple_27.txt +++ b/tests/bounces/simple_27.txt diff --git a/tests/bounces/simple_29.txt b/tests/bounces/simple_29.txt new file mode 100644 index 00000000..33dcb3c0 --- /dev/null +++ b/tests/bounces/simple_29.txt @@ -0,0 +1,55 @@ +Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) + by strategicnetwork.org (Postfix) with ESMTP id 635A27347E5 + for <thilakayi_bing@landshire.com>; Tue, 13 May 2008 12:51:46 -0600 (MDT) +From: "Mail Delivery System" <MAILER-DAEMON@p02c11m063.mxlogic.net> +To: <network-news-bounces@strategicnetwork.org> +Subject: Mail delivery failed +Date: Wed, 14 May 2008 02:51:47 +0800 +Message-ID: <mxl~a534.498e.875b@p02c11m063.mxlogic.net> +MIME-Version: 1.0 +Content-Type: text/plain; + charset="iso-8859-1" +Content-Transfer-Encoding: 7bit +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Aci1Kmbra/4UZFszTWaO4wdczWcBCQ== + +This message was created automatically by mail delivery software. + +A message that you have sent could not be delivered to one or more +recipients. This is a permanent error. The following address failed: + + <thilakayi_bing@landshire.com>: 550 unknown user +<thilakayi_bing@landshire.com> + + + +Included is a copy of the message header: +----------------------------------------- +Received: from unknown [66.35.39.241] (EHLO strategicnetwork.org) + by p02c11m063.mxlogic.net (mxl_mta-5.5.0-3) + with ESMTP id +243e9284.3570539440.159512.00-095.p02c11m063.mxlogic.net (envelope-from +<network-news-bounces@strategicnetwork.org>); + Tue, 13 May 2008 12:51:46 -0600 (MDT) +Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) + by strategicnetwork.org (Postfix) with ESMTP id 635A27347E5 + for <thilakayi_bing@landshire.com>; Tue, 13 May 2008 12:51:46 -0600 +(MDT) +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +From: network-news-request@strategicnetwork.org +To: thilakayi_bing@landshire.com +Subject: confirm 729791e8feb106a11648f358c538d4073e9eb7b1 +Reply-To: network-news-request@strategicnetwork.org +Message-ID: <mailman.2838.1210704705.3367.network-news@strategicnetwork.org> +Date: Tue, 13 May 2008 12:51:45 -0600 +Precedence: bulk +X-BeenThere: network-news@strategicnetwork.org +X-Mailman-Version: 2.1.5 +List-Id: network-news.strategicnetwork.org +X-List-Administrivia: yes +Sender: network-news-bounces@strategicnetwork.org +Errors-To: network-news-bounces@strategicnetwork.org + + diff --git a/tests/bounces/smtp32_07.txt b/tests/bounces/smtp32_07.txt index 08167373..08167373 100755..100644 --- a/tests/bounces/smtp32_07.txt +++ b/tests/bounces/smtp32_07.txt diff --git a/tests/test_bounces.py b/tests/test_bounces.py index dd41fdf4..f9b2fdc9 100644 --- a/tests/test_bounces.py +++ b/tests/test_bounces.py @@ -66,6 +66,7 @@ class BounceTest(unittest.TestCase): ('SimpleMatch', 'simple_25.txt', ['mahau@cnbearing.com']), ('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', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']), ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']), # SimpleWarning @@ -100,6 +101,8 @@ class BounceTest(unittest.TestCase): ('DSN', 'dsn_13.txt', ['marcooherbst@cardinal.com']), ('DSN', 'dsn_14.txt', ['artboardregistration@home.dk']), ('DSN', 'dsn_15.txt', ['horu@ccc-ces.com']), + ('DSN', 'dsn_16.txt', ['hishealinghand@pastors.com']), + ('DSN', 'dsn_17.txt', Stop), # Microsoft Exchange ('Exchange', 'microsoft_01.txt', ['DJBENNETT@IKON.COM']), ('Exchange', 'microsoft_02.txt', ['MDMOORE@BALL.COM']), |