diff options
| -rw-r--r-- | Mailman/MailCommandHandler.py | 8 | ||||
| -rw-r--r-- | modules/mm_mailcmd.py | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py index 45383733f..8906773e6 100644 --- a/Mailman/MailCommandHandler.py +++ b/Mailman/MailCommandHandler.py @@ -1,6 +1,6 @@ """Process maillist user commands arriving via email.""" -__version__ = "$Revision: 398 $" +__version__ = "$Revision: 468 $" # Try to stay close to majordomo commands, but accept common mistakes. # Not implemented: get / index / which. @@ -58,6 +58,12 @@ class MailCommandHandler: def ParseMailCommands(self): mail = mm_message.IncomingMessage() subject = mail.getheader("subject") + sender = string.lower(mail.GetSender()) + if sender in ['mailer-daemon', 'postmaster', 'orphanage', + 'postoffice']: + self.LogMsg("bounce", "%s: Mailcmd from %s rejected, subj %s", + self._internal_name, sender, `subject`) + return if subject: subject = string.strip(subject) if (subject and self._cmd_dispatch.has_key(string.split(subject)[0])): diff --git a/modules/mm_mailcmd.py b/modules/mm_mailcmd.py index 45383733f..8906773e6 100644 --- a/modules/mm_mailcmd.py +++ b/modules/mm_mailcmd.py @@ -1,6 +1,6 @@ """Process maillist user commands arriving via email.""" -__version__ = "$Revision: 398 $" +__version__ = "$Revision: 468 $" # Try to stay close to majordomo commands, but accept common mistakes. # Not implemented: get / index / which. @@ -58,6 +58,12 @@ class MailCommandHandler: def ParseMailCommands(self): mail = mm_message.IncomingMessage() subject = mail.getheader("subject") + sender = string.lower(mail.GetSender()) + if sender in ['mailer-daemon', 'postmaster', 'orphanage', + 'postoffice']: + self.LogMsg("bounce", "%s: Mailcmd from %s rejected, subj %s", + self._internal_name, sender, `subject`) + return if subject: subject = string.strip(subject) if (subject and self._cmd_dispatch.has_key(string.split(subject)[0])): |