emailengine-app 2.61.1 → 2.61.2

package/lib/tools.js

@@ -24,7 +24,6 @@ const { PassThrough } = require('stream');
 const socks = require('socks');
 const os = require('os');
 const Fs = require('fs');
-const net = require('net');
 const fs = Fs.promises;
 const pathlib = require('path');
 const { randomUUID: uuid } = require('crypto');
@@ -41,11 +40,10 @@ const {
     FETCH_RETRY_MAX,
     URL_FETCH_RETRY_MAX
 } = require('./consts');
-const ipaddr = require('ipaddr.js');
 const bullmqPackage = require('bullmq/package.json');
-const { reverse: dnsReverse } = require('dns').promises;
-const googleCrawlerRanges = require('../data/google-crawlers.json');
-const { resolvePublicInterfaces } = require('pubface');
+
+// Network utilities - imported for internal use only
+const { getLocalAddress } = require('./utils/network');
 
 const { fetch: fetchCmd, Agent, RetryAgent } = require('undici');
 
@@ -62,20 +60,6 @@ const retryAgent = new RetryAgent(fetchAgent, {
     statusCodes: [429] // do not retry 5xx errors
 });
 
-const googleCrawlerMap = new Map();
-for (let prefixEntry of googleCrawlerRanges.prefixes) {
-    for (let prefixKey of ['ipv6Prefix', 'ipv4Prefix']) {
-        if (prefixEntry[prefixKey]) {
-            // check if remote address is in range
-            let parsed = ipaddr.parseCIDR(prefixEntry[prefixKey]);
-            if (!googleCrawlerMap.has(prefixKey)) {
-                googleCrawlerMap.set(prefixKey, []);
-            }
-            googleCrawlerMap.get(prefixKey).push(parsed);
-        }
-    }
-}
-
 class LRUCache extends Map {
     constructor(maxSize = 1000) {
         super();
@@ -911,7 +895,7 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV3QUiYsp13nD9suD1/ZkEXnuMoSg
             verifyPromises.push(
                 (async () => {
                     try {
-                        let { localAddress: address, name } = await module.exports.getLocalAddress(redis, 'smtp', 'test');
+                        let { localAddress: address, name } = await getLocalAddress(redis, 'smtp', 'test');
 
                         let smtpLogger = {};
                         let smtpConfig = Object.assign(
@@ -1561,110 +1545,6 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV3QUiYsp13nD9suD1/ZkEXnuMoSg
         return hostname;
     },
 
-    async 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) {
-                        // not much point in updating
-                        continue;
-                    }
-                } catch (err) {
-                    // ignore?
-                }
-            }
-
-            delete iface.defaultInterface;
-            await redis.hset(`${REDIS_PREFIX}interfaces`, iface.localAddress, JSON.stringify(iface));
-        }
-    },
-
-    async getLocalAddress(redis, protocol, account, hint) {
-        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
-            }
-            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 module.exports.getServiceHostname(await settings.get('smtpEhloName'));
-
-        let addressSelector;
-
-        if (!localAddresses.length) {
-            addressSelector = 'default';
-            return { address: false, name: hostname, addressSelector };
-        } else 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 = module.exports.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 };
-        }
-    },
-
     unpackUIDRangeForSearch(uid) {
         uid = (uid || '').toString();
         let parts = uid
@@ -1764,27 +1644,6 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV3QUiYsp13nD9suD1/ZkEXnuMoSg
         }
     },
 
-    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;
-    },
-
     threadStats: {
         startTime: Date.now(),
 
@@ -1806,57 +1665,6 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV3QUiYsp13nD9suD1/ZkEXnuMoSg
         }
     },
 
-    async 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)) {
-            // check if remote address is in range
-            if (addr.match(prefixEntry)) {
-                return true;
-            }
-        }
-
-        // Check known scanners
-        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;
-    },
-
     structuredClone: typeof structuredClone === 'function' ? structuredClone : data => JSON.parse(JSON.stringify(data)),
 
     loadTlsConfig(ref, envPrefix) {