[Mailman-checkins] [Branch ~mailman-coders/mailman/2.1] Rev 1769: Added %(whence)s replacement for admin (un)subscribe notices.
Merge authors:
Jim Popovitch (jimpop)
Related merge proposals:
https://code.launchpad.net/~jimpop/mailman/owner-notification-whence/+merge/347785
proposed by: Jim Popovitch (jimpop)
revno: 1769 [merge]
committer: Mark Sapiro
branch nick: 2.1
timestamp: Mon 2018-06-11 19:29:33 -0700
message:
Added %(whence)s replacement for admin (un)subscribe notices.
modified:
Mailman/MailList.py
NEWS
templates/en/adminsubscribeack.txt
templates/en/adminunsubscribeack.txt
--
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/MailList.py'
--- Mailman/MailList.py 2018-06-10 23:01:35 +
+++ Mailman/MailList.py 2018-06-12 02:29:33 +
@@ -1069,6 +1069,7 @@
"adminsubscribeack.txt",
{"listname" : realname,
"member" : formataddr((name, email)),
+ "whence" : "" if whence is None else "(" + whence + ")"
}, mlist=self)
msg = Message.OwnerNotification(self, subject, text)
msg.send(self)
@@ -1105,6 +1106,7 @@
'adminunsubscribeack.txt',
{'member' : name,
'listname': self.real_name,
+ "whence" : "" if whence is None else "(" + whence + ")"
}, mlist=self)
msg = Message.OwnerNotification(self, subject, text)
msg.send(self)
=== modified file 'NEWS'
--- NEWS 2018-06-11 16:59:26 +
+++ NEWS 2018-06-12 02:29:33 +
@@ -39,6 +39,11 @@
'mischief' log entries for 'hostile listname' noe include the remote IP
if available.
+- Thanks to Jim Popovitch, admin notices of (un)subscribes now may give
+ the source of the action. This consists of a %(whence)s replacement
+ that can be added to the admin(un)subscribeack.txt templates. This
+ has been done for the 'en' templates, but not for most others.
+
i18n
- The Japanese translation has been updated by Yasuhito FUTATSUKI.
=== modified file 'templates/en/adminsubscribeack.txt'
--- templates/en/adminsubscribeack.txt 2003-01-02 05:25:50 +
+++ templates/en/adminsubscribeack.txt 2018-06-12 02:29:33 +
@@ -1,3 +1,3 @@
%(member)s has been successfully subscribed to %(listname)s.
-
+%(whence)s
=== modified file 'templates/en/adminunsubscribeack.txt'
--- templates/en/adminunsubscribeack.txt 2003-01-02 05:25:50 +
+++ templates/en/adminunsubscribeack.txt 2018-06-12 02:29:33 +
@@ -1,2 +1,3 @@
%(member)s has been removed from %(listname)s.
+%(whence)s
___
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
[Mailman-checkins] [Merge] lp:~jimpop/mailman/owner-notification-whence into lp:mailman/2.1
The proposal to merge lp:~jimpop/mailman/owner-notification-whence into lp:mailman/2.1 has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~jimpop/mailman/owner-notification-whence/+merge/347785 -- Your team Mailman Checkins is subscribed to branch lp:mailman/2.1. ___ Mailman-checkins mailing list Mailman-checkins@python.org Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
[Mailman-checkins] [Merge] lp:~jimpop/mailman/owner-notification-whence into lp:mailman/2.1
Jim Popovitch has proposed merging lp:~jimpop/mailman/owner-notification-whence into lp:mailman/2.1. Commit message: This small change adds the whence text to sub/unsub notifications sent to list owners. Requested reviews: Mark Sapiro (msapiro): i18l For more details, see: https://code.launchpad.net/~jimpop/mailman/owner-notification-whence/+merge/347785 -- Your team Mailman Checkins is subscribed to branch lp:mailman/2.1. ___ Mailman-checkins mailing list Mailman-checkins@python.org Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
[Mailman-checkins] [Merge] lp:~jimpop/mailman/security-logging into lp:mailman/2.1
The proposal to merge lp:~jimpop/mailman/security-logging into lp:mailman/2.1 has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~jimpop/mailman/security-logging/+merge/347728 -- Your team Mailman Checkins is subscribed to branch lp:mailman/2.1. ___ Mailman-checkins mailing list Mailman-checkins@python.org Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
[Mailman-checkins] [Branch ~mailman-coders/mailman/2.1] Rev 1768: Implement security log.
Merge authors:
Jim Popovitch (jimpop)
Related merge proposals:
https://code.launchpad.net/~jimpop/mailman/security-logging/+merge/347728
proposed by: Jim Popovitch (jimpop)
review: Approve - Mark Sapiro (msapiro)
review: Resubmit - Jim Popovitch (jimpop)
revno: 1768 [merge]
committer: Mark Sapiro
branch nick: 2.1
timestamp: Mon 2018-06-11 09:59:26 -0700
message:
Implement security log.
modified:
Mailman/Cgi/admin.py
Mailman/Cgi/admindb.py
Mailman/Cgi/edithtml.py
Mailman/Cgi/options.py
Mailman/Cgi/private.py
Mailman/Cgi/roster.py
Mailman/Utils.py
NEWS
--
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/Cgi/admin.py'
--- Mailman/Cgi/admin.py 2017-06-21 16:59:41 +
+++ Mailman/Cgi/admin.py 2018-06-11 16:59:26 +
@@ -119,6 +119,13 @@
if cgidata.has_key('adminpw'):
# This is a re-authorization attempt
msg = Bold(FontSize('+1', _('Authorization failed.'))).Format()
+remote = os.environ.get('HTTP_FORWARDED_FOR',
+ os.environ.get('HTTP_X_FORWARDED_FOR',
+ os.environ.get('REMOTE_ADDR',
+'unidentified origin')))
+syslog('security',
+ 'Authorization failed (admin): list=%s: remote=%s',
+ listname, remote)
else:
msg = ''
Auth.loginpage(mlist, 'admin', msg=msg)
=== modified file 'Mailman/Cgi/admindb.py'
--- Mailman/Cgi/admindb.py 2017-06-24 21:34:48 +
+++ Mailman/Cgi/admindb.py 2018-06-11 16:59:26 +
@@ -159,6 +159,13 @@
if cgidata.has_key('adminpw'):
# This is a re-authorization attempt
msg = Bold(FontSize('+1', _('Authorization failed.'))).Format()
+remote = os.environ.get('HTTP_FORWARDED_FOR',
+ os.environ.get('HTTP_X_FORWARDED_FOR',
+ os.environ.get('REMOTE_ADDR',
+'unidentified origin')))
+syslog('security',
+ 'Authorization failed (admindb): list=%s: remote=%s',
+ listname, remote)
else:
msg = ''
Auth.loginpage(mlist, 'admindb', msg=msg)
=== modified file 'Mailman/Cgi/edithtml.py'
--- Mailman/Cgi/edithtml.py 2017-06-06 05:47:05 +
+++ Mailman/Cgi/edithtml.py 2018-06-11 16:59:26 +
@@ -126,6 +126,13 @@
if cgidata.has_key('admlogin'):
# This is a re-authorization attempt
msg = Bold(FontSize('+1', _('Authorization failed.'))).Format()
+remote = os.environ.get('HTTP_FORWARDED_FOR',
+ os.environ.get('HTTP_X_FORWARDED_FOR',
+ os.environ.get('REMOTE_ADDR',
+'unidentified origin')))
+syslog('security',
+ 'Authorization failed (edithtml): list=%s: remote=%s',
+ listname, remote)
else:
msg = ''
Auth.loginpage(mlist, 'admin', msg=msg)
=== modified file 'Mailman/Cgi/options.py'
--- Mailman/Cgi/options.py 2018-02-04 16:41:19 +
+++ Mailman/Cgi/options.py 2018-06-11 16:59:26 +
@@ -288,13 +288,16 @@
# message.
if cgidata.has_key('password'):
doc.addError(_('Authentication failed.'))
+remote = os.environ.get('HTTP_FORWARDED_FOR',
+ os.environ.get('HTTP_X_FORWARDED_FOR',
+ os.environ.get('REMOTE_ADDR',
+'unidentified origin')))
+syslog('security',
+ 'Authorization failed (private): user=%s: list=%s: remote=%s',
+ user, listname, remote)
# So as not to allow membership leakage, prompt for the email
# address and the password here.
if mlist.private_roster <> 0:
-remote = os.environ.get('HTTP_FORWARDED_FOR',
- os.environ.get('HTTP_X_FORWARDED_FOR',
- os.environ.get('REMOTE_ADDR',
-'unidentified origin')))
syslog('mischief',
'Login failure with private rosters: %s from %s',
user, remote)
=== modified file 'Mailman/Cgi/private.py'
--- Mailman/Cgi/private.py 2017-06-06 05:47:05 +
+++ Mailman/Cgi/private.py 2018-06-11 16:59:26 +
@@ -142,6 +142,13 @@
if cgidata.has_key('submit'):
# This is a re-authorization attempt
message = Bold(FontSize('+1', _('Authorization failed.'))).Format()
+remote = os.environ.get('HTTP_FORWARDED_FOR',
+
