Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-02 13:27:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Don’t assume SMTP failure means an SMTP error is present #241

Browse source
This commit is contained in:
Ben Gotow 2017-10-24 14:48:35 -07:00
parent e3b05d5c4a
commit 921306fdd5
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/mailsync-process.es6
View file

@ -102,6 +102,14 @@ export default class MailsyncProcess extends EventEmitter {
});
this._proc.on('close', code => {
const stripSecrets = text => {
const { refresh_token, imap_password, smtp_password } = this.account.settings;
return (text || '')
.replace(new RegExp(refresh_token || 'not-present', 'g'), '*********')
.replace(new RegExp(imap_password || 'not-present', 'g'), '*********')
.replace(new RegExp(smtp_password || 'not-present', 'g'), '*********');
};
try {
const lastLine = buffer
.toString('UTF-8')
@ -111,21 +119,18 @@ export default class MailsyncProcess extends EventEmitter {
if (code === 0) {
resolve(response);
} else {
const { refresh_token, imap_password, smtp_password } = this.account.settings;
let msg = LocalizedErrorStrings[response.error] || response.error;
if (response.error_service) {
msg = `${msg} (${response.error_service.toUpperCase()})`;
}
const error = new Error(msg);
error.rawLog = (response.log || '')
.replace(new RegExp(refresh_token || 'not-present', 'g'), '*********')
.replace(new RegExp(imap_password || 'not-present', 'g'), '*********')
.replace(new RegExp(smtp_password || 'not-present', 'g'), '*********');
error.rawLog = stripSecrets(response.log);
reject(error);
}
} catch (err) {
reject(new Error(buffer.toString()));
const error = new Error('An unexpected error occurred - view the raw log for details.');
error.rawLog = stripSecrets(buffer.toString());
reject(error);
}
});
});

2
mailsync

@ -1 +1 @@
Subproject commit 4fcc46c66afccc89091e8f2fb8482eefc4b86b75
Subproject commit 132bf11182c084edd7824238a2e17615968011fa