diff options
| -rw-r--r-- | Mailman/Bouncers/SimpleWarning.py | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | tests/bounces/simple_28.txt | 79 | ||||
| -rw-r--r-- | tests/test_bounces.py | 3 |
4 files changed, 88 insertions, 2 deletions
diff --git a/Mailman/Bouncers/SimpleWarning.py b/Mailman/Bouncers/SimpleWarning.py index 45012c16..34690625 100644 --- a/Mailman/Bouncers/SimpleWarning.py +++ b/Mailman/Bouncers/SimpleWarning.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -49,6 +49,10 @@ patterns = [ (_c('Delivery attempts will continue to be made'), _c('.+'), _c('(?P<addr>.+)')), + # Googlemail + (_c('THIS IS A WARNING MESSAGE ONLY'), + _c('Message will be retried'), + _c(r'\s*(?P<addr>\S+@\S+)\s*')), # Next one goes here... ] @@ -61,6 +61,8 @@ 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. + Miscellaneous - Brad Knowles' mailman daily status report script updated to 0.0.18. diff --git a/tests/bounces/simple_28.txt b/tests/bounces/simple_28.txt new file mode 100644 index 00000000..9af9f5f3 --- /dev/null +++ b/tests/bounces/simple_28.txt @@ -0,0 +1,79 @@ +Return-Path: <> +Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.152]) + by alan.rezo.net (Postfix) with ESMTP id 3909F3B0271 + for <spip-commit-bounces@rezo.net>; + Sun, 15 Jun 2008 01:26:23 +0200 (CEST) +Received: by fg-out-1718.google.com with SMTP id l27so3405949fgb.11 + for <spip-commit-bounces@rezo.net>; + Sat, 14 Jun 2008 16:26:21 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlemail.com; s=gamma; + h=domainkey-signature:received:received:message-id:from:to:subject + :date; bh=BFkuUFhgu/6jTo35rSt+ExVUNbJkbG7m9ZSeWMMiYys=; + b=iARaUItND8loi45qRlzvtfufPkNdALsDLbSkg2q1kT7kQ+4v0OXcW2oCV6u8r6c+Ty + hOaxiihkqMqgFknPssT6kaYS/u1IWeuEQnSltFULpQNh+rpW4yHC1hxUQ1jP6NRH3hfB + y3T3UN69T0sG9Szqe/1zVYEVPxAbdnJnygZ64= +DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; + h=message-id:from:to:subject:date; + b=FZYhpgymcWTMdaReUBtWfMMdThgG3Lk2UyVlK9XjPB7pwvAoTS8+eXQnP1IOC+iYQ+ + 2wkii49cJP1JmtmMJBDmAJ5Hhq34r5g8R8yQqx5iLvj7I7aLP4AnmGnhSxqb6LbM/CoF + xqjobWv+LjVHXV1Cy2oo0//B0M2mWKAv2/xGE= +Received: by 10.86.26.1 with SMTP id 1mr6414899fgz.49.1213485981022; + Sat, 14 Jun 2008 16:26:21 -0700 (PDT) +Received: by 10.86.26.1 with SMTP id 1mr8116260fgz.49; + Sat, 14 Jun 2008 16:26:21 -0700 (PDT) +Message-ID: <000e0cd25cf4d6b921044fa8b85f@googlemail.com> +From: Mail Delivery Subsystem <mailer-daemon@googlemail.com> +To: spip-commit-bounces@rezo.net +Subject: Delivery Status Notification (Delay) +Date: Sat, 14 Jun 2008 16:26:21 -0700 (PDT) + +This is an automatically generated Delivery Status Notification + +THIS IS A WARNING MESSAGE ONLY. + +YOU DO NOT NEED TO RESEND YOUR MESSAGE. + +Delivery to the following recipient has been delayed: + + luis.hiam@gmail.com + +Message will be retried for 2 more day(s) + + ----- Message header follows ----- + +Received: by 10.86.26.1 with SMTP id 1mr4665798fgz.49.1213394647106; + Fri, 13 Jun 2008 15:04:07 -0700 (PDT) +Return-Path: <spip-commit-bounces@rezo.net> +Received: from alan.rezo.net (alan.rezo.net [217.24.84.2]) + by mx.google.com with ESMTP id 4si6055077fgg.9.2008.06.13.15.03.59; + Fri, 13 Jun 2008 15:04:07 -0700 (PDT) +Received-SPF: pass (google.com: best guess record for domain of spip-commit-bounces@rezo.net designates 217.24.84.2 as permitted sender) client-ip=217.24.84.2; +Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of spip-commit-bounces@rezo.net designates 217.24.84.2 as permitted sender) smtp.mail=spip-commit-bounces@rezo.net +Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1]) + by alan.rezo.net (Postfix) with ESMTP id 6A8E131CC54; + Sat, 14 Jun 2008 00:00:49 +0200 (CEST) +Received: by alan.rezo.net (Postfix, from userid 1001) + id 17BCA31C00A; Sat, 14 Jun 2008 00:00:04 +0200 (CEST) +To: spip-commit@rezo.net +From: webdiff tracspip <spip-commit@rezo.net> +Message-Id: <20080613220004.17BCA31C00A@alan.rezo.net> +Date: Sat, 14 Jun 2008 00:00:04 +0200 (CEST) +Subject: [spip-commit] webdiff tracspip 14.06.2008 +X-BeenThere: spip-commit@rezo.net +X-Mailman-Version: 2.1.6b2 +Precedence: list +List-Id: "SPIP : toutes les modifs du code" <spip-commit.rezo.net> +List-Unsubscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>, + <mailto:spip-commit-request@rezo.net?subject=unsubscribe> +List-Archive: <http://listes.rezo.net/archives/spip-commit> +List-Post: <mailto:spip-commit@rezo.net> +List-Help: <mailto:spip-commit-request@rezo.net?subject=help> +List-Subscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>, + <mailto:spip-commit-request@rezo.net?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============0262606712==" +Sender: spip-commit-bounces@rezo.net +Errors-To: spip-commit-bounces@rezo.net + + ----- Message body suppressed ----- + diff --git a/tests/test_bounces.py b/tests/test_bounces.py index 649ecf13..dd41fdf4 100644 --- a/tests/test_bounces.py +++ b/tests/test_bounces.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -72,6 +72,7 @@ class BounceTest(unittest.TestCase): ('SimpleWarning', 'simple_03.txt', Stop), ('SimpleWarning', 'simple_21.txt', Stop), ('SimpleWarning', 'simple_22.txt', Stop), + ('SimpleWarning', 'simple_28.txt', Stop), # GroupWise ('GroupWise', 'groupwise_01.txt', ['thoff@MAINEX1.ASU.EDU']), # This one really sucks 'cause it's text/html. Just make sure it |