update

Author: jaredmauch

Mailman/MailList.py

@@ -96,7 +96,8 @@ def __init__(self, name=None, lock=1):
             # pipe to the wrapper in an MTA alias or other delivery process
             # contains shell special characters so allow only defined characters
             # (default = '[-+_.=a-z0-9]').
-            if len(re.sub(r'[%s]' % mm_cfg.ACCEPTABLE_LISTNAME_CHARACTERS.replace('-', r'\-'), '', name)) > 0:
+            pattern = mm_cfg.ACCEPTABLE_LISTNAME_CHARACTERS.replace('-', r'\-')
+            if len(re.sub(r'[%s]' % pattern, '', name)) > 0:
                 raise Errors.BadListNameError(name)
             # Validate what will be the list's posting address
             postingaddr = '%s@%s' % (name, mm_cfg.DEFAULT_EMAIL_HOST)

Mailman/Queue/IncomingRunner.py

@@ -362,10 +362,16 @@ def _oneloop(self):
                             import sys
                             MailList = sys.modules['Mailman.MailList'].MailList
                             mlist = MailList(listname, lock=0)
-                        except Errors.MMUnknownListError:
-                            mailman_log('error', 'IncomingRunner._oneloop: Unknown list %s', listname)
-                            self._shunt.enqueue(msg, msgdata)
-                            continue
+                        except (Errors.BadListNameError, Errors.MMUnknownListError) as e:
+                            # List doesn't exist or has invalid name - move message to bad queue
+                            mailman_log('error', 'List not found: %s - moving message to bad queue', listname)
+                            try:
+                                badq = get_switchboard(mm_cfg.BADQUEUE_DIR)
+                                badq.enqueue(msg, listname=listname, tolist=listname)
+                                return True
+                            except Exception as e:
+                                mailman_log('error', 'Failed to move message to bad queue: %s', str(e))
+                                return False
 
                         # Process the message
                         result = self._dispose(mlist, msg, msgdata)