update

Author: jaredmauch

Mailman/Queue/CommandRunner.py

@@ -244,6 +244,37 @@ def indent(lines):
 class CommandRunner(Runner):
     QDIR = mm_cfg.CMDQUEUE_DIR
 
+    def _validate_message(self, msg, msgdata):
+        """Validate a command message.
+        
+        Args:
+            msg: The message to validate
+            msgdata: Additional message metadata
+            
+        Returns:
+            tuple: (msg, success) where success is True if validation passed
+        """
+        try:
+            # Check for required headers
+            if not msg.get('message-id'):
+                syslog('error', 'CommandRunner._validate_message: Missing Message-ID header')
+                return msg, False
+                
+            if not msg.get('from'):
+                syslog('error', 'CommandRunner._validate_message: Missing From header')
+                return msg, False
+                
+            # Check for command in msgdata
+            if not msgdata.get('command'):
+                syslog('error', 'CommandRunner._validate_message: No command in msgdata')
+                return msg, False
+                
+            return msg, True
+            
+        except Exception as e:
+            syslog('error', 'CommandRunner._validate_message: Error validating message: %s', str(e))
+            return msg, False
+
     def _dispose(self, mlist, msg, msgdata):
         # Validate message type first
         msg, success = self._validate_message(msg, msgdata)

Mailman/Queue/NewsRunner.py

@@ -102,16 +102,24 @@ def _connect(self):
             self._nntp = None
 
     def _validate_message(self, msg, msgdata):
-        """Validate the message for news posting."""
+        """Validate the message for news posting.
+        
+        Args:
+            msg: The message to validate
+            msgdata: Additional message metadata
+            
+        Returns:
+            tuple: (msg, success) where success is True if validation passed
+        """
         try:
             # Check if the message has a Message-ID
             if not msg.get('message-id'):
                 syslog('error', 'Message validation failed for news message')
-                return False
-            return True
+                return msg, False
+            return msg, True
         except Exception as e:
             syslog('error', 'Error validating news message: %s', str(e))
-            return False
+            return msg, False
 
     def _dispose(self, mlist, msg, msgdata):
         """Post the message to the newsgroup."""
@@ -140,7 +148,8 @@ def _onefile(self, msg, msgdata):
         """
         try:
             # Validate the message
-            if not self._validate_message(msg, msgdata):
+            msg, success = self._validate_message(msg, msgdata)
+            if not success:
                 syslog('error', 'NewsRunner._onefile: Message validation failed')
                 self._shunt.enqueue(msg, msgdata)
                 return

Mailman/Queue/OutgoingRunner.py

@@ -216,15 +216,39 @@ def _convert_message(self, msg):
             return mailman_msg
         return msg
 
-    def _validate_message(self, msg):
-        """Validate the message before processing.
+    def _validate_message(self, msg, msgdata):
+        """Validate the message for outgoing delivery.
         
-        This method is called before _dispose() to validate the message.
-        Returns a tuple of (msg, success) where success is a boolean indicating
-        if validation was successful.
+        Args:
+            msg: The message to validate
+            msgdata: Additional message metadata
+            
+        Returns:
+            tuple: (msg, success) where success is a boolean indicating if validation was successful
         """
-        # No validation needed - this check was not in the original code
-        return msg, True
+        try:
+            # Convert message if needed
+            if not isinstance(msg, Message.Message):
+                msg = self._convert_message(msg)
+                
+            # Check required headers
+            if not msg.get('message-id'):
+                mailman_log('error', 'OutgoingRunner._validate_message: Message missing Message-ID header')
+                return msg, False
+                
+            if not msg.get('from'):
+                mailman_log('error', 'OutgoingRunner._validate_message: Message missing From header')
+                return msg, False
+                
+            if not msg.get('to') and not msg.get('recipients'):
+                mailman_log('error', 'OutgoingRunner._validate_message: Message missing To/Recipients')
+                return msg, False
+                
+            return msg, True
+            
+        except Exception as e:
+            mailman_log('error', 'OutgoingRunner._validate_message: Error validating message: %s', str(e))
+            return msg, False
 
     def _dispose(self, mlist, msg, msgdata):
         """Process an outgoing message."""
