emailengine-app 2.61.1 → 2.61.3

package/lib/utils/network.js

@@ -0,0 +1,237 @@
+'use strict';
+
+const os = require('os');
+const net = require('net');
+const ipaddr = require('ipaddr.js');
+const { reverse: dnsReverse } = require('dns').promises;
+const { resolvePublicInterfaces } = require('pubface');
+const googleCrawlerRanges = require('../../data/google-crawlers.json');
+const settings = require('../settings');
+const logger = require('../logger');
+const { REDIS_PREFIX } = require('../consts');
+
+// Build Google crawler IP range map for efficient lookup
+const googleCrawlerMap = new Map();
+for (let prefixEntry of googleCrawlerRanges.prefixes) {
+    for (let prefixKey of ['ipv6Prefix', 'ipv4Prefix']) {
+        if (prefixEntry[prefixKey]) {
+            let parsed = ipaddr.parseCIDR(prefixEntry[prefixKey]);
+            if (!googleCrawlerMap.has(prefixKey)) {
+                googleCrawlerMap.set(prefixKey, []);
+            }
+            googleCrawlerMap.get(prefixKey).push(parsed);
+        }
+    }
+}
+
+/**
+ * Matches an IP address against a list of addresses or CIDR ranges
+ * @param {string} ip - IP address to check
+ * @param {string[]} addresses - Array of IP addresses or CIDR ranges
+ * @returns {boolean} True if IP matches any address in the list
+ */
+function matchIp(ip, addresses) {
+    let parsed = ipaddr.parse(ip);
+    for (let addr of addresses) {
+        try {
+            let match;
+            if (/\/\d+$/.test(addr)) {
+                match = parsed.match(ipaddr.parseCIDR(addr));
+            } else {
+                match = parsed.toNormalizedString() === ipaddr.parse(addr).toNormalizedString();
+            }
+            if (match) {
+                return true;
+            }
+        } catch (err) {
+            logger.error({ msg: 'Failed to parse IP address', ip, addr, err });
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Detects if a request is from an automated scanner (Google, Barracuda, etc.)
+ * @param {string} ip - IP address to check
+ * @returns {Promise<boolean>} True if request appears to be automated
+ */
+async function detectAutomatedRequest(ip) {
+    let prefixKey;
+    if (net.isIPv4(ip)) {
+        prefixKey = 'ipv4Prefix';
+    } else if (net.isIPv6(ip)) {
+        prefixKey = 'ipv6Prefix';
+    } else {
+        return false;
+    }
+
+    const addr = ipaddr.parse(ip);
+
+    // Check if it is a Google security scanner
+    for (let prefixEntry of googleCrawlerMap.get(prefixKey)) {
+        if (addr.match(prefixEntry)) {
+            return true;
+        }
+    }
+
+    // Check known scanners via reverse DNS
+    let hostnames;
+    try {
+        hostnames = await dnsReverse(ip);
+    } catch (err) {
+        logger.trace({
+            msg: 'Failed to reverse resolve IP',
+            ip,
+            err
+        });
+    }
+
+    if (!hostnames || !hostnames.length) {
+        return false;
+    }
+
+    const hostname = []
+        .concat(hostnames || [])
+        .shift()
+        .toString()
+        .trim()
+        .toLowerCase();
+
+    // Barracuda, spfbl
+    if (/\bbarracuda\.com$|\bspfbl\.net$/gi.test(hostname)) {
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Updates Redis with information about available public network interfaces
+ * @param {Object} redis - Redis client instance
+ * @returns {Promise<void>}
+ */
+async function updatePublicInterfaces(redis) {
+    let interfaces = await resolvePublicInterfaces();
+
+    for (let iface of interfaces) {
+        if (!iface.localAddress) {
+            continue;
+        }
+
+        if (iface.defaultInterface) {
+            await redis.hset(`${REDIS_PREFIX}interfaces`, `default:${iface.family}`, iface.localAddress);
+        }
+
+        let existingEntry = await redis.hget(`${REDIS_PREFIX}interfaces`, iface.localAddress);
+        if (existingEntry) {
+            try {
+                existingEntry = JSON.parse(existingEntry);
+
+                iface.name = iface.name || existingEntry.name;
+
+                if (!iface.localAddress || !iface.ip || !iface.name) {
+                    continue;
+                }
+            } catch (err) {
+                // ignore parsing errors
+            }
+        }
+
+        delete iface.defaultInterface;
+        await redis.hset(`${REDIS_PREFIX}interfaces`, iface.localAddress, JSON.stringify(iface));
+    }
+}
+
+/**
+ * Gets the local address to use for outbound connections
+ * @param {Object} redis - Redis client instance
+ * @param {string} protocol - Protocol name (e.g., 'smtp', 'imap')
+ * @param {string} account - Account identifier
+ * @param {string} [hint] - Optional IP address hint
+ * @returns {Promise<Object>} Address information object
+ */
+async function getLocalAddress(redis, protocol, account, hint) {
+    // Dynamic require to access tools.getServiceHostname() and tools.selectRendezvousAddress()
+    // These functions are defined in tools.js, which also imports from this module
+    const tools = require('../tools');
+
+    let existingAddresses = Object.values(os.networkInterfaces())
+        .flatMap(entry => entry)
+        .map(entry => entry.address);
+
+    if (hint) {
+        let parsedHint = ipaddr.parse(hint);
+        let normalizedHint = parsedHint.toNormalizedString();
+        let iface = await redis.hget(`${REDIS_PREFIX}interfaces`, normalizedHint);
+        try {
+            iface = iface ? JSON.parse(iface) : null;
+        } catch (err) {
+            // ignore parsing errors
+        }
+        if (iface && existingAddresses.includes(iface.localAddress)) {
+            iface.addressSelector = 'hint';
+            return iface;
+        }
+    }
+
+    let addressStrategy = await settings.get(`${protocol}Strategy`);
+    let localAddresses = []
+        .concat((await settings.get(`localAddresses`)) || [])
+        .filter(address => existingAddresses.includes(address))
+        .filter(address => net.isIPv4(address));
+    let localAddress;
+
+    let hostname = await tools.getServiceHostname(await settings.get('smtpEhloName'));
+
+    let addressSelector;
+
+    if (!localAddresses.length) {
+        addressSelector = 'default';
+        return { address: false, name: hostname, addressSelector };
+    }
+
+    if (localAddresses.length === 1) {
+        addressSelector = 'single';
+        localAddress = localAddresses[0];
+    } else {
+        switch (addressStrategy) {
+            case 'random':
+                addressSelector = 'random';
+                localAddress = localAddresses[Math.floor(Math.random() * localAddresses.length)];
+                break;
+            case 'dedicated':
+                addressSelector = 'dedicated';
+                localAddress = tools.selectRendezvousAddress(account, localAddresses);
+                break;
+            default:
+                addressSelector = 'unknown';
+                return { address: false, name: hostname, addressSelector };
+        }
+    }
+
+    if (!localAddress) {
+        addressSelector = 'unset';
+        return { address: false, name: hostname, addressSelector };
+    }
+
+    try {
+        let addressData = JSON.parse(await redis.hget(`${REDIS_PREFIX}interfaces`, localAddress));
+        addressData.name = addressData.name || hostname;
+        addressData.addressSelector = addressSelector;
+        return addressData;
+    } catch (err) {
+        logger.error({ msg: 'Failed to load address data', localAddress, err });
+        addressSelector = 'error';
+        return { address: false, name: hostname, addressSelector };
+    }
+}
+
+module.exports = {
+    resolvePublicInterfaces,
+    updatePublicInterfaces,
+    getLocalAddress,
+    matchIp,
+    detectAutomatedRequest,
+    googleCrawlerMap
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "emailengine-app",
-    "version": "2.61.1",
+    "version": "2.61.3",
     "private": false,
     "productTitle": "EmailEngine",
     "description": "Email Sync Engine",
@@ -17,7 +17,7 @@
         "build-dist": "pkg --compress Brotli package.json && npm install && node winconf.js",
         "build-dist-fast": "pkg --debug package.json && npm install && node winconf.js",
         "licenses": "license-checker --excludePackages 'emailengine-app' --json | node list-generate.js > static/licenses.html",
-        "gettext": "find ./views -name \"*.hbs\" -print0 | xargs -0 xgettext-template -L Handlebars -o translations/messages.pot --force-po && jsxgettext lib/routes-ui.js workers/api.js lib/tools.js lib/autodetect-imap-settings.js -j -o translations/messages.pot",
+        "gettext": "find ./views -name \"*.hbs\" -print0 | xargs -0 xgettext-template -L Handlebars -o translations/messages.pot --force-po && jsxgettext lib/routes-ui.js workers/api.js lib/tools.js lib/autodetect-imap-settings.js lib/ui-routes/account-routes.js lib/ui-routes/admin-config-routes.js lib/ui-routes/admin-entities-routes.js -j -o translations/messages.pot",
         "prepare-docker": "echo \"EE_DOCKER_LEGACY=$EE_DOCKER_LEGACY\" >> system.env && cat system.env",
         "update": "rm -rf node_modules package-lock.json && ncu -u && npm install && ./copy-static-files.sh && npm run licenses && npm run gettext",
         "test-gmail-api": "node lib/email-client/gmail-client.js --dbs.redis=redis://127.0.0.1/11",
@@ -61,14 +61,14 @@
         "@postalsys/ee-client": "1.3.0",
         "@postalsys/email-ai-tools": "1.11.1",
         "@postalsys/email-text-tools": "2.4.0",
-        "@postalsys/gettext": "4.1.0",
+        "@postalsys/gettext": "4.1.1",
         "@postalsys/joi-messages": "1.0.5",
         "@postalsys/templates": "2.0.0",
         "@zone-eu/mailsplit": "5.4.8",
         "@zone-eu/wild-config": "1.7.3",
         "ace-builds": "1.43.5",
         "base32.js": "0.1.0",
-        "bullmq": "5.66.4",
+        "bullmq": "5.66.5",
         "compare-versions": "6.1.1",
         "dotenv": "17.2.3",
         "encoding-japanese": "2.2.0",
@@ -81,10 +81,10 @@
         "he": "1.2.0",
         "html-to-text": "9.0.5",
         "ical.js": "1.5.0",
-        "iconv-lite": "0.7.1",
-        "imapflow": "1.2.4",
+        "iconv-lite": "0.7.2",
+        "imapflow": "1.2.6",
         "ioredfour": "1.3.0-ioredis-07",
-        "ioredis": "5.8.2",
+        "ioredis": "5.9.1",
         "ipaddr.js": "2.3.0",
         "joi": "17.13.3",
         "jquery": "3.7.1",
@@ -99,7 +99,7 @@
         "murmurhash": "2.0.1",
         "nanoid": "3.3.8",
         "nodemailer": "7.0.12",
-        "pino": "10.1.0",
+        "pino": "10.1.1",
         "popper.js": "1.16.1",
         "prom-client": "15.1.3",
         "psl": "1.15.0",
@@ -111,7 +111,7 @@
         "speakeasy": "2.0.0",
         "startbootstrap-sb-admin-2": "3.3.7",
         "timezones-list": "3.1.0",
-        "undici": "7.16.0",
+        "undici": "7.18.2",
         "xml2js": "0.6.2"
     },
     "devDependencies": {
@@ -128,7 +128,7 @@
         "prettier": "3.7.4",
         "resedit": "3.0.1",
         "spdx-satisfies": "6.0.0",
-        "supertest": "7.1.4",
+        "supertest": "7.2.2",
         "xgettext-template": "5.0.0"
     },
     "engines": {