Updated filter handling

This commit is contained in:
Andris Reinman 2017-12-21 15:13:05 +02:00
parent 73920c860c
commit 029aeecc23
2 changed files with 9 additions and 7 deletions

View file

@ -466,9 +466,13 @@ class FilterHandler {
if (filterActions.get('delete')) { if (filterActions.get('delete')) {
// nothing to do with the message, just continue // nothing to do with the message, just continue
let err = new Error('Message dropped by policy');
err.code = 'DroppedByPolicy';
return callback(null, { return callback(null, {
userData, userData,
response: 'Message dropped by policy as ' + prepared.id.toString() response: 'Message dropped by policy as ' + prepared.id.toString(),
error: err
}); });
} }
@ -544,7 +548,8 @@ class FilterHandler {
null, null,
{ {
userData, userData,
response: err ? err : 'Message stored as ' + info.id.toString() response: err ? err : 'Message stored as ' + info.id.toString(),
error: err
}, },
!isEncrypted !isEncrypted
? { ? {

View file

@ -8,10 +8,7 @@
"test": "mongo --eval 'db.dropDatabase()' wildduck-test && redis-cli -n 13 flushdb && NODE_ENV=test grunt", "test": "mongo --eval 'db.dropDatabase()' wildduck-test && redis-cli -n 13 flushdb && NODE_ENV=test grunt",
"apidoc": "apidoc -i lib/api/ -o docs/" "apidoc": "apidoc -i lib/api/ -o docs/"
}, },
"keywords": [ "keywords": ["imap", "mail server"],
"imap",
"mail server"
],
"author": "Andris Reinman", "author": "Andris Reinman",
"license": "EUPL-1.1", "license": "EUPL-1.1",
"devDependencies": { "devDependencies": {
@ -53,7 +50,7 @@
"mobileconfig": "2.1.0", "mobileconfig": "2.1.0",
"mongo-cursor-pagination-node6": "5.0.0", "mongo-cursor-pagination-node6": "5.0.0",
"mongodb": "3.0.0-rc0", "mongodb": "3.0.0-rc0",
"mongodb-extended-json": "^1.10.0", "mongodb-extended-json": "1.10.0",
"nodemailer": "4.4.1", "nodemailer": "4.4.1",
"npmlog": "4.1.2", "npmlog": "4.1.2",
"openpgp": "2.6.0", "openpgp": "2.6.0",