Rewrite whitelist resolve logic to skip unresolved hosts from whitelist

8aa7ed863583808be13b96d0373f697a9d196521

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/middleware/whitelist.js+22 -12 Viewed

 const whitelistPath = path.join(process.cwd(), './whitelist.txt');
 const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false, 'boolean');
 +/** @type {string[]} */
 let whitelist = getConfigValue('whitelist', []);
 if (fs.existsSync(whitelistPath)) {

  * This function will modify the whitelist array in place.
  */
 async function resolveHostnames() {
 -    for (let i = 0; i < whitelist.length; i++) {
 +    const resolvedWhitelist = [];
 -        try {
 -            const entry = whitelist[i];
 -            // Skip if entry appears to be an IP address, CIDR notation, or IP wildcard
 +    const promises = whitelist.map(async (entry) => {
 -            if (isIpFormat(entry)) {
 +        if (!entry || typeof entry !== 'string') {
 -                continue;
 +            return;
+                    }
++
 +        // Skip if entry appears to be an IP address, CIDR notation, or IP wildcard
 +        if (isIpFormat(entry)) {
 +            resolvedWhitelist.push(entry);
 +            return;
 +        }
                     if (isValidHostname(entry)) {
 +            try {
                 const result = await dns.promises.lookup(entry);
                 console.info(`Resolved whitelist hostname ${color.green(entry)} to IPv${result.family} address ${color.green(result.address)}`);
 -                whitelist[i] = result.address;
 +                resolvedWhitelist.push(result.address);
 +            } catch (e) {
 +                console.warn(`Failed to resolve whitelist hostname ${color.red(entry)}: ${e.message}`);
+            }
         } catchelse {
 -            // Ignore errors when resolving hostnames
 +            resolvedWhitelist.push(entry);
+        }
     });
++
 +    await Promise.allSettled(promises);
+}
 /**