diff options
| author | Mark Sapiro <msapiro@value.net> | 2012-03-27 14:57:20 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2012-03-27 14:57:20 -0700 |
| commit | 7cce1a8d4d63e75c110dddd1bd83ecef34bbc769 (patch) | |
| tree | cef575bd86873a5352cf15e3c305107a74adbdbf | |
| parent | 7bbf3e858facd31bf155bea29526b32fc1eafb43 (diff) | |
| download | mailman2-7cce1a8d4d63e75c110dddd1bd83ecef34bbc769.tar.gz mailman2-7cce1a8d4d63e75c110dddd1bd83ecef34bbc769.tar.xz mailman2-7cce1a8d4d63e75c110dddd1bd83ecef34bbc769.zip | |
Added an Auto-Submitted: header to invitations and (un)subscription
confirmation requests to reduce the possibility of an autoresponder
confirming the request. (LP: #265831)
Diffstat (limited to '')
| -rw-r--r-- | Mailman/MailList.py | 14 | ||||
| -rw-r--r-- | NEWS | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 63a5b81e..492381bc 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2012 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 @@ -819,6 +819,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, subj = self.GetConfirmJoinSubject(listname, cookie) del msg['subject'] msg['Subject'] = subj + del msg['auto-submitted'] + msg['Auto-Submitted'] = 'auto-generated' msg.send(self) def AddMember(self, userdesc, remote=None): @@ -920,6 +922,14 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, del msg['subject'] msg['Subject'] = self.GetConfirmJoinSubject(realname, cookie) msg['Reply-To'] = self.GetRequestEmail(cookie) + # Is this confirmation a reply to an email subscribe from this + # address? + if remote.lower().endswith(email.lower()): + autosub = 'auto-replied' + else: + autosub = 'auto-generated' + del msg['auto-submitted'] + msg['Auto-Submitted'] = autosub msg.send(self) who = formataddr((name, email)) syslog('subscribe', '%s: pending %s %s', @@ -1341,6 +1351,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, del msg['subject'] msg['Subject'] = self.GetConfirmLeaveSubject(realname, cookie) msg['Reply-To'] = self.GetRequestEmail(cookie) + del msg['auto-submitted'] + msg['Auto-Submitted'] = 'auto-generated' msg.send(self) @@ -98,6 +98,10 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Added an Auto-Submitted: header to invitations and (un)subscription + confirmation requests to reduce the possibility of an autoresponder + confirming the request. (LP: #265831) + - Added javascript to the private.html and admlogin.html templates to focus the cursor on the entry field. (LP: #266054) |