update

Author: jaredmauch

Mailman/Handlers/SMTPDirect.py

@@ -423,6 +423,14 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
     refused = {}
     recips = msgdata['recips']
     msgid = msg.get('Message-ID', 'n/a')
+    # Ensure msgid is a string
+    if isinstance(msgid, bytes):
+        try:
+            msgid = msgid.decode('utf-8', 'replace')
+        except UnicodeDecodeError:
+            msgid = msgid.decode('latin-1', 'replace')
+    elif not isinstance(msgid, str):
+        msgid = str(msgid)
     try:
         # Send the message
         refused = conn.sendmail(envsender, recips, msgtext)
@@ -431,7 +439,7 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
                e, msgid)
         refused = e.recipients
         # Move message to bad queue since all recipients were refused
-        badq = get_switchboard(mm_cfg.BADQUEUE_DIR)
+        badq = get_switchboard(Mailman.mm_cfg.BADQUEUE_DIR)
         badq.enqueue(msg, msgdata)
     except smtplib.SMTPResponseException as e:
         mailman_log('smtp-failure', 'SMTP session failure: %s, %s, msgid: %s',
@@ -441,7 +449,7 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
             # Permanent failure - add to refused and move to bad queue
             for r in recips:
                 refused[r] = (e.smtp_code, e.smtp_error)
-            badq = get_switchboard(mm_cfg.BADQUEUE_DIR)
+            badq = get_switchboard(Mailman.mm_cfg.BADQUEUE_DIR)
             badq.enqueue(msg, msgdata)
         else:
             # Temporary failure - don't add to refused
@@ -453,6 +461,6 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
         for r in recips:
             refused[r] = (-1, error)
         # Move message to bad queue for low level errors
-        badq = get_switchboard(mm_cfg.BADQUEUE_DIR)
+        badq = get_switchboard(Mailman.mm_cfg.BADQUEUE_DIR)
         badq.enqueue(msg, msgdata)
     failures.update(refused)

Mailman/MailList.py

@@ -332,19 +332,19 @@ def InitTempVars(self, name):
         # timestamp is newer than the modtime of the config.pck file, we don't
         # need to reload, otherwise... we do.
         self.__timestamp = 0
-        self.__lock = LockFile.LockFile(
-            os.path.join(mm_cfg.LOCK_DIR, name or '<site>') + '.lock',
-            # TBD: is this a good choice of lifetime?
-            lifetime = mm_cfg.LIST_LOCK_LIFETIME,
-            withlogging = mm_cfg.LIST_LOCK_DEBUGGING)
-        # Ensure name is a string
+        # Ensure name is a string before using it in os.path.join
         if isinstance(name, bytes):
             try:
                 # Try Latin-1 first since that's what we're seeing in the data
                 name = name.decode('latin-1', 'replace')
             except UnicodeDecodeError:
                 # Fall back to UTF-8 if Latin-1 fails
                 name = name.decode('utf-8', 'replace')
+        self.__lock = LockFile.LockFile(
+            os.path.join(mm_cfg.LOCK_DIR, name or '<site>') + '.lock',
+            # TBD: is this a good choice of lifetime?
+            lifetime = mm_cfg.LIST_LOCK_LIFETIME,
+            withlogging = mm_cfg.LIST_LOCK_DEBUGGING)
         self._internal_name = name
         if name:
             self._full_path = Site.get_listpath(name)
@@ -366,6 +366,14 @@ def InitVars(self, name=None, admin='', crypted_password='',
         """Assign default values - some will be overriden by stored state."""
         # Non-configurable list info
         if name:
+            # Ensure name is a string
+            if isinstance(name, bytes):
+                try:
+                    # Try Latin-1 first since that's what we're seeing in the data
+                    name = name.decode('latin-1', 'replace')
+                except UnicodeDecodeError:
+                    # Fall back to UTF-8 if Latin-1 fails
+                    name = name.decode('utf-8', 'replace')
             self._internal_name = name
 
         # When was the list created?
@@ -593,6 +601,14 @@ def GetConfigInfo(self, category, subcat=None):
     #
     def Create(self, name, admin, crypted_password,
                langs=None, emailhost=None, urlhost=None):
+        # Ensure name is a string
+        if isinstance(name, bytes):
+            try:
+                # Try Latin-1 first since that's what we're seeing in the data
+                name = name.decode('latin-1', 'replace')
+            except UnicodeDecodeError:
+                # Fall back to UTF-8 if Latin-1 fails
+                name = name.decode('utf-8', 'replace')
         if name != name.lower():
             raise ValueError('List name must be all lower case.')
         if Utils.list_exists(name):