Ensure all scripts and inject logic enqueue Mailman.Message.Message objects, not strings or plain email.message.Message

Author: jaredmauch

Mailman/Post.py

@@ -20,6 +20,8 @@
 
 from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
+from Mailman.Message import Message
+from email import message_from_string
 
 
 
@@ -33,7 +35,19 @@ def inject(listname, msg, recips=None, qdir=None):
            }
     if recips:
         kws['recips'] = recips
-    queue.enqueue(msg, msgdata=kws)
+    # Ensure msg is a Mailman.Message.Message
+    if isinstance(msg, str):
+        emsg = message_from_string(msg)
+    else:
+        emsg = msg
+    if not isinstance(emsg, Message):
+        mmsg = Message()
+        for k, v in emsg.items():
+            mmsg[k] = v
+        mmsg.set_payload(emsg.get_payload())
+    else:
+        mmsg = emsg
+    queue.enqueue(mmsg, msgdata=kws)
 
 
 

scripts/bounces

@@ -33,6 +33,8 @@ from Mailman import Utils
 from Mailman.i18n import _
 from Mailman.Queue.sbcache import get_switchboard
 from Mailman.Logging.Utils import LogStdErr
+from Mailman.Message import Message
+from email import message_from_string
 
 LogStdErr('error', 'bounces')
 
@@ -53,8 +55,17 @@ def main():
     # some MTAs have a hard limit to the time a filter prog can run.  Postfix
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
+    msgtext = sys.stdin.read()
+    emsg = message_from_string(msgtext)
+    if not isinstance(emsg, Message):
+        mmsg = Message()
+        for k, v in emsg.items():
+            mmsg[k] = v
+        mmsg.set_payload(emsg.get_payload())
+    else:
+        mmsg = emsg
     bounceq = get_switchboard(mm_cfg.BOUNCEQUEUE_DIR)
-    bounceq.enqueue(sys.stdin.read(), msgdata={'listname': listname, '_plaintext': 1})
+    bounceq.enqueue(mmsg, msgdata={'listname': listname, '_plaintext': 1})
 
 
 

scripts/owner

@@ -34,6 +34,8 @@ from Mailman import Utils
 from Mailman.i18n import _
 from Mailman.Queue.sbcache import get_switchboard
 from Mailman.Logging.Utils import LogStdErr
+from Mailman.Message import Message
+from email import message_from_string
 
 LogStdErr('error', 'mailowner')
 
@@ -54,8 +56,17 @@ def main():
     # incoming queue because we need some processing done on the message.  The
     # processing is minimal though, so craft our own pipeline, expressly for
     # the purpose of delivering to the list owners.
+    msgtext = sys.stdin.read()
+    emsg = message_from_string(msgtext)
+    if not isinstance(emsg, Message):
+        mmsg = Message()
+        for k, v in emsg.items():
+            mmsg[k] = v
+        mmsg.set_payload(emsg.get_payload())
+    else:
+        mmsg = emsg
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
-    inq.enqueue(sys.stdin.read(),
+    inq.enqueue(mmsg,
                 msgdata={
                     'listname': listname,
                     '_plaintext': 1,

scripts/post

@@ -39,6 +39,7 @@ from Mailman.i18n import _
 from Mailman.Queue.sbcache import get_switchboard
 from Mailman.Logging.Utils import LogStdErr
 from Mailman.Logging.Syslog import mailman_log
+from Mailman.Message import Message
 
 LogStdErr("error", "post")
 
@@ -60,19 +61,26 @@ def main():
     # Read the message from stdin
     msgtext = sys.stdin.read()
     # Parse the message to get headers for logging
-    msg = message_from_string(msgtext)
+    emsg = message_from_string(msgtext)
+    if not isinstance(emsg, Message):
+        mmsg = Message()
+        for k, v in emsg.items():
+            mmsg[k] = v
+        mmsg.set_payload(emsg.get_payload())
+    else:
+        mmsg = emsg
     # Log the inbound message
     mailman_log('post', 'inbound message to %s from %s, subject: %s, message-id: %s',
-           listname, msg.get('from', 'unknown'),
-           msg.get('subject', '(no subject)'),
-           msg.get('message-id', 'n/a'))
+           listname, mmsg.get('from', 'unknown'),
+           mmsg.get('subject', '(no subject)'),
+           mmsg.get('message-id', 'n/a'))
     # Immediately queue the message for the incoming qrunner to process.  The
     # advantage to this approach is that messages should never get lost --
     # some MTAs have a hard limit to the time a filter prog can run.  Postfix
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
-    qfile = inq.enqueue(msgtext,
+    qfile = inq.enqueue(mmsg,
                        msgdata={'listname': listname,
                                'tolist': 1,
                                '_plaintext': 1})