Haraka 2.8.28 → 3.0.1

package/plugins/clamd.js

@@ -4,73 +4,71 @@ const sock = require('./line_socket');
 const utils = require('haraka-utils');
 
 exports.load_excludes = function () {
-    const plugin = this;
 
-    plugin.loginfo('Loading excludes file');
-    const list = plugin.config.get('clamd.excludes','list', () => {
-        plugin.load_excludes();
+    this.loginfo('Loading excludes file');
+    const list = this.config.get('clamd.excludes','list', () => {
+        this.load_excludes();
     });
 
     const new_skip_list_exclude = [];
     const new_skip_list = [];
-    for (let i=0; i < list.length; i++) {
+    for (const element of list) {
         let re;
-        switch (list[i][0]) {
+        switch (element[0]) {
             case '!':
 
-                if (list[i][1] === '/') {
+                if (element[1] === '/') {
                     // Regexp exclude
                     try {
-                        re = new RegExp(list[i].substr(2, list[i].length-2),'i');
+                        re = new RegExp(element.substr(2, element.length-2),'i');
                         new_skip_list_exclude.push(re);
                     }
                     catch (e) {
-                        plugin.logerror(`${e.message} (entry: ${list[i]})`);
+                        this.logerror(`${e.message} (entry: ${element})`);
                     }
                 }
                 else {
                     // Wildcard exclude
                     try {
                         re = new RegExp(
-                            utils.wildcard_to_regexp(list[i].substr(1)),'i');
+                            utils.wildcard_to_regexp(element.substr(1)),'i');
                         new_skip_list_exclude.push(re);
                     }
                     catch (e) {
-                        plugin.logerror(`${e.message} (entry: ${list[i]})`);
+                        this.logerror(`${e.message} (entry: ${element})`);
                     }
                 }
                 break;
             case '/':
                 // Regexp skip
                 try {
-                    re = new RegExp(list[i].substr(1, list[i].length-2),'i');
+                    re = new RegExp(element.substr(1, element.length-2),'i');
                     new_skip_list.push(re);
                 }
                 catch (e) {
-                    plugin.logerror(`${e.message} (entry: ${list[i]})`);
+                    this.logerror(`${e.message} (entry: ${element})`);
                 }
                 break;
             default:
                 // Wildcard skip
                 try {
-                    re = new RegExp(utils.wildcard_to_regexp(list[i]),'i');
+                    re = new RegExp(utils.wildcard_to_regexp(element),'i');
                     new_skip_list.push(re);
                 }
                 catch (e) {
-                    plugin.logerror(`${e.message} (entry: ${list[i]})`);
+                    this.logerror(`${e.message} (entry: ${element})`);
                 }
         }
     }
 
     // Make the new lists visible
-    plugin.skip_list_exclude = new_skip_list_exclude;
-    plugin.skip_list = new_skip_list;
+    this.skip_list_exclude = new_skip_list_exclude;
+    this.skip_list = new_skip_list;
 }
 
 exports.load_clamd_ini = function () {
-    const plugin = this;
 
-    plugin.cfg = plugin.config.get('clamd.ini', {
+    this.cfg = this.config.get('clamd.ini', {
         booleans: [
             '-main.randomize_host_order',
             '-main.only_with_attachments',
@@ -96,7 +94,7 @@ exports.load_clamd_ini = function () {
             '+check.local_ip'
         ],
     }, () => {
-        plugin.load_clamd_ini();
+        this.load_clamd_ini();
     });
 
     const defaults = {
@@ -107,8 +105,8 @@ exports.load_clamd_ini = function () {
     };
 
     for (const key in defaults) {
-        if (plugin.cfg.main[key] === undefined) {
-            plugin.cfg.main[key] = defaults[key];
+        if (this.cfg.main[key] === undefined) {
+            this.cfg.main[key] = defaults[key];
         }
     }
 
@@ -127,39 +125,37 @@ exports.load_clamd_ini = function () {
     const enabled_reject_opts = [];
     Object.keys(rejectPatterns).forEach(opt => {
         all_reject_opts.push(rejectPatterns[opt]);
-        if (!plugin.cfg.reject[opt]) return;
+        if (!this.cfg.reject[opt]) return;
         enabled_reject_opts.push(rejectPatterns[opt]);
     });
 
     if (enabled_reject_opts.length) {
-        plugin.allRE = new RegExp(all_reject_opts.join('|'));
-        plugin.rejectRE = new RegExp(enabled_reject_opts.join('|'));
+        this.allRE = new RegExp(all_reject_opts.join('|'));
+        this.rejectRE = new RegExp(enabled_reject_opts.join('|'));
     }
 
     // resolve mismatch between docs (...attachment) and code (...attachments)
-    if (plugin.cfg.main.only_with_attachment !== undefined) {
-        plugin.cfg.main.only_with_attachments =
-            !!plugin.cfg.main.only_with_attachment;
+    if (this.cfg.main.only_with_attachment !== undefined) {
+        this.cfg.main.only_with_attachments =
+            !!this.cfg.main.only_with_attachment;
     }
 }
 
 exports.register = function () {
-    const plugin = this;
-    plugin.load_excludes();
-    plugin.load_clamd_ini();
+    this.load_excludes();
+    this.load_clamd_ini();
 }
 
 exports.hook_data = function (next, connection) {
-    const plugin = this;
 
-    if (!plugin.cfg.main.only_with_attachments) return next();
+    if (!this.cfg.main.only_with_attachments) return next();
 
-    if (!plugin.should_check(connection)) return next();
+    if (!this.should_check(connection)) return next();
 
     const txn = connection.transaction;
     txn.parse_body = true;
     txn.attachment_hooks((ctype, filename, body) => {
-        connection.logdebug(plugin,
+        connection.logdebug(this,
             `found ctype=${ctype}, filename=${filename}`);
         txn.notes.clamd_found_attachment = true;
     });
@@ -169,11 +165,10 @@ exports.hook_data = function (next, connection) {
 
 exports.hook_data_post = function (next, connection) {
     const plugin = this;
-    const txn = connection.transaction;
-    const cfg = plugin.cfg;
-
     if (!plugin.should_check(connection)) return next();
 
+    const txn = connection.transaction;
+    const { cfg } = plugin;
     // Do we need to run?
     if (cfg.main.only_with_attachments && !txn.notes.clamd_found_attachment) {
         connection.logdebug(plugin, 'skipping: no attachments found');
@@ -279,15 +274,15 @@ exports.hook_data_post = function (next, connection) {
                 if (!plugin.cfg.reject.virus) { return next(); }
 
                 // Check skip list exclusions
-                for (let i=0; i < plugin.skip_list_exclude.length; i++) {
-                    if (!plugin.skip_list_exclude[i].test(virus)) continue;
+                for (const element of plugin.skip_list_exclude) {
+                    if (!element.test(virus)) continue;
                     return next(DENY,
                         `Message is infected with ${virus || 'UNKNOWN'}`);
                 }
 
                 // Check skip list
-                for (let j=0; j < plugin.skip_list.length; j++) {
-                    if (!plugin.skip_list[j].test(virus)) continue;
+                for (const element of plugin.skip_list) {
+                    if (!element.test(virus)) continue;
                     connection.logwarn(plugin, `${virus} matches exclusion`);
                     txn.add_header('X-Haraka-Virus', virus);
                     return next();
@@ -325,31 +320,31 @@ exports.hook_data_post = function (next, connection) {
 }
 
 exports.should_check = function (connection) {
-    const plugin = this;
 
     let result = true;  // default
+    if (!connection?.transaction) return false
 
-    if (plugin.cfg.check.authenticated == false && connection.notes.auth_user) {
-        connection.transaction.results.add(plugin, { skip: 'authed'});
+    if (this.cfg.check.authenticated == false && connection.notes.auth_user) {
+        connection.transaction.results.add(this, { skip: 'authed'});
         result = false;
     }
 
-    if (plugin.cfg.check.relay == false && connection.relaying) {
-        connection.transaction.results.add(plugin, { skip: 'relay'});
+    if (this.cfg.check.relay == false && connection.relaying) {
+        connection.transaction.results.add(this, { skip: 'relay'});
         result = false;
     }
 
-    if (plugin.cfg.check.local_ip == false && connection.remote.is_local) {
-        connection.transaction.results.add(plugin, { skip: 'local_ip'});
+    if (this.cfg.check.local_ip == false && connection.remote.is_local) {
+        connection.transaction.results.add(this, { skip: 'local_ip'});
         result = false;
     }
 
-    if (plugin.cfg.check.private_ip == false && connection.remote.is_private) {
-        if (plugin.cfg.check.local_ip == true && connection.remote.is_local) {
+    if (this.cfg.check.private_ip == false && connection.remote.is_private) {
+        if (this.cfg.check.local_ip == true && connection.remote.is_local) {
             // local IPs are included in private IPs
         }
         else {
-            connection.transaction.results.add(plugin, { skip: 'private_ip'});
+            connection.transaction.results.add(this, { skip: 'private_ip'});
             result = false;
         }
     }
@@ -368,18 +363,19 @@ exports.send_clamd_predata = (socket, cb) => {
 }
 
 function clamd_connect (socket, host) {
-    let match;
+
     if (host.match(/^\//)) {
-        // assume unix socket
-        socket.connect(host);
+        socket.connect(host); // starts with /, unix socket
+        return
     }
-    else if ((match = /^\[([^\] ]+)\](?::(\d+))?/.exec(host))) {
-        // IPv6 literal
-        socket.connect((match[2] || 3310), match[1]);
-    }
-    else {
-        // IP:port, hostname:port or hostname
-        const hostport = host.split(/:/);
-        socket.connect((hostport[1] || 3310), hostport[0]);
+
+    const match = /^\[([^\] ]+)\](?::(\d+))?/.exec(host);
+    if (match) {
+        socket.connect((match[2] || 3310), match[1]); // IPv6 literal
+        return
     }
+
+    // IP:port, hostname:port or hostname
+    const hostport = host.split(/:/);
+    socket.connect((hostport[1] || 3310), hostport[0]);
 }

package/plugins/data.signatures.js

@@ -3,11 +3,15 @@
 
 exports.hook_data = (next, connection) => {
     // enable mail body parsing
+    if (!connection?.transaction) return next();
+
     connection.transaction.parse_body = true;
     next();
 }
 
 exports.hook_data_post = function (next, connection) {
+    if (!connection?.transaction) return next();
+
     const sigs = this.config.get('data.signatures', 'list');
 
     if (check_sigs(sigs, connection.transaction.body)) {
@@ -18,15 +22,11 @@ exports.hook_data_post = function (next, connection) {
 
 function check_sigs (sigs, body) {
     for (let i=0,l=sigs.length; i < l; i++) {
-        if (body.bodytext.includes(sigs[i])) {
-            return 1;
-        }
+        if (body.bodytext.includes(sigs[i])) return 1;
     }
 
     for (let i=0,l=body.children.length; i < l; i++) {
-        if (check_sigs(sigs, body.children[i])) {
-            return 1;
-        }
+        if (check_sigs(sigs, body.children[i])) return 1;
     }
     return 0;
 }