update

Author: jaredmauch

Mailman/Handlers/SMTPDirect.py

@@ -174,12 +174,13 @@ def process(mlist, msg, msgdata):
 
     # Check for spam headers first
     if msg.get('x-google-group-id'):
-        mailman_log('error', 'Rejecting message with X-Google-Group-Id header')
+        mailman_log('error', 'Silently dropping message with X-Google-Group-Id header')
         # Add all recipients to refused list with 550 error
         for r in recips:
             refused[r] = (550, 'Message rejected due to spam detection')
         # Update failures dict
         msgdata['failures'] = refused
+        # Silently return without raising an exception
         return
 
     # Chunkify the recipients

Mailman/MailList.py

@@ -1432,3 +1432,42 @@ def CheckPending(self, email, unsub=False):
                     data.lower() == email.lower()):
                 return True
         return False
+
+    def GetBannedPattern(self, email):
+        """Check if the email address matches any banned patterns.
+        
+        Args:
+            email: The email address to check
+            
+        Returns:
+            The matching pattern if found, None otherwise
+        """
+        if not self.ban_list:
+            return None
+            
+        # Convert email to lowercase for case-insensitive matching
+        email = email.lower()
+        
+        # Check each pattern in the ban list
+        for pattern in self.ban_list:
+            # Skip empty patterns
+            if not pattern.strip():
+                continue
+                
+            # If pattern starts with @, it's a domain pattern
+            if pattern.startswith('@'):
+                domain = pattern[1:].lower()
+                if email.endswith(domain):
+                    return pattern
+            # Otherwise it's a regex pattern
+            else:
+                try:
+                    cre = re.compile(pattern, re.IGNORECASE)
+                    if cre.search(email):
+                        return pattern
+                except re.error:
+                    syslog('error', 'Invalid regex pattern in ban_list: %s',
+                           pattern)
+                    continue
+                    
+        return None