File size: 1,932 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | diff --git a/sydent/util/emailutils.py b/sydent/util/emailutils.py
index 2ae5fdc..7b3b92c 100644
--- a/sydent/util/emailutils.py
+++ b/sydent/util/emailutils.py
@@ -55,12 +55,13 @@ def sendEmail(sydent, templateName, mailTo, substitutions):
allSubstitutions[k+"_forhtml"] = cgi.escape(v.decode('utf8'))
allSubstitutions[k+"_forurl"] = urllib.quote(v)
- mailString = open(mailTemplateFile).read() % allSubstitutions
- rawFrom = email.utils.parseaddr(mailFrom)[1]
- rawTo = email.utils.parseaddr(mailTo)[1]
- if rawFrom == '' or rawTo == '':
+ mailString = open(mailTemplateFile).read().decode('utf8') % allSubstitutions
+ parsedFrom = email.utils.parseaddr(mailFrom)[1]
+ parsedTo = email.utils.parseaddr(mailTo)[1]
+ if parsedFrom == '' or parsedTo == '':
logger.info("Couldn't parse from / to address %s / %s", mailFrom, mailTo)
raise EmailAddressException()
+
mailServer = sydent.cfg.get('email', 'email.smtphost')
mailPort = sydent.cfg.get('email', 'email.smtpport')
mailUsername = sydent.cfg.get('email', 'email.smtpusername')
@@ -77,7 +78,12 @@ def sendEmail(sydent, templateName, mailTo, substitutions):
smtp = smtplib.SMTP(mailServer, mailPort, myHostname)
if mailUsername != '':
smtp.login(mailUsername, mailPassword)
- smtp.sendmail(rawFrom, rawTo, mailString.encode('utf-8'))
+
+ # We're using the parsing above to do basic validation, but instead of
+ # failing it may munge the address it returns. So we should *not* use
+ # that parsed address, as it may not match any validation done
+ # elsewhere.
+ smtp.sendmail(mailFrom, mailTo, mailString.encode('utf-8'))
smtp.quit()
except Exception as origException:
twisted.python.log.err()
|