update

Author: jaredmauch

Mailman/Handlers/SMTPDirect.py

@@ -414,6 +414,18 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
         del msg['sender']
         msg['Sender'] = '"%s" <%s>' % (mlist.real_name, envsender)
 
+    # Check for spam indicators
+    if msg.get('X-Google-Group-Id'):
+        mailman_log('smtp-failure', 'Message rejected: Contains X-Google-Group-Id header, likely spam')
+        # Add all recipients to refused list
+        for r in recips:
+            refused[r] = (550, 'Message rejected: Contains X-Google-Group-Id header, likely spam')
+        # Move message to bad queue
+        badq = get_switchboard(Mailman.mm_cfg.BADQUEUE_DIR)
+        badq.enqueue(msg, msgdata)
+        failures.update(refused)
+        return
+
     # Get the plain, flattened text of the message
     msgtext = msg.as_string(mangle_from_=False)
     # Ensure the message text is properly encoded as UTF-8

Mailman/Queue/Switchboard.py

@@ -159,6 +159,11 @@ def dequeue(self, filebase):
         # Calculate the filename from the given filebase.
         filename = os.path.join(self.__whichq, filebase + '.pck')
 
+        # Check if file exists before proceeding
+        if not os.path.exists(filename):
+            mailman_log('warning', 'Queue file does not exist: %s', filename)
+            return None, None
+            
         # Create a lock file
         lockfile = filename + '.lock'
         try: