Girish Ramakrishnan
96dc79cfe6
- Convert all require()/module.exports to import/export across 260+ files - Add "type": "module" to package.json to enable ESM by default - Add migrations/package.json with "type": "commonjs" to keep db-migrate compatible - Convert eslint.config.js to ESM with sourceType: "module" - Replace __dirname/__filename with import.meta.dirname/import.meta.filename - Replace require.main === module with process.argv[1] === import.meta.filename - Remove 'use strict' directives (implicit in ESM) - Convert dynamic require() in switch statements to static import lookup maps (dns.js, domains.js, backupformats.js, backupsites.js, network.js) - Extract self-referencing exports.CONSTANT patterns into standalone const declarations (apps.js, services.js, locks.js, users.js, mail.js, etc.) - Lazify SERVICES object in services.js to avoid circular dependency TDZ issues - Add clearMailQueue() to mailer.js for ESM-safe queue clearing in tests - Add _setMockApp() to ldapserver.js for ESM-safe test mocking - Add _setMockResolve() wrapper to dig.js for ESM-safe DNS mocking in tests - Convert backupupload.js to use dynamic imports so --check exits before loading the module graph (which requires BOX_ENV) - Update check-install to use ESM import for infra_version.js - Convert scripts/ (hotfix, release, remote_hotfix.js, find-unused-translations) - All 1315 tests passing Migration stats (AI-assisted using Cursor with Claude): - Wall clock time: ~3-4 hours - Assistant completions: ~80-100 - Estimated token usage: ~1-2M tokens Co-authored-by: Cursor <cursoragent@cursor.com>
61 lines
1.7 KiB
JavaScript
61 lines
1.7 KiB
JavaScript
import assert from 'node:assert';
|
|
import net from 'node:net';
|
|
|
|
export {
|
|
isValid,
|
|
isValidCIDR,
|
|
isEqual,
|
|
includes,
|
|
};
|
|
|
|
function isValid(ip) {
|
|
assert.strictEqual(typeof ip, 'string');
|
|
|
|
const type = net.isIP(ip);
|
|
return type === 4 || type === 6;
|
|
}
|
|
|
|
function isValidCIDR(cidr) {
|
|
assert.strictEqual(typeof cidr, 'string');
|
|
|
|
const parts = cidr.split('/');
|
|
if (parts.length !== 2) return false;
|
|
|
|
const [ ip, prefixString ] = parts;
|
|
const type = net.isIP(ip);
|
|
if (type === 0) return false;
|
|
|
|
const prefix = Number.parseInt(prefixString, 10);
|
|
if (!Number.isInteger(prefix) || prefix < 0 || (prefix > (type === 4 ? 32 : 128)) || String(prefix) !== prefixString) return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
function isEqual(ip1, ip2) {
|
|
assert.strictEqual(typeof ip1, 'string');
|
|
assert.strictEqual(typeof ip2, 'string');
|
|
|
|
if (ip1 === ip2) return true;
|
|
|
|
const type1 = net.isIP(ip1), type2 = net.isIP(ip2);
|
|
if (type1 === 0 || type2 === 0) return false; // otherwise, it will throw invalid socket address below
|
|
|
|
// use blocklist to compare since strings may not be in RFC 5952 format
|
|
const blockList = new net.BlockList();
|
|
blockList.addAddress(ip1, `ipv${type1}`);
|
|
return blockList.check(ip2, `ipv${type2}`);
|
|
}
|
|
|
|
function includes(cidr, ip) {
|
|
assert.strictEqual(typeof cidr, 'string');
|
|
assert.strictEqual(typeof ip, 'string');
|
|
|
|
const type = net.isIP(ip);
|
|
const [ subnet, prefix ] = cidr.split('/');
|
|
const subnetType = net.isIP(subnet);
|
|
|
|
const blockList = new net.BlockList();
|
|
blockList.addSubnet(subnet, parseInt(prefix, 10), `ipv${subnetType}`);
|
|
return blockList.check(ip, `ipv${type}`);
|
|
}
|