From 540452e22108455e4efebc8fa7340760a68607f7 Mon Sep 17 00:00:00 2001
From: Jim Popovitch <jimpop@domainmail.org>
Date: Sun, 10 Jun 2018 23:01:35 +0000
Subject: Changes based on feedback from Mark.

---
 Mailman/Cgi/options.py | 10 ++++++----
 Mailman/Cgi/private.py |  3 ++-
 Mailman/MailList.py    |  4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py
index 6608df4f..e947ff60 100644
--- a/Mailman/Cgi/options.py
+++ b/Mailman/Cgi/options.py
@@ -288,13 +288,15 @@ def main():
         # 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)
diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py
index f5c73821..cb954d3c 100755
--- a/Mailman/Cgi/private.py
+++ b/Mailman/Cgi/private.py
@@ -146,7 +146,8 @@ def main():
                      os.environ.get('HTTP_X_FORWARDED_FOR',
                      os.environ.get('REMOTE_ADDR',
                                     'unidentified origin')))
-            syslog('security', 'Authorization failed (private): list=%s: remote=%s', listname, remote)
+            syslog('security', 'Authorization failed (private): user=%s list=%s 
+                                remote=%s', username, listname, remote)
             # give an HTTP 401 for authentication failure
             print 'Status: 401 Unauthorized'
         # Are we processing a password reminder from the login screen?
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 7b096bb1..fdc3802a 100755
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1070,8 +1070,6 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
                 {"listname" : realname,
                  "member"   : formataddr((name, email)),
                  }, mlist=self)
-            if whence:
-                text = "%s\nReason: %s" % (text, whence)
             msg = Message.OwnerNotification(self, subject, text)
             msg.send(self)
 
@@ -1108,8 +1106,6 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
                 {'member'  : name,
                  'listname': self.real_name,
                  }, mlist=self)
-            if whence:
-                text = "%s\nReason: %s" % (text, whence)
             msg = Message.OwnerNotification(self, subject, text)
             msg.send(self)
         if whence:
-- 
cgit v1.2.3