@@ -268,7 +292,7 @@ def _dispose(self, mlist, msg, msgdata):
                 return False
 
             # Validate message type first
-            msg, success = self._validate_message(msg)
+            msg, success = self._validate_message(msg, msgdata)
             if not success:
                 mailman_log('error', 'OutgoingRunner._dispose: Message validation failed for message %s', msgid)
                 self._unmark_message_processed(msgid)

Mailman/Queue/RetryRunner.py

@@ -323,10 +323,6 @@ def _oneloop(self):
             files = self._switchboard.files()
             filecnt = len(files)
 
-            # Only log at debug level if we found files to process
-            if filecnt > 0:
-                mailman_log('debug', 'RetryRunner._oneloop: Found %d files to process', filecnt)
-            
             # Process each file
             for filebase in files:
                 try:
@@ -335,41 +331,38 @@ def _oneloop(self):
                     if msg is None:
                         continue
 
-                    mailman_log('info', 'RetryRunner._oneloop: Successfully dequeued file %s', filebase)
-                    
-                    # Process the message
-                    try:
-                        # Get the list name from the message data
-                        listname = msgdata.get('listname', mm_cfg.MAILMAN_SITE_LIST)
+                    # Get the list name from the message data
+                    listname = msgdata.get('listname')
+                    if not listname:
+                        syslog('error', 'RetryRunner._oneloop: No listname in message data for file %s', filebase)
+                        self._shunt.enqueue(msg, msgdata)
+                        continue
 
-                        # Process the message
-                        result = self._dispose(listname, msg, msgdata)
+                    # Open the list
+                    try:
+                        mlist = self._open_list(listname)
+                    except Exception as e:
+                        self.log_error('list_open_error', str(e), listname=listname)
+                        self._shunt.enqueue(msg, msgdata)
+                        continue
 
-                        # If the message should be kept in the queue, requeue it
+                    # Process the message
+                    try:
+                        result = self._dispose(mlist, msg, msgdata)
                         if result:
                             self._switchboard.enqueue(msg, msgdata)
-                            mailman_log('info', 'RetryRunner._oneloop: Message requeued for later processing: %s', filebase)
-                        else:
-                            mailman_log('info', 'RetryRunner._oneloop: Message processing complete, moving to shunt queue %s (msgid: %s)',
-                                      filebase, msg.get('message-id', 'n/a'))
-                            
                     except Exception as e:
-                        mailman_log('error', 'RetryRunner._oneloop: Error processing message: %s\n%s',
-                                  str(e), traceback.format_exc())
-                        # Move to shunt queue on error
-                        self._shunt.enqueue(msg, msgdata)
+                        self._handle_error(e, msg=msg, mlist=mlist)
 
                 except Exception as e:
-                    mailman_log('error', 'RetryRunner._oneloop: Error dequeuing file %s: %s\n%s',
-                              filebase, str(e), traceback.format_exc())
+                    syslog('error', 'RetryRunner._oneloop: Error dequeuing file %s: %s', filebase, str(e))
+                    continue
 
-            # Only log completion at debug level if we processed files
-            if filecnt > 0:
-                mailman_log('debug', 'RetryRunner._oneloop: Loop complete, processed %d files', filecnt)
-                
         except Exception as e:
-            mailman_log('error', 'RetryRunner._oneloop: Unexpected error in main loop: %s\n%s',
-                      str(e), traceback.format_exc())
+            syslog('error', 'RetryRunner._oneloop: Error in main loop: %s', str(e))
+            return 0
+            
+        return filecnt
 
     def _snooze(self, filecnt):
         # We always want to snooze, but check for stop flag periodically