nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-09-08 06:04:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

test logging errors with state

Browse source
This commit is contained in:
Andris Reinman 2017-10-02 14:42:39 +03:00
parent 7d1cff7818
commit 40c99c9f42
3 changed files with 51 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
imap-core/lib/imap-command.js
View file

@ -74,13 +74,21 @@ class IMAPCommand {
this.command = (match[2] || '').trim().toUpperCase();
if (!this.command || !this.tag) {
let err = new Error('Invalid tag');
errors.notifyConnection(this.connection, err, {
payload: this.payload ? (this.payload.length < 256 ? this.payload : this.payload.toString().substr(0, 150) + '...') : false
});
this.connection.send('* BAD Invalid tag');
return callback(new Error('Invalid tag'));
return callback(err);
}
if (!commands.has(this.command)) {
let err = new Error('Unknown command');
errors.notifyConnection(this.connection, err, {
payload: this.payload ? (this.payload.length < 256 ? this.payload : this.payload.toString().substr(0, 150) + '...') : false
});
this.connection.send(this.tag + ' BAD Unknown command: ' + this.command);
return callback(new Error('Unknown command'));
return callback(err);
}
}
}
@ -88,7 +96,7 @@ class IMAPCommand {
if (command.literal) {
// check if the literal size is in acceptable bounds
if (isNaN(command.expecting) || isNaN(command.expecting) < 0 || command.expecting > Number.MAX_SAFE_INTEGER) {
errors.notify(new Error('Invalid literal size'), {
errors.notifyConnection(this.connection, new Error('Invalid literal size'), {
command: {
expecting: command.expecting
}
@ -159,7 +167,7 @@ class IMAPCommand {
return next(err);
}
// check if the payload needs to be directod to a preset handler
// check if the payload needs to be directed to a preset handler
if (typeof this.connection._nextHandler === 'function') {
this.connection._server.logger.debug(
{
@ -176,6 +184,9 @@ class IMAPCommand {
try {
this.parsed = imapHandler.parser(this.payload);
} catch (E) {
errors.notifyConnection(this.connection, E, {
payload: this.payload ? (this.payload.length < 256 ? this.payload : this.payload.toString().substr(0, 150) + '...') : false
});
this.connection._server.logger.debug(
{
err: E,
@ -212,6 +223,10 @@ class IMAPCommand {
this.validateCommand(this.parsed, handler, err => {
if (err) {
let payload = imapHandler.compiler(this.parsed, false, true);
errors.notifyConnection(this.connection, err, {
payload: payload ? (payload.length < 256 ? payload : payload.toString().substr(0, 150) + '...') : false
});
this.connection.send(this.tag + ' ' + (err.response || 'BAD') + ' ' + err.message);
return next(err);
}
@ -222,6 +237,10 @@ class IMAPCommand {
this.parsed,
(err, response) => {
if (err) {
let payload = imapHandler.compiler(this.parsed, false, true);
errors.notifyConnection(this.connection, err, {
payload: payload ? (payload.length < 256 ? payload : payload.toString().substr(0, 150) + '...') : false
});
this.connection.send(this.tag + ' ' + (err.response || 'BAD') + ' ' + err.message);
return next(err);
}

16
imap-core/lib/imap-connection.js
View file

@ -181,14 +181,6 @@ class IMAPConnection extends EventEmitter {
* @event
*/
_onEnd() {
this._server.logger.info(
{
tnx: 'close',
cid: this.id
},
'[%s] Connection END',
this.id
);
if (!this._closed) {
this._onClose();
}
@ -462,7 +454,7 @@ class IMAPConnection extends EventEmitter {
let existsResponse;
// show notifications
this._server.logger.info(
this._server.logger.debug(
{
tnx: 'notifications',
cid: this.id
@ -518,7 +510,7 @@ class IMAPConnection extends EventEmitter {
this.selected.modifyIndex = update.modseq;
}
this._server.logger.info(
this._server.logger.debug(
{
tnx: 'notifications',
cid: this.id
@ -532,7 +524,7 @@ class IMAPConnection extends EventEmitter {
continue; // skip this
}
this._server.logger.info(
this._server.logger.debug(
{
tnx: 'notifications',
cid: this.id
@ -553,7 +545,7 @@ class IMAPConnection extends EventEmitter {
case 'EXPUNGE': {
let seq = (this.selected.uidList || []).indexOf(update.uid);
this._server.logger.info(
this._server.logger.debug(
{
tnx: 'expunge',
cid: this.id

24
lib/errors.js
View file

@ -17,6 +17,30 @@ module.exports.notify = (...args) => {
}
};
module.exports.notifyConnection = (connection, ...args) => {
let metaData = args[1] || {};
if (connection.selected) {
metaData.selected = connection.selected.mailbox;
}
if (connection.session.user) {
metaData.userId = connection.session.user.id.toString();
}
metaData.remoteAddress = connection.session.remoteAddress;
metaData.clientHostname = connection.session.clientHostname;
metaData.isUTF8Enabled = connection.acceptUTF8Enabled;
args[1] = metaData;
if (bugsnag) {
bugsnag.notify(...args);
} else {
console.error(...args);
}
};
module.exports.intercept = (...args) => {
if (bugsnag) {
return bugsnag.intercept(...args);