------------------------------------------------------------
revno: 1389
fixes bugs: https://launchpad.net/bugs/1074592
https://launchpad.net/bugs/1079249 https://launchpad.net/bugs/1079254
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Thu 2013-05-30 19:29:33 -0700
message:
Backported fixes for lp:1074592, lp:1079249 and lp:1079254 from
lp:flufl.bounce. Actually, lp:1074592 doesn't affect MM 2, but I
included the test case.
added:
tests/bounces/qmail_08.txt
tests/bounces/simple_39.txt
modified:
Mailman/Bouncers/SimpleMatch.py
NEWS
tests/test_bounces.py
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Bouncers/SimpleMatch.py'
--- Mailman/Bouncers/SimpleMatch.py 2010-12-22 16:07:37 +0000
+++ Mailman/Bouncers/SimpleMatch.py 2013-05-31 02:29:33 +0000
@@ -42,7 +42,7 @@
# sz-sb.de, corridor.com, nfg.nl
(_c('the following addresses had'),
_c('transcript of session follows'),
- _c(r'<(?P<fulladdr>[^>]*)>|\(expanded from: <?(?P<addr>[^>)]*)>?\)')),
+ _c(r'^ *(\(expanded from: )?<?(?P<addr>[^\s@]+@[^\s@>]+?)>?\)?\s*$')),
# robanal.demon.co.uk
(_c('this message was created automatically by mail delivery software'),
_c('original message follows'),
@@ -184,6 +184,10 @@
_c(
'Your message to (?P<addr>[^\s@]+@[^\s@]+) was automatically rejected'
)),
+ # mail.ru
+ (_c('A message that you sent was rejected'),
+ _c('This is a copy of your message'),
+ _c('\s(?P<addr>[^\s@]+@[^\s@]+)')),
# Next one goes here...
]
=== modified file 'NEWS'
--- NEWS 2013-05-20 15:19:19 +0000
+++ NEWS 2013-05-31 02:29:33 +0000
@@ -61,6 +61,9 @@
Bug Fixes and other patches
+ - Backported recognition for mail.ru DSNs and minor bug fixes from
+ lp:flufl.bounce. (LP: #1074592, LP: #1079249 and #1079254)
+
- Defended against buggy web servers that don't include an empty
QUERY_STRING in the CGI environment. (LP: 1160647)
=== added file 'tests/bounces/qmail_08.txt'
--- tests/bounces/qmail_08.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/qmail_08.txt 2013-05-31 02:29:33 +0000
@@ -0,0 +1,24 @@
+From [email protected] Mon Mar 18 11:39:41 2013
+Return-Path: <[email protected]>
+X-Original-To: [email protected]
+Delivered-To: [email protected]
+Received: from example.com (example.com [1.2.3.4])
+ by worker1.example.org (Postfix) with ESMTP id 58C7E14C1208
+ for <[email protected]>; Mon, 18 Mar 2013 11:39:40 +0000 (GMT)
+Received: from contact by example.com with local (Exim 4.80)
+ (envelope-from <[email protected]>)
+ id 1UHYPj-0001DB-Ij
+ for [email protected]; Mon, 18 Mar 2013 06:39:39 -0500
+To: "Example Sender" <[email protected]>
+MIME-Version: 1.0
+Precedence: auto_reply
+X-Precedence: auto_reply
+From: "Example user" <[email protected]>
+Content-type: text/plain; charset=ansi_x3.110-1983
+Subject: Auto reply
+Message-Id: <[email protected]>
+Date: Mon, 18 Mar 2013 06:39:39 -0500
+X-Comment: qmail detector would throw UnicodeDecodeError on this message
+X-Comment: when running under Python 2.x. Bug LP: 1074592.
+
+Gracias por contactar con nosotros!! en este instante estamos procesando la respuesta a tu consulta, a la mayor brevedad posible tendr�s noticias nuestras...
=== added file 'tests/bounces/simple_39.txt'
--- tests/bounces/simple_39.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/simple_39.txt 2013-05-31 02:29:33 +0000
@@ -0,0 +1,32 @@
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Auto-Submitted: auto-replied
+Date: Wed, 07 Nov 2012 10:47:34 +0400
+From: Mail Delivery System <[email protected]>
+Message-Id: <[email protected]>
+Subject: =?utf-8?b?0JLQsNGI0LUg0YHQvtC+0LHRidC10L3QuNC1INC90LUg0LTQvtGB0YLQsNCy0LvQ?=
+ =?utf-8?b?tdC90L4uIE1haWwgZmFpbHVyZS4=?=
+To: [email protected]
+Content-Transfer-Encoding: 8bit
+
+Это письмо создано автоматически сервером Mail.Ru, отвечать на него не нужно.
+
+К сожалению, Ваше письмо не может быть доставлено одному или нескольким получателям, потому что:
+
+ Message was not accepted -- invalid mailbox.
+ Local mailbox [email protected] is unavailable: user not found
+
+**********************
+
+A message that you sent was rejected by the local scanning code that
+checks incoming messages on this system. The following error was given:
+
+ Message was not accepted -- invalid mailbox.
+ Local mailbox [email protected] is unavailable: user not found
+
+------ This is a copy of your message, including all the headers.
+------ No more than 1K characters of the body are included.
+
+Received: from mail by mx183.mail.ru with local (envelope-from <[email protected]>)
+ id 1TVzQE-0003tT-Co
+ for [email protected]; Wed, 07 Nov 2012 10:47:34 +0400
=== modified file 'tests/test_bounces.py'
--- tests/test_bounces.py 2013-03-21 01:32:32 +0000
+++ tests/test_bounces.py 2013-05-31 02:29:33 +0000
@@ -41,7 +41,8 @@
# Exim bounces
('Exim', 'exim_01.txt', ['[email protected]']),
# SimpleMatch bounces
- ('SimpleMatch', 'sendmail_01.txt', ['[email protected]']),
+ ('SimpleMatch', 'sendmail_01.txt', ['[email protected]',
+ '[email protected]']),
('SimpleMatch', 'simple_01.txt', ['[email protected]']),
('SimpleMatch', 'simple_02.txt', ['[email protected]']),
('SimpleMatch', 'simple_04.txt', ['[email protected]']),
@@ -79,6 +80,7 @@
('SimpleMatch', 'simple_36.txt', ['[email protected]']),
('SimpleMatch', 'simple_37.txt', ['[email protected]']),
('SimpleMatch', 'simple_38.txt', ['[email protected]']),
+ ('SimpleMatch', 'simple_39.txt', [b'[email protected]']),
('SimpleMatch', 'bounce_02.txt', ['[email protected]']),
('SimpleMatch', 'bounce_03.txt', ['[email protected]']),
# SimpleWarning
@@ -136,6 +138,7 @@
('Qmail', 'qmail_05.txt', ['[email protected]']),
('Qmail', 'qmail_06.txt', ['[email protected]']),
('Qmail', 'qmail_07.txt', ['[email protected]']),
+ ('Qmail', 'qmail_08.txt', []),
# LLNL's custom Sendmail
('LLNL', 'llnl_01.txt', ['[email protected]']),
# Netscape's server...
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
