Skip to content

Commit aae91bb

Browse files
authored
Zms 91 (#545)
* added new file to test git repo setup * add limit_allowed and limit_sent to loggelf in messages in API. Also if multiple recipients log each message separately * typo fix * messages.js refactor code. Make cleaner * fix _limit_sent. Fix earlier issue too * session -> sess. Session doesn't exist on request objs, sess exists * return pback the general SUBMIT log message to track API endpoint usage
1 parent 779bb11 commit aae91bb

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

Diff for: lib/api/messages.js

+23-3
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
19101910
envelope,
19111911
files
19121912
},
1913-
session: result.value.session,
1913+
session: result.value.sess,
19141914
date,
19151915
verificationResults,
19161916
flags: []
@@ -2316,7 +2316,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
23162316
});
23172317
}
23182318

2319-
let maxRecipients = Number(userData.maxRecipients) || (await settingsHandler.get('const:max:recipients'));
2319+
let maxRecipients = Number(userData.recipients) || (await settingsHandler.get('const:max:recipients'));
23202320
let maxRptsTo = await settingsHandler.get('const:max:rcpt_to');
23212321

23222322
// Trying to send more than allowed recipients count per email
@@ -2464,6 +2464,26 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
24642464
}
24652465
}
24662466

2467+
for (const to of Array.isArray(envelope.to) ? envelope.to : [envelope.to]) {
2468+
server.loggelf({
2469+
short_message: `[RCPT TO: ${to}] ${result.value.sess}`,
2470+
_mail_action: 'rcpt_to',
2471+
_user: userData._id.toString(),
2472+
_queue_id: queueId,
2473+
_sent_mailbox: response.message && response.message.mailbox,
2474+
_sent_message: response.message && response.message.id,
2475+
_send_time: sendTime && sendTime.toISOString && sendTime.toISOString(),
2476+
_from: envelope.from,
2477+
_to: to,
2478+
_message_id: messageData.msgid,
2479+
_subject: messageData.subject,
2480+
_sess: result.value.sess,
2481+
_ip: result.value.ip,
2482+
_limit_allowed: userData.recipients,
2483+
_limit_sent: messagesSent + envelope.to.length
2484+
});
2485+
}
2486+
24672487
server.loggelf({
24682488
short_message: '[SUBMIT] draft',
24692489
_mail_action: 'submit_draft',
@@ -2476,7 +2496,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
24762496
_to: envelope.to && envelope.to.join(','),
24772497
_message_id: messageData.msgid,
24782498
_subject: messageData.subject,
2479-
_sess: result.value.session,
2499+
_sess: result.value.sess,
24802500
_ip: result.value.ip
24812501
});
24822502

0 commit comments

Comments
 (0)