rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite whitelist resolve logic to skip unresolved hosts from whitelist

Browse Source
This commit is contained in:
Cohee
2025-03-01 19:57:36 +02:00
parent 68db63b629
commit 8aa7ed8635
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/middleware/whitelist.js
View File

@@ -11,6 +11,7 @@ import { color, getConfigValue, safeReadFileSync } from '../util.js';
const whitelistPath = path.join(process.cwd(), './whitelist.txt'); const whitelistPath = path.join(process.cwd(), './whitelist.txt');
const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false, 'boolean'); const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false, 'boolean');
/** @type {string[]} */
let whitelist = getConfigValue('whitelist', []); let whitelist = getConfigValue('whitelist', []);
if (fs.existsSync(whitelistPath)) { if (fs.existsSync(whitelistPath)) {
@@ -83,24 +84,33 @@ function isIpFormat(entry) {
* This function will modify the whitelist array in place. * This function will modify the whitelist array in place.
*/ */
async function resolveHostnames() { 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;
} }
if (isValidHostname(entry)) { // 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); const result = await dns.promises.lookup(entry);
console.info(`Resolved whitelist hostname ${color.green(entry)} to IPv${result.family} address ${color.green(result.address)}`); 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}`);
} }
} catch { } else {
// Ignore errors when resolving hostnames resolvedWhitelist.push(entry);
} }
} });
await Promise.allSettled(promises);
} }
/** /**