replace ipaddr.js

This commit is contained in:
Girish Ramakrishnan
2025-05-06 16:16:33 +02:00
parent c8976daf96
commit a7c6e36ec3
10 changed files with 186 additions and 34 deletions

View File

@@ -49,7 +49,7 @@ const acme2 = require('./acme2.js'),
domains = require('./domains.js'),
ejs = require('ejs'),
eventlog = require('./eventlog.js'),
ipaddr = require('ipaddr.js'),
ipaddr = require('./ipaddr.js'),
fs = require('fs'),
Location = require('./location.js'),
mailServer = require('./mailserver.js'),
@@ -783,7 +783,6 @@ async function setTrustedIps(trustedIps) {
for (const line of trustedIps.split('\n')) {
if (!line || line.startsWith('#')) continue;
const rangeOrIP = line.trim();
// this checks for IPv4 and IPv6
if (!ipaddr.isValid(rangeOrIP) && !ipaddr.isValidCIDR(rangeOrIP)) throw new BoxError(BoxError.BAD_FIELD, `${rangeOrIP} is not a valid IP or range`);
trustedIpsConfig += `set_real_ip_from ${rangeOrIP};\n`;
}