Add STARTTLS flag to SMTP config
This commit is contained in:
parent
1c6696e7a4
commit
e98bd1b431
@ -14,4 +14,4 @@ notifications:
|
|||||||
services:
|
services:
|
||||||
- mongodb
|
- mongodb
|
||||||
env:
|
env:
|
||||||
- MONGO_URI=127.0.0.1:27017/test_db MONGO_USER=travis MONGO_PASS=test SMTP_HOST=127.0.0.1 SMTP_PORT=465 SMTP_TLS=true SMTP_USER=smtp_user SMTP_PASS=smtp_pass SENDER_NAME=Travis SENDER_EMAIL=travis@mailvelope.com
|
- MONGO_URI=127.0.0.1:27017/test_db MONGO_USER=travis MONGO_PASS=test SMTP_HOST=127.0.0.1 SMTP_PORT=465 SMTP_TLS=true SMTP_STARTTLS=true SMTP_USER=smtp_user SMTP_PASS=smtp_pass SENDER_NAME=Travis SENDER_EMAIL=travis@mailvelope.com
|
@ -223,6 +223,7 @@ The `credentials.json` file can be used to configure a local development install
|
|||||||
* SMTP_HOST=127.0.0.1
|
* SMTP_HOST=127.0.0.1
|
||||||
* SMTP_PORT=465
|
* SMTP_PORT=465
|
||||||
* SMTP_TLS=true
|
* SMTP_TLS=true
|
||||||
|
* SMTP_STARTTLS=true
|
||||||
* SMTP_USER=smtp_user
|
* SMTP_USER=smtp_user
|
||||||
* SMTP_PASS=smtp_pass
|
* SMTP_PASS=smtp_pass
|
||||||
* SENDER_NAME="OpenPGP Key Server"
|
* SENDER_NAME="OpenPGP Key Server"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
"host": "smtp.gmail.com",
|
"host": "smtp.gmail.com",
|
||||||
"port": "465",
|
"port": "465",
|
||||||
"tls": "true",
|
"tls": "true",
|
||||||
|
"starttls": "true",
|
||||||
"user": "user@gmail.com",
|
"user": "user@gmail.com",
|
||||||
"pass": "password"
|
"pass": "password"
|
||||||
},
|
},
|
||||||
|
@ -104,7 +104,8 @@ function injectDependencies() {
|
|||||||
email.init({
|
email.init({
|
||||||
host: process.env.SMTP_HOST || credentials.smtp.host,
|
host: process.env.SMTP_HOST || credentials.smtp.host,
|
||||||
port: process.env.SMTP_PORT || credentials.smtp.port,
|
port: process.env.SMTP_PORT || credentials.smtp.port,
|
||||||
secure: (process.env.SMTP_TLS || credentials.smtp.tls) === 'true',
|
tls: (process.env.SMTP_TLS || credentials.smtp.tls) === 'true',
|
||||||
|
starttls: (process.env.SMTP_STARTTLS || credentials.smtp.starttls) === 'true',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.SMTP_USER || credentials.smtp.user,
|
user: process.env.SMTP_USER || credentials.smtp.user,
|
||||||
pass: process.env.SMTP_PASS || credentials.smtp.pass
|
pass: process.env.SMTP_PASS || credentials.smtp.pass
|
||||||
|
@ -39,16 +39,16 @@ class Email {
|
|||||||
* @param {Object} auth Auth credential: { user:'user@gmail.com', pass:'pass' }
|
* @param {Object} auth Auth credential: { user:'user@gmail.com', pass:'pass' }
|
||||||
* @param {Object} sender message 'FROM' field: { name:'Your Support', email:'noreply@exmple.com' }
|
* @param {Object} sender message 'FROM' field: { name:'Your Support', email:'noreply@exmple.com' }
|
||||||
* @param {string} port (optional) SMTP server's SMTP port. Defaults to 465.
|
* @param {string} port (optional) SMTP server's SMTP port. Defaults to 465.
|
||||||
* @param {boolean} secure (optional) if TSL should be used. Defaults to true.
|
* @param {boolean} tls (optional) if TSL should be used. Defaults to true.
|
||||||
* @param {boolean} requireTLS (optional) if TSL is mandatory. Defaults to true.
|
* @param {boolean} starttls (optional) force STARTTLS to prevent downgrade attack. Defaults to true.
|
||||||
*/
|
*/
|
||||||
init(options) {
|
init(options) {
|
||||||
this._transport = this._mailer.createTransport({
|
this._transport = this._mailer.createTransport({
|
||||||
host: options.host,
|
host: options.host,
|
||||||
port: options.port || 465,
|
port: options.port || 465,
|
||||||
auth: options.auth,
|
auth: options.auth,
|
||||||
secure: (options.secure !== undefined) ? options.secure : true,
|
secure: (options.tls !== undefined) ? options.tls : true,
|
||||||
requireTLS: (options.secure !== undefined) ? options.secure : true
|
requireTLS: (options.starttls !== undefined) ? options.starttls : true,
|
||||||
});
|
});
|
||||||
this._sender = options.sender;
|
this._sender = options.sender;
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,8 @@ describe('Email Integration Tests', function() {
|
|||||||
email.init({
|
email.init({
|
||||||
host: process.env.SMTP_HOST || credentials.smtp.host,
|
host: process.env.SMTP_HOST || credentials.smtp.host,
|
||||||
port: process.env.SMTP_PORT || credentials.smtp.port,
|
port: process.env.SMTP_PORT || credentials.smtp.port,
|
||||||
secure: (process.env.SMTP_TLS || credentials.smtp.tls) === 'true',
|
tls: (process.env.SMTP_TLS || credentials.smtp.tls) === 'true',
|
||||||
|
starttls: (process.env.SMTP_STARTTLS || credentials.smtp.starttls) === 'true',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.SMTP_USER || credentials.smtp.user,
|
user: process.env.SMTP_USER || credentials.smtp.user,
|
||||||
pass: process.env.SMTP_PASS || credentials.smtp.pass
|
pass: process.env.SMTP_PASS || credentials.smtp.pass
|
||||||
|
Loading…
Reference in New Issue
Block a user