paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

send_email: Substitute body directly, not via Jinja2.

Browse Source 
Substituting the rendered body via Jinja2 means that it cannot
perform any interpolation itself.  While the string replacement is
hacky, it is the only solution which avoids running Jinja2 more than
once, and also allows the user-supplied content to have Jinja2
substitutions in it.
This commit is contained in:
Alex Vandiver
2023-08-03 17:57:21 +00:00
committed by Tim Abbott
parent def6bf17eb
commit ae51fbdda2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/send_email.py
View File

@@ -542,7 +542,13 @@ def send_custom_email(
# And then extend it with our standard email headers.
with open(html_template_path, "w") as f:
with open(markdown_email_base_template_path) as base_template:
f.write(base_template.read())
# We use an ugly string substitution here, because we want to:
# 1. Only run Jinja once on the supplied content
# 2. Allow the supplied content to have jinja interpolation in it
# 3. Have that interpolation happen in the context of
# each individual email we send, so the contents can
# vary user-to-user
f.write(base_template.read().replace("{{ rendered_input }}", rendered_input))
with open(subject_path, "w") as f:
f.write(get_header(options.get("subject"), parsed_email_template.get("subject"), "subject"))
@@ -555,7 +561,6 @@ def send_custom_email(
"realm_uri": user_profile.realm.uri,
"realm_name": user_profile.realm.name,
"unsubscribe_link": one_click_unsubscribe_link(user_profile, "marketing"),
"rendered_input": rendered_input,
}
with suppress(EmailNotDeliveredError):
send_email(