Haraka 3.0.3 → 3.0.4

package/plugins/dnsbl.js

@@ -1,146 +0,0 @@
-// dnsbl plugin
-
-exports.register = function () {
-    this.inherits('dns_list_base');
-
-    this.load_config();
-
-    if (this.cfg.main.periodic_checks) {
-        this.check_zones(this.cfg.main.periodic_checks);
-    }
-
-    if (this.cfg.main.search === 'all') {
-        this.register_hook('connect',  'connect_multi');
-    }
-    else {
-        this.register_hook('connect',  'connect_first');
-    }
-}
-
-exports.load_config = function () {
-
-    this.cfg = this.config.get('dnsbl.ini', {
-        booleans: ['+main.reject', '-main.enable_stats'],
-    }, () => {
-        this.load_config();
-    });
-
-    if (this.cfg.main.enable_stats && !this.enable_stats) {
-        this.loginfo('stats reporting enabled');
-        this.enable_stats = true;
-    }
-    if (!this.cfg.main.enable_stats && this.enable_stats) {
-        this.loginfo('stats reporting disabled');
-        this.enable_stats = false;
-    }
-
-    if (this.cfg.main.stats_redis_host &&
-        this.cfg.main.stats_redis_host !== this.redis_host) {
-        this.redis_host = this.cfg.main.stats_redis_host;
-        this.loginfo(`set stats redis host to: ${this.redis_host}`);
-    }
-
-    this.get_uniq_zones();
-}
-
-exports.get_uniq_zones = function () {
-    this.zones = [];
-
-    const unique_zones = {};
-
-    // Compatibility with old plugin
-    const legacy_zones = this.config.get('dnsbl.zones', 'list');
-    for (const legacyZone of legacy_zones) {
-        unique_zones[legacyZone] = true;
-    }
-
-    if (this.cfg.main.zones) {
-        const new_zones = this.cfg.main.zones.split(/[\s,;]+/);
-        for (const newZone of new_zones) {
-            unique_zones[newZone] = true;
-        }
-    }
-
-    for (const key in unique_zones) { this.zones.push(key); }
-    return this.zones;
-}
-
-exports.should_skip = function (connection) {
-
-    if (!connection) { return true; }
-
-    if (connection.remote.is_private) {
-        connection.logdebug(this, `skip private: ${connection.remote.ip}`);
-        return true;
-    }
-
-    if (!this.zones || !this.zones.length) {
-        connection.logerror(this, "no zones");
-        return true;
-    }
-
-    return false;
-}
-
-exports.connect_first = function (next, connection) {
-    const plugin = this;
-    const remote_ip = connection.remote.ip;
-
-    if (plugin.should_skip(connection)) { return next(); }
-
-    plugin.first(remote_ip, plugin.zones, (err, zone, a) => {
-        if (err) {
-            connection.results.add(plugin, {err: err.message});
-            return next();
-        }
-        if (!a) return next();
-
-        const msg = `host [${remote_ip}] is blacklisted by ${zone}`;
-        if (plugin.cfg.main.reject) return next(DENY, msg);
-
-        connection.loginfo(plugin, msg);
-        return next();
-    }, function each_result (err, zone, a) {
-        if (err) return;
-        const result = a ? {fail: zone} : {pass: zone};
-        connection.results.add(plugin, result);
-    });
-}
-
-exports.connect_multi = function (next, connection) {
-    const remote_ip = connection.remote.ip;
-
-    if (this.should_skip(connection)) { return next(); }
-
-    const hits = [];
-    function get_deny_msg () {
-        return `host [${remote_ip}] is blacklisted by ${hits.join(', ')}`;
-    }
-
-    this.multi(remote_ip, this.zones, (err, zone, a, pending) => {
-        if (err) {
-            connection.results.add(this, {err: err.message});
-            if (pending) return;
-            if (this.cfg.main.reject && hits.length) {
-                return next(DENY, get_deny_msg());
-            }
-            return next();
-        }
-
-        if (a) {
-            hits.push(zone);
-            connection.results.add(this, {fail: zone});
-        }
-        else {
-            if (zone) connection.results.add(this, {pass: zone});
-        }
-
-        if (pending) return;
-        connection.results.add(this, {emit: true});
-
-        if (this.cfg.main.reject && hits.length) {
-            return next(DENY, get_deny_msg());
-        }
-        return next();
-    });
-}

package/plugins/dnswl.js

