Don't kill EoC when MIME header encodings are broken. New release.

[eoc.git] / eoc.py

diff --git a/eoc.py b/eoc.py
index b47b1474276b4d9ff50ccddf8c7116711d28a4c9..ecb8dafccf99baa56699610ba0c5db5009a3cd7a 100644 (file)
--- a/eoc.py
+++ b/eoc.py
@@ -4,7 +4,7 @@ This is a simple mailing list manager that mimicks the ezmlm-idx mail
 address commands. See manual page for more information.
 """
 
 address commands. See manual page for more information.
 """
 

-VERSION = "1.1.5"
+VERSION = "1.2.3"

 PLUGIN_INTERFACE_VERSION = "1"
 
 import getopt
 PLUGIN_INTERFACE_VERSION = "1"
 
 import getopt


@@ -395,13 +395,21 @@ class MailingListManager:
                "\n    ".join(text[:text.find("\n\n")].split("\n"))))
         if recipients:
             if self.smtp_server:
                "\n    ".join(text[:text.find("\n\n")].split("\n"))))
         if recipients:
             if self.smtp_server:

-                smtp = smtplib.SMTP(self.smtp_server)
-                smtp.sendmail(envelope_sender, recipients, text)
-                smtp.quit()
+                try:
+                    smtp = smtplib.SMTP(self.smtp_server)
+                    smtp.sendmail(envelope_sender, recipients, text)
+                    smtp.quit()
+                except:
+                    error("Error sending SMTP mail, mail probably not sent")
+                    sys.exit(1)

             elif self.qmqp_server:
             elif self.qmqp_server:

-                q = qmqp.QMQP(self.qmqp_server)
-                q.sendmail(envelope_sender, recipients, text)
-                q.quit()
+                try:
+                    q = qmqp.QMQP(self.qmqp_server)
+                    q.sendmail(envelope_sender, recipients, text)
+                    q.quit()
+                except:
+                    error("Error sending QMQP mail, mail probably not sent")
+                    sys.exit(1)

             else:
                 recipients = string.join(recipients, " ")
                 f = os.popen("%s -oi -f '%s' %s" % 
             else:
                 recipients = string.join(recipients, " ")
                 f = os.popen("%s -oi -f '%s' %s" % 


@@ -410,7 +418,11 @@ class MailingListManager:
                                   recipients),
                              "w")
                 f.write(text)
                                   recipients),
                              "w")
                 f.write(text)

-                f.close()
+                status = f.close()
+                if status:
+                    error("%s returned %s, mail sending probably failed" %
+                           (self.sendmail, status))
+                    sys.exit((status >> 8) & 0xff)

         else:
             debug("send_mail: no recipients, not sending")
 
         else:
             debug("send_mail: no recipients, not sending")
 


@@ -463,6 +475,8 @@ class MailingList:
 
     def read_stdin(self):
         data = sys.stdin.read()
 
     def read_stdin(self):
         data = sys.stdin.read()

+        # Convert CRLF to plain LF
+        data = "\n".join(data.split("\r\n"))

         # Skip Unix mbox "From " mail start indicator
         if data[:5] == "From ":
             data = string.split(data, "\n", 1)[1]
         # Skip Unix mbox "From " mail start indicator
         if data[:5] == "From ":
             data = string.split(data, "\n", 1)[1]


@@ -491,28 +505,32 @@ class MailingList:
         return True
     
     def mime_encode_headers(self, text):
         return True
     
     def mime_encode_headers(self, text):

-        headers, body = text.split("\n\n", 1)
-    
-        list = []
-        for line in headers.split("\n"):
-            if line[0].isspace():
-                list[-1] += line
-            else:
-                list.append(line)
-    
-        headers = []
-        for header in list:
-            if self.nice_7bit(header):
-                headers.append(header)
-            else:
-                if ": " in header:
-                    name, content = header.split(": ", 1)
+        try:
+            headers, body = text.split("\n\n", 1)
+        
+            list = []
+            for line in headers.split("\n"):
+                if line[0].isspace():
+                    list[-1] += line

                 else:
                 else:

-                    name, content = header.split(":", 1)
-                hdr = email.Header.Header(content, "utf-8")
-                headers.append(name + ": " + hdr.encode())
-    
-        return "\n".join(headers) + "\n\n" + body
+                    list.append(line)
+        
+            headers = []
+            for header in list:
+                if self.nice_7bit(header):
+                    headers.append(header)
+                else:
+                    if ": " in header:
+                        name, content = header.split(": ", 1)
+                    else:
+                        name, content = header.split(":", 1)
+                    hdr = email.Header.Header(content, "utf-8")
+                    headers.append(name + ": " + hdr.encode())
+        
+            return "\n".join(headers) + "\n\n" + body
+        except:
+            warning("Cannot MIME encode header, using original ones, sorry")
+            return text

 
     def template(self, template_name, dict):
         lang = self.cp.get("list", "language")
 
     def template(self, template_name, dict):
         lang = self.cp.get("list", "language")


@@ -846,15 +864,23 @@ class MailingList:
                 return mail
         headers = mail[:endpos].split("\n")
         body = mail[endpos:]
                 return mail
         headers = mail[:endpos].split("\n")
         body = mail[endpos:]

+        
+        headers_to_remove = [x.lower() for x in headers_to_remove]

     
         remaining = []
         add_continuation_lines = 0
     
         remaining = []
         add_continuation_lines = 0

+

         for header in headers:
         for header in headers:

-            pos = header.find(":")
-            if pos == -1:
+            if header[0] in [' ','\t']:
+                # this is a continuation line

                 if add_continuation_lines:
                     remaining.append(header)
             else:
                 if add_continuation_lines:
                     remaining.append(header)
             else:

+                pos = header.find(":")
+                if pos == -1:
+                    # malformed message, try to remove the junk
+                    add_continuation_lines = 0
+                    continue

                 name = header[:pos].lower()
                 if name in headers_to_remove:
                     add_continuation_lines = 0
                 name = header[:pos].lower()
                 if name in headers_to_remove:
                     add_continuation_lines = 0


@@ -874,12 +900,16 @@ class MailingList:
         if "base64" in text or "BASE64" in text:
             import StringIO
             for line in StringIO.StringIO(text):
         if "base64" in text or "BASE64" in text:
             import StringIO
             for line in StringIO.StringIO(text):

-                if line.lower.beginswith("content-transfer-encoding:") and \
+                if line.lower().startswith("content-transfer-encoding:") and \

                    "base64" in line.lower():
                     return text
         return text + self.template("footer", {})
 
     def send_mail_to_subscribers(self, text):
                    "base64" in line.lower():
                     return text
         return text + self.template("footer", {})
 
     def send_mail_to_subscribers(self, text):

+        text = self.remove_some_headers(text, ["list-id", "list-help",
+                                               "list-unsubscribe",
+                                               "list-subscribe", "list-post",
+                                               "list-owner", "precedence"])

         text = self.headers_to_add() + self.list_headers() + \
                self.headers_to_remove(text)
         text = self.append_footer(text)
         text = self.headers_to_add() + self.list_headers() + \
                self.headers_to_remove(text)
         text = self.append_footer(text)