Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only parse from email if provided

This commit is contained in:
Brendan Abolivier 2019-06-04 14:24:36 +01:00
parent 1cc5fc1f6c
commit 2f62e1f6ff
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/config/emailconfig.py
View File

@ -51,10 +51,11 @@ class EmailConfig(Config):
self.email_app_name = "Matrix" self.email_app_name = "Matrix"
self.email_notif_from = email_config.get("notif_from", None) self.email_notif_from = email_config.get("notif_from", None)
# make sure it's valid if self.email_notif_from is not None:
parsed = email.utils.parseaddr(self.email_notif_from) # make sure it's valid
if self.email_notif_from and parsed[1] == '': parsed = email.utils.parseaddr(self.email_notif_from)
raise RuntimeError("Invalid notif_from address") if parsed[1] == '':
raise RuntimeError("Invalid notif_from address")
template_dir = email_config.get("template_dir") template_dir = email_config.get("template_dir")
# we need an absolute path, because we change directory after starting (and # we need an absolute path, because we change directory after starting (and