@@ -1,58 +0,0 @@
-'use strict';
-// dnswl plugin
-
-exports.register = function () {
-    this.inherits('dns_list_base');
-
-    this.load_dnswl_ini();
-
-    // IMPORTANT: don't run this on hook_rcpt otherwise we're an open relay...
-    ['ehlo','helo','mail'].forEach(hook => {
-        this.register_hook(hook, 'check_dnswl');
-    });
-}
-
-exports.load_dnswl_ini = function () {
-    this.cfg = this.config.get('dnswl.ini', () => {
-        this.load_dnswl_ini();
-    });
-
-    if (this.cfg.main.enable_stats) {
-        this.logdebug('stats reporting enabled');
-        this.enable_stats = true;
-    }
-
-    if (this.cfg.main.stats_redis_host) {
-        this.redis_host = this.cfg.main.stats_redis_host;
-        this.logdebug(`set stats redis host to: ${this.redis_host}`);
-    }
-
-    this.zones = [];
-    // Compatibility with old-plugin
-    this.zones = this.zones.concat(
-        this.config.get('dnswl.zones', 'list')
-    );
-    if (this.cfg.main.zones) {
-        this.zones = this.zones.concat(
-            this.cfg.main.zones.replace(/\s+/g,'').split(/[;,]/));
-    }
-
-    if (this.cfg.main.periodic_checks) {
-        this.check_zones(this.cfg.main.periodic_checks);
-    }
-}
-
-exports.check_dnswl = (next, connection) => connection.notes.dnswl ? next(OK) : next()
-
-exports.hook_connect = function (next, connection) {
-    if (!this.zones || !this.zones.length) {
-        connection.logerror(this, 'no zones');
-        return next();
-    }
-    this.first(connection.remote.ip, this.zones, (err, zone, a) => {
-        if (!a) return next();
-        connection.loginfo(this, `${connection.remote.ip} is whitelisted by ${zone}: ${a}`);
-        connection.notes.dnswl = true;
-        return next(OK);
-    });
-}

package/plugins/esets.js

@@ -1,71 +0,0 @@
-// esets
-const fs = require('fs');
-const child_process = require('child_process');
-const virus_re = new RegExp('virus="([^"]+)"');
-
-exports.hook_data_post = function (next, connection) {
-    const plugin = this;
-    const cfg = this.config.get('esets.ini');
-
-    // Write message to temporary file
-    const tmpdir = cfg.main.tmpdir || '/tmp';
-    const tmpfile = `${tmpdir}/${connection?.transaction?.uuid}.esets`;
-    const ws = fs.createWriteStream(tmpfile);
-
-    ws.once('error', err => {
-        connection.logerror(plugin, `Error writing temporary file: ${err.message}`);
-        next();
-    });
-
-    let start_time;
-
-    function wsOnClose (error, stdout, stderr) {
-        // Remove the temporary file
-        fs.unlink(tmpfile, () => {});
-
-        // Timing
-        const end_time = Date.now();
-        const elapsed = end_time - start_time;
-
-        // Debugging
-        [stdout, stderr].forEach(channel => {
-            if (channel) {
-                const lines = channel.split('\n');
-                for (const line of lines) {
-                    if (line) connection.logdebug(plugin, `recv: ${line}`);
-                }
-            }
-        });
-
-        // Get virus name
-        let virus = virus_re.exec(stdout)
-        if (virus) virus = virus[1];
-
-        // Log a summary
-        const exit_code = parseInt((error) ? error.code : 0)
-        connection.loginfo(plugin, `elapsed=${elapsed}ms code=${exit_code
-        }${exit_code === 0 || (exit_code > 1 && exit_code < 4)
-            ? ` virus="${virus}"`
-            : ` error="${(stdout || stderr || 'UNKNOWN').replace('\n',' ').trim()}"`}`);
-
-        // esets_cli returns non-zero exit on virus/error
-        if (exit_code) {
-            if (exit_code > 1 && exit_code < 4) {
-                return next(DENY, `Message is infected with ${virus || 'UNKNOWN'}`);
-            }
-            else {
-                return next(DENYSOFT, 'Virus scanner error');
-            }
-        }
-        next();
-    }
-
-    ws.once('close', () => {
-        start_time = Date.now();
-        child_process.exec(`LANG=C /opt/eset/esets/bin/esets_cli ${tmpfile}`,
-            { encoding: 'utf8', timeout: 30 * 1000 },
-            wsOnClose);
-    });
-
-    connection.transaction.message_stream.pipe(ws, { line_endings: '\r\n' });
-}

package/plugins/graph.js

@@ -1,5 +0,0 @@
-'use strict';
-
-exports.register = function () {
-    this.logerror('This plugin has moved. See https://github.com/haraka/haraka-plugin-graph');
-}