Changeset 7382

Timestamp:

18 Dec 2011, 15:32:10 (13 years ago)

Author:

uli

Message:

Dirty hack to enable unicode-aware SMTP handling. This is still not
sufficient.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -24 +24 @@
 from email.mime.text import MIMEText
 from waeup.sirp.interfaces import ISIRPUtils
+
+from email.Header import Header
+from email.Utils import parseaddr, formataddr
+
 
 class SIRPUtils(grok.GlobalUtility):
@@ -71 +75 @@
                  email_to,subject):
         """Send an email with user credentials.
+
+        XXX: While this method is unicode-proof (i.e. it can handle
+             non-plain-ASCII chars in names and messages) other
+             methods inhere are not and will fail silently. Some
+             reorganization of SMPT-related code is needed here.
         """
         config = grok.getSite()['configuration']
+        header_charset = 'ISO-8859-1'
         text = """Dear %s,
 
@@ -86 +96 @@
 your password secret!
 
+Please also note that passwords are case-sensitive.
+
 Regards
 """
-        msg = MIMEText(text % (fullname,msg,config.name,username,password,login_url))
-        msg['From'] = '%s <%s>' % (config.name_admin,config.email_admin)
-        msg['To'] = email_to
-        msg['Subject'] = subject
+        from_ = '%s <%s>' % (config.name_admin,config.email_admin)
+        from_name, from_addr = parseaddr(from_)
+        rcpt_name, rcpt_addr = parseaddr(email_to)
+        from_name = str(Header(unicode(from_name), header_charset))
+        rcpt_name = str(Header(unicode(rcpt_name), header_charset))
+        from_addr = from_addr.encode('ascii')
+        rpct_addr = rcpt_addr.encode('ascii')
+
+        body = text % (
+                fullname, msg,config.name,username,password,login_url)
+        for body_charset in ['US-ASCII', 'ISO-8859-1', 'UTF-8']:
+            try:
+                body.encode(body_charset)
+            except UnicodeError:
+                print "FAILED: ", body_charset, text
+                pass
+            else:
+                break
+
+        msg = MIMEText(body.encode(body_charset), 'plain', body_charset)
+        msg['From'] = formataddr((from_name, from_addr))
+        msg['To'] = formataddr((rcpt_name, rcpt_addr))
+        msg['Subject'] = Header(unicode(subject), header_charset)
         server = smtplib.SMTP(config.smtp_server)
         if config.smtp_requires_login:
@@ -97 +128 @@
         try:
             server.sendmail(config.email_admin,email_to,msg.as_string())
-        except:
+        except Exception, e:
+            # XXX: log error message
             return False
         server.quit()
         return True
-