github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 13:37:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pkuhner-fix-smtp-uri-malformed' into devel

Browse source 
Percent-encode SMTP password to prevent URI malformed errors.
Thanks to pkuhner ! Closes #1181
This commit is contained in:
Lauri Ojansivu 2017-08-26 03:46:51 +03:00
commit 06644d9c71
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -15,10 +15,12 @@ This release adds the following new features:
and fixes the following bugs:
* [Fix Squeezed tickbox in Card](https://github.com/wekan/wekan/pull/1171).
* [Fix Squeezed tickbox in Card](https://github.com/wekan/wekan/pull/1171);
* [Percent-encode SMTP password to prevent URI malformed
errors](https://github.com/wekan/wekan/pull/1190).
Thanks to GitHub users andresmanelli, danhawkes, jonasob, kubiko, nztqa
and xet7 for their contributions.
Thanks to GitHub users andresmanelli, danhawkes, jonasob, kubiko, nztqa,
pkuhner and xet7 for their contributions.
# v0.32 2017-07-30 Wekan release

4
models/settings.js
View file

@ -45,7 +45,7 @@ Settings.helpers({
if (!this.mailServer.username && !this.mailServer.password) {
return `${protocol}${this.mailServer.host}:${this.mailServer.port}/`;
}
return `${protocol}${this.mailServer.username}:${this.mailServer.password}@${this.mailServer.host}:${this.mailServer.port}/`;
return `${protocol}${this.mailServer.username}:${encodeURIComponent(this.mailServer.password)}@${this.mailServer.host}:${this.mailServer.port}/`;
},
});
Settings.allow({
@ -84,7 +84,7 @@ if (Meteor.isServer) {
if (!doc.mailServer.username && !doc.mailServer.password) {
process.env.MAIL_URL = `${protocol}${doc.mailServer.host}:${doc.mailServer.port}/`;
} else {
process.env.MAIL_URL = `${protocol}${doc.mailServer.username}:${doc.mailServer.password}@${doc.mailServer.host}:${doc.mailServer.port}/`;
process.env.MAIL_URL = `${protocol}${doc.mailServer.username}:${encodeURIComponent(doc.mailServer.password)}@${doc.mailServer.host}:${doc.mailServer.port}/`;
}
Accounts.emailTemplates.from = doc.mailServer.from;
}