Log submitted drafts to GELF

This commit is contained in:
Andris Reinman 2021-05-06 14:01:21 +03:00
parent beaf010282
commit 4edad37888
2 changed files with 25 additions and 7 deletions

View file

@ -1780,7 +1780,9 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler) => {
attachments: extraAttachments.concat(result.value.attachments || []),
disableFileAccess: true,
disableUrlAccess: true,
keepBcc: true
keepBcc: true,
newline: '\r\n'
};
// ensure plaintext content if html is provided
@ -2344,6 +2346,22 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler) => {
}
}
server.loggelf({
short_message: '[SUBMIT] draft',
_mail_action: 'submit_draft',
_user: userData._id.toString(),
_queue_id: queueId,
_sent_mailbox: response.message && response.message.mailbox,
_sent_message: response.message && response.message.id,
_send_time: sendTime && sendTime.toISOString && sendTime.toISOString(),
_from: envelope.from,
_to: envelope.to && envelope.to.join(','),
_message_id: messageData.msgid,
_subject: messageData.subject,
_sess: result.value.session,
_ip: result.value.ip
});
res.json(response);
return next();
})

View file

@ -16,7 +16,7 @@
"author": "Andris Reinman",
"license": "EUPL-1.2",
"devDependencies": {
"ajv": "8.1.0",
"ajv": "8.2.0",
"chai": "4.3.4",
"docsify-cli": "4.4.3",
"eslint": "7.25.0",
@ -28,7 +28,7 @@
"grunt-mocha-test": "0.13.3",
"grunt-shell-spawn": "0.4.0",
"grunt-wait": "0.3.0",
"imapflow": "1.0.56",
"imapflow": "1.0.57",
"mailparser": "3.2.0",
"mocha": "8.3.2",
"request": "2.88.2",
@ -41,7 +41,7 @@
"axios": "0.21.1",
"base32.js": "0.1.0",
"bcryptjs": "2.4.3",
"bull": "3.22.3",
"bull": "3.22.4",
"gelf": "2.0.1",
"generate-password": "1.6.0",
"he": "1.2.0",
@ -49,7 +49,7 @@
"humanname": "0.2.2",
"iconv-lite": "0.6.2",
"ioredfour": "1.0.2-ioredis-03",
"ioredis": "4.27.1",
"ioredis": "4.27.2",
"isemail": "3.2.0",
"joi": "17.4.0",
"js-yaml": "4.1.0",
@ -63,7 +63,7 @@
"mongodb": "3.6.6",
"mongodb-extended-json": "1.11.0",
"node-forge": "0.10.0",
"nodemailer": "6.5.0",
"nodemailer": "6.6.0",
"npmlog": "4.1.2",
"openpgp": "4.10.10",
"pem": "1.14.4",
@ -80,7 +80,7 @@
"unixcrypt": "1.0.13",
"uuid": "8.3.2",
"wild-config": "1.5.1",
"yargs": "16.2.0"
"yargs": "17.0.1"
},
"repository": {
"type": "git",