update submit endpoint to account for rejections of message and update wdr counter only if successfully sent message

Author: NickOvt

lib/api/submit.js

@@ -426,82 +426,90 @@ module.exports = (db, server, messageHandler, userHandler, settingsHandler) => {
                                             return;
                                         }
 
-                                        messageHandler.counters.ttlcounter(
-                                            'wdr:' + userData._id.toString(),
-                                            compiledEnvelope.to.length,
-                                            maxRecipients,
-                                            false,
-                                            (err, result) => {
-                                                if (err) {
-                                                    err.responseCode = 500;
-                                                    err.code = 'InternalDatabaseError';
-                                                    return callback(err);
-                                                }
+                                        messageHandler.counters.ttlcounter('wdr:' + userData._id.toString(), 0, maxRecipients, false, (err, result) => {
+                                            if (err) {
+                                                err.responseCode = 500;
+                                                err.code = 'InternalDatabaseError';
+                                                return callback(err);
+                                            }
 
-                                                let success = result.success;
-                                                let sent = result.value;
-                                                let ttl = result.ttl;
-
-                                                let ttlHuman = false;
-                                                if (ttl) {
-                                                    if (ttl < 60) {
-                                                        ttlHuman = ttl + ' seconds';
-                                                    } else if (ttl < 3600) {
-                                                        ttlHuman = Math.round(ttl / 60) + ' minutes';
-                                                    } else {
-                                                        ttlHuman = Math.round(ttl / 3600) + ' hours';
-                                                    }
-                                                }
+                                            let success = result.success;
+                                            let sent = result.value;
+                                            let ttl = result.ttl;
 
-                                                if (!success) {
-                                                    log.info('API', 'RCPTDENY denied sent=%s allowed=%s expires=%ss.', sent, maxRecipients, ttl);
-                                                    let err = new Error(
-                                                        'You reached a daily sending limit for your account' + (ttl ? '. Limit expires in ' + ttlHuman : '')
-                                                    );
-                                                    err.responseCode = 403;
-                                                    err.code = 'RateLimitedError';
-                                                    return setImmediate(() => callback(err));
+                                            let ttlHuman = false;
+                                            if (ttl) {
+                                                if (ttl < 60) {
+                                                    ttlHuman = ttl + ' seconds';
+                                                } else if (ttl < 3600) {
+                                                    ttlHuman = Math.round(ttl / 60) + ' minutes';
+                                                } else {
+                                                    ttlHuman = Math.round(ttl / 3600) + ' hours';
                                                 }
+                                            }
 
-                                                // push message to outbound queue
-                                                let message = maildrop.push(
-                                                    {
-                                                        user: userData._id,
-                                                        userEmail: userData.address,
-                                                        parentId: messageId,
-                                                        reason: 'submit',
-                                                        from: compiledEnvelope.from,
-                                                        to: compiledEnvelope.to,
-                                                        sendTime,
-                                                        origin: options.ip,
-                                                        runPlugins: true,
-                                                        mtaRelay: userData.mtaRelay || false
-                                                    },
-                                                    (err, ...args) => {
-                                                        if (err || !args[0]) {
-                                                            if (err) {
-                                                                if (!err.code && err.name === 'SMTPReject') {
-                                                                    err.code = 'MessageRejected';
-                                                                }
+                                            if (!success || sent + compiledEnvelope.length > maxRecipients) {
+                                                log.info('API', 'RCPTDENY denied sent=%s allowed=%s expires=%ss.', sent, maxRecipients, ttl);
+                                                let err = new Error(
+                                                    'You reached a daily sending limit for your account' + (ttl ? '. Limit expires in ' + ttlHuman : '')
+                                                );
+                                                err.responseCode = 403;
+                                                err.code = 'RateLimitedError';
+                                                return setImmediate(() => callback(err));
+                                            }
 
-                                                                err.code = err.code || 'ERRCOMPOSE';
+                                            // push message to outbound queue
+                                            let message = maildrop.push(
+                                                {
+                                                    user: userData._id,
+                                                    userEmail: userData.address,
+                                                    parentId: messageId,
+                                                    reason: 'submit',
+                                                    from: compiledEnvelope.from,
+                                                    to: compiledEnvelope.to,
+                                                    sendTime,
+                                                    origin: options.ip,
+                                                    runPlugins: true,
+                                                    mtaRelay: userData.mtaRelay || false
+                                                },
+                                                (err, ...args) => {
+                                                    if (err || !args[0]) {
+                                                        if (err) {
+                                                            if (!err.code && err.name === 'SMTPReject') {
+                                                                err.code = 'MessageRejected';
                                                             }
-                                                            err.responseCode = 500;
-                                                            return callback(err, ...args);
-                                                        }
 
-                                                        let outbound = args[0].id;
-                                                        return next(null, outbound);
+                                                            err.code = err.code || 'ERRCOMPOSE';
+                                                        }
+                                                        err.responseCode = 500;
+                                                        return callback(err, ...args);
                                                     }
-                                                );
 
-                                                if (message) {
-                                                    let stream = compiled.createReadStream();
-                                                    stream.once('error', err => message.emit('error', err));
-                                                    stream.pipe(collector).pipe(message);
+                                                    messageHandler.counters.ttlcounter(
+                                                        'wdr:' + userData._id.toString(),
+                                                        compiledEnvelope.to.length,
+                                                        maxRecipients,
+                                                        false,
+                                                        err => {
+                                                            if (err) {
+                                                                err.responseCode = 500;
+                                                                err.code = 'InternalDatabaseError';
+                                                                return setImmediate(() => callback(err));
+                                                            }
+
+                                                            let outbound = args[0].id;
+                                                            return next(null, outbound);
+                                                        }
+                                                    );
                                                 }
+                                            );
+
+                                            if (message) {
+                                                let stream = compiled.createReadStream();
+                                                stream.once('error', err => message.emit('error', err));
+                                                stream.pipe(collector).pipe(message);
                                             }
-                                        );
+                                        });
                                     };
 
                                     addToDeliveryQueue((err, outbound) => {