Skip to content

[FIX] Email link "go to message" being incorrectly escaped #17803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodrigok merged 1 commit into from
Jun 2, 2020
Merged

[FIX] Email link "go to message" being incorrectly escaped #17803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions app/mailer/server/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import s from 'underscore.string';
import juice from 'juice';
import stripHtml from 'string-strip-html';

import { settings } from '../../settings';
import { settings } from '../../settings/server';

let contentHeader;
let contentFooter;
Expand Down Expand Up @@ -42,11 +42,13 @@ export const replace = function replace(str, data = {}) {
return Object.entries(options).reduce((ret, [key, value]) => replacekey(ret, key, value), translate(str));
};

const nonEscapeKeys = ['room_path'];

export const replaceEscaped = (str, data = {}) => replace(str, {
Site_Name: s.escapeHTML(settings.get('Site_Name')),
Site_Url: s.escapeHTML(settings.get('Site_Url')),
...Object.entries(data).reduce((ret, [key, value]) => {
ret[key] = s.escapeHTML(value);
ret[key] = nonEscapeKeys.includes(key) ? value : s.escapeHTML(value);
return ret;
}, {}),
});
Expand Down Expand Up @@ -116,7 +118,18 @@ export const sendNoWrap = ({ to, from, replyTo, subject, html, text, headers })
Meteor.defer(() => Email.send({ to, from, replyTo, subject, html, text, headers }));
};

export const send = ({ to, from, replyTo, subject, html, text, data, headers }) => sendNoWrap({ to, from, replyTo, subject: replace(subject, data), text: text ? replace(text, data) : stripHtml(replace(html, data)), html: wrap(html, data), headers });
export const send = ({ to, from, replyTo, subject, html, text, data, headers }) =>
sendNoWrap({
to,
from,
replyTo,
subject: replace(subject, data),
text: text
? replace(text, data)
: stripHtml(replace(html, data)),
html: wrap(html, data),
headers,
});

export const checkAddressFormatAndThrow = (from, func) => {
if (checkAddressFormat(from)) {
Expand